[PATCH] Update 2.4 msr.h

• Next message: Dan Creswell: "PCI - docos/where to start?"
• Previous message: Peter Wächtler: "Re: Off-Topic: We need your Help! Please help Cargolifter!"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This patch just updates current 2.4 msr.h with what is currently in 2.5-dj
(pending 2.5 merge). This is also required for easier merging of cpufreq

Cheers,
        Zwane

Diffed 2.4.19-pre8-ac5 against 2.5.18-dj1

--- linux-2.4-ac/include/asm-i386/msr.h Thu May 30 09:57:00 2002
+++ linux-2.5-dj/include/asm-i386/msr.h Thu May 30 09:50:18 2002
@@ -48,12 +48,36 @@
 #define MSR_IA32_UCODE_WRITE 0x79
 #define MSR_IA32_UCODE_REV 0x8b
 
+#define MSR_P6_PERFCTR0 0xc1
+#define MSR_P6_PERFCTR1 0xc2
+
 #define MSR_IA32_BBL_CR_CTL 0x119
 
 #define MSR_IA32_MCG_CAP 0x179
 #define MSR_IA32_MCG_STATUS 0x17a
 #define MSR_IA32_MCG_CTL 0x17b
 
+/* P4/Xeon+ specific */
+#define MSR_IA32_MCG_EAX 0x180
+#define MSR_IA32_MCG_EBX 0x181
+#define MSR_IA32_MCG_ECX 0x182
+#define MSR_IA32_MCG_EDX 0x183
+#define MSR_IA32_MCG_ESI 0x184
+#define MSR_IA32_MCG_EDI 0x185
+#define MSR_IA32_MCG_EBP 0x186
+#define MSR_IA32_MCG_ESP 0x187
+#define MSR_IA32_MCG_EFLAGS 0x188
+#define MSR_IA32_MCG_EIP 0x189
+#define MSR_IA32_MCG_RESERVED 0x18A
+
+#define MSR_P6_EVNTSEL0 0x186
+#define MSR_P6_EVNTSEL1 0x187
+
+#define MSR_IA32_THERM_CONTROL 0x19a
+#define MSR_IA32_THERM_INTERRUPT 0x19b
+#define MSR_IA32_THERM_STATUS 0x19c
+#define MSR_IA32_MISC_ENABLE 0x1a0
+
 #define MSR_IA32_DEBUGCTLMSR 0x1d9
 #define MSR_IA32_LASTBRANCHFROMIP 0x1db
 #define MSR_IA32_LASTBRANCHTOIP 0x1dc
@@ -64,11 +88,6 @@
 #define MSR_IA32_MC0_STATUS 0x401
 #define MSR_IA32_MC0_ADDR 0x402
 #define MSR_IA32_MC0_MISC 0x403
-
-#define MSR_P6_PERFCTR0 0xc1
-#define MSR_P6_PERFCTR1 0xc2
-#define MSR_P6_EVNTSEL0 0x186
-#define MSR_P6_EVNTSEL1 0x187
 
 /* AMD Defined MSRs */
 #define MSR_K6_EFER 0xC0000080

-- 
http://function.linuxpower.ca
		
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

• Next message: Dan Creswell: "PCI - docos/where to start?"
• Previous message: Peter Wächtler: "Re: Off-Topic: We need your Help! Please help Cargolifter!"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Fri May 31 2002 - 22:00:28 EST