diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 16:03:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 16:03:12 -0700 |
| commit | 1c036588772d01655d851f75dffc27c971e072e2 (patch) | |
| tree | ee35c5ecc726d4fdb77c462cccbe499d1c3292b7 /tools/power/cpupower/man/cpupower-monitor.1 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia (diff) | |
| parent | cpupower tools: add install target to the debug tools' makefiles (diff) | |
| download | linux-dev-1c036588772d01655d851f75dffc27c971e072e2.tar.xz linux-dev-1c036588772d01655d851f75dffc27c971e072e2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils
Pull cpupower updates from Dominik Brodowski.
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils:
cpupower tools: add install target to the debug tools' makefiles
cpupower tools: allow to build debug tools in a separate directory too
cpupower: Fix broken mask values
cpupower tool: allow to build in a separate directory
cpupower tool: makefile: simplify the recipe used to generate cpupower.pot target
cpupower tool: remove use of undefined variables from the clean target of the top makefile
cpupower: Fix linking with --as-needed
cpupower: Remove unneeded code and by that fix a memleak
cpupower: Fix number of idle states
cpupower: Unify cpupower-frequency-* manpages
cpupower: Add cpupower-idle-info manpage
cpupower: AMD fam14h/Ontario monitor can also be used by fam12h cpus
cpupower: Better interface for accessing AMD pci registers
Diffstat (limited to 'tools/power/cpupower/man/cpupower-monitor.1')
| -rw-r--r-- | tools/power/cpupower/man/cpupower-monitor.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/cpupower/man/cpupower-monitor.1 b/tools/power/cpupower/man/cpupower-monitor.1 index d5cfa265c3d3..1141c2073719 100644 --- a/tools/power/cpupower/man/cpupower-monitor.1 +++ b/tools/power/cpupower/man/cpupower-monitor.1 @@ -107,7 +107,7 @@ Deepest package sleep states may in reality show up as machine/platform wide sleep states and can only be entered if all cores are idle. Look up Intel manuals (some are provided in the References section) for further details. -.SS "Ontario" "Liano" +.SS "Fam_12h" "Fam_14h" AMD laptop and desktop processor (family 12h and 14h) sleep state counters. The registers are accessed via PCI and therefore can still be read out while cores have been offlined. |