[x86_64] Linux kernel 6.9: Avoid redefinition of Intel MSR macros

cyring · May 13, 2024 · a4dbfc9 · a4dbfc9
1 parent 7aa4aa6
commit a4dbfc9
Showing 1 changed file with 35 additions and 9 deletions.
diff --git a/x86_64/intel_reg.h b/x86_64/intel_reg.h
@@ -96,15 +96,41 @@
 	#define MSR_TURBO_POWER_CURRENT_LIMIT	0x000001ac
 #endif
 
-#define MSR_IA32_FRED_STKLVLS			0x000001d0
-#define MSR_IA32_FRED_SSP1			0x000001d1
-#define MSR_IA32_FRED_SSP2			0x000001d2
-#define MSR_IA32_FRED_SSP3			0x000001d3
-#define MSR_IA32_FRED_CONFIG			0x000001d4
-#define MSR_IA32_FRED_RSP0			0x000001cc
-#define MSR_IA32_FRED_RSP1			0x000001cd
-#define MSR_IA32_FRED_RSP2			0x000001ce
-#define MSR_IA32_FRED_RSP3			0x000001cf
+#ifndef MSR_IA32_FRED_STKLVLS
+	#define MSR_IA32_FRED_STKLVLS		0x000001d0
+#endif
+
+#ifndef MSR_IA32_FRED_SSP1
+	#define MSR_IA32_FRED_SSP1		0x000001d1
+#endif
+
+#ifndef MSR_IA32_FRED_SSP2
+	#define MSR_IA32_FRED_SSP2		0x000001d2
+#endif
+
+#ifndef MSR_IA32_FRED_SSP3
+	#define MSR_IA32_FRED_SSP3		0x000001d3
+#endif
+
+#ifndef MSR_IA32_FRED_CONFIG
+	#define MSR_IA32_FRED_CONFIG		0x000001d4
+#endif
+
+#ifndef MSR_IA32_FRED_RSP0
+	#define MSR_IA32_FRED_RSP0		0x000001cc
+#endif
+
+#ifndef MSR_IA32_FRED_RSP1
+	#define MSR_IA32_FRED_RSP1		0x000001cd
+#endif
+
+#ifndef MSR_IA32_FRED_RSP2
+	#define MSR_IA32_FRED_RSP2		0x000001ce
+#endif
+
+#ifndef MSR_IA32_FRED_RSP3
+	#define MSR_IA32_FRED_RSP3		0x000001cf
+#endif
 
 #ifndef MSR_IA32_POWER_CTL
 	#define MSR_IA32_POWER_CTL		0x000001fc