]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
x86: msr-index.h: Correct SNB_C1/C3_AUTO_UNDEMOTE defines
authorMatt Turner <mattst88@gmail.com>
Tue, 13 Feb 2018 19:12:05 +0000 (11:12 -0800)
committerLen Brown <len.brown@intel.com>
Sat, 2 Jun 2018 03:12:45 +0000 (23:12 -0400)
According to the Intel Software Developers' Manual, Vol. 4, Order No.
335592, these macros have been reversed since they were added in the
initial turbostat commit. The reversed definitions were presumably
copied from turbostat.c to this file.

Fixes: 9c63a650bb10 ("tools/power/x86/turbostat: share kernel MSR #defines")
Signed-off-by: Matt Turner <mattst88@gmail.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Len Brown <len.brown@intel.com>
arch/x86/include/asm/msr-index.h

index fda2114197b36935558f0a376644dcd0a0c268ce..68b2c3150de1534fda2e43ccc4a464522a350c11 100644 (file)
@@ -62,8 +62,8 @@
 #define NHM_C3_AUTO_DEMOTE             (1UL << 25)
 #define NHM_C1_AUTO_DEMOTE             (1UL << 26)
 #define ATM_LNC_C6_AUTO_DEMOTE         (1UL << 25)
-#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)
 
 #define MSR_MTRRcap                    0x000000fe