diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 13:21:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 13:21:22 -0800 |
| commit | 98793265b429a3f0b3f1750e74d67cd4d740d162 (patch) | |
| tree | b0bd717673f0c21845cf053f3fb6b75d42530af5 /tools | |
| parent | b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (diff) | |
| parent | bd1b2a555952d959f47169056fca05acf7eff81f (diff) | |
| download | linux-3.10-98793265b429a3f0b3f1750e74d67cd4d740d162.tar.gz linux-3.10-98793265b429a3f0b3f1750e74d67cd4d740d162.tar.bz2 linux-3.10-98793265b429a3f0b3f1750e74d67cd4d740d162.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
Kconfig: acpi: Fix typo in comment.
misc latin1 to utf8 conversions
devres: Fix a typo in devm_kfree comment
btrfs: free-space-cache.c: remove extra semicolon.
fat: Spelling s/obsolate/obsolete/g
SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
tools/power turbostat: update fields in manpage
mac80211: drop spelling fix
types.h: fix comment spelling for 'architectures'
typo fixes: aera -> area, exntension -> extension
devices.txt: Fix typo of 'VMware'.
sis900: Fix enum typo 'sis900_rx_bufer_status'
decompress_bunzip2: remove invalid vi modeline
treewide: Fix comment and string typo 'bufer'
hyper-v: Update MAINTAINERS
treewide: Fix typos in various parts of the kernel, and fix some comments.
clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
leds: Kconfig: Fix typo 'D2NET_V2'
sound: Kconfig: drop unknown symbol ARCH_CLPS7500
...
Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.8 | 8 | ||||
| -rw-r--r-- | tools/testing/ktest/sample.conf | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/power/x86/turbostat/turbostat.8 b/tools/power/x86/turbostat/turbostat.8 index ff75125deed..555c69a5592 100644 --- a/tools/power/x86/turbostat/turbostat.8 +++ b/tools/power/x86/turbostat/turbostat.8 @@ -38,8 +38,8 @@ displays the statistics gathered since it was forked. .PP .SH FIELD DESCRIPTIONS .nf -\fBpkg\fP processor package number. -\fBcore\fP processor core number. +\fBpk\fP processor package number. +\fBcr\fP processor core number. \fBCPU\fP Linux CPU (logical processor) number. \fB%c0\fP percent of the interval that the CPU retired instructions. \fBGHz\fP average clock rate while the CPU was in c0 state. @@ -58,7 +58,7 @@ Subsequent rows show per-CPU statistics. .nf [root@x980]# ./turbostat -core CPU %c0 GHz TSC %c1 %c3 %c6 %pc3 %pc6 +cr CPU %c0 GHz TSC %c1 %c3 %c6 %pc3 %pc6 0.04 1.62 3.38 0.11 0.00 99.85 0.00 95.07 0 0 0.04 1.62 3.38 0.06 0.00 99.90 0.00 95.07 0 6 0.02 1.62 3.38 0.08 0.00 99.90 0.00 95.07 @@ -102,7 +102,7 @@ until ^C while the other CPUs are mostly idle: .nf [root@x980 lenb]# ./turbostat cat /dev/zero > /dev/null -^Ccore CPU %c0 GHz TSC %c1 %c3 %c6 %pc3 %pc6 +^Ccr CPU %c0 GHz TSC %c1 %c3 %c6 %pc3 %pc6 8.49 3.63 3.38 16.23 0.66 74.63 0.00 0.00 0 0 1.22 3.62 3.38 32.18 0.00 66.60 0.00 0.00 0 6 0.40 3.61 3.38 33.00 0.00 66.60 0.00 0.00 diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf index dbedfa19672..553c06b7d6f 100644 --- a/tools/testing/ktest/sample.conf +++ b/tools/testing/ktest/sample.conf @@ -950,7 +950,7 @@ # TEST_START # TEST_TYPE = config_bisect # CONFIG_BISECT_TYPE = build -# CONFIG_BISECT = /home/test/˘onfig-bad +# CONFIG_BISECT = /home/test/config-bad # MIN_CONFIG = /home/test/config-min # BISECT_MANUAL = 1 # |