Merge branch 'linus' into x86/mce3

[~andy/linux] / arch / x86 / include / asm / msr-index.h

diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 4d58d04fca830bc56ab8bf62009661ad77a85f3e..1692fb5050e35e010e904c54043576ff83cff746 100644 (file)
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -207,7 +207,14 @@
 
 #define MSR_IA32_THERM_CONTROL         0x0000019a
 #define MSR_IA32_THERM_INTERRUPT       0x0000019b
+
+#define THERM_INT_LOW_ENABLE           (1 << 0)
+#define THERM_INT_HIGH_ENABLE          (1 << 1)
+
 #define MSR_IA32_THERM_STATUS          0x0000019c
+
+#define THERM_STATUS_PROCHOT           (1 << 0)
+
 #define MSR_IA32_MISC_ENABLE           0x000001a0
 
 /* MISC_ENABLE bits: architectural */