3.16.61-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Matt Turner <[email protected]> commit e0d34648b4d77ba715e13739d04e7b0692fe5eaa upstream. According to the Intel Software Developers' Manual, Vol. 4, Order No. 335592, these macros have been reversed since they were added. Fixes: 889facbee3e6 ("tools/power turbostat: v3.0: monitor Watts and Temperature") Signed-off-by: Matt Turner <[email protected]> Signed-off-by: Len Brown <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- tools/power/x86/turbostat/turbostat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -1088,8 +1088,8 @@ void print_verbose_header(void) print_nhm_turbo_ratio_limits: get_msr(0, MSR_NHM_SNB_PKG_CST_CFG_CTL, &msr); -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) +#define SNB_C3_AUTO_UNDEMOTE (1UL << 27) +#define SNB_C1_AUTO_UNDEMOTE (1UL << 28) fprintf(stderr, "cpu0: MSR_NHM_SNB_PKG_CST_CFG_CTL: 0x%08llx", msr);
