diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-17 14:31:11 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-17 14:31:11 +1000 |
commit | 99d581985b83f8d776855843fa49cd7cbe459de6 (patch) | |
tree | 31698bfcdf4985fad8ab3884fe8f20cad20fc0f1 /arch/x86 | |
parent | cfb2800ece6c50d60eccd2d41a406343dcb3599d (diff) | |
parent | adc88ffc405c080956cd9af0538e294ff1368999 (diff) |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/networking/netlink_mmap.txt
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/cpu/powerflags.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/powerflags.c b/arch/x86/kernel/cpu/powerflags.c index 7b3fe56b1c21..31f0f335ed22 100644 --- a/arch/x86/kernel/cpu/powerflags.c +++ b/arch/x86/kernel/cpu/powerflags.c @@ -11,10 +11,10 @@ const char *const x86_power_flags[32] = { "fid", /* frequency id control */ "vid", /* voltage id control */ "ttp", /* thermal trip */ - "tm", - "stc", - "100mhzsteps", - "hwpstate", + "tm", /* hardware thermal control */ + "stc", /* software thermal control */ + "100mhzsteps", /* 100 MHz multiplier control */ + "hwpstate", /* hardware P-state control */ "", /* tsc invariant mapped to constant_tsc */ "cpb", /* core performance boost */ "eff_freq_ro", /* Readonly aperf/mperf */ |