update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/ia64/include/uapi/asm/intel_intrin.h
..
..
@@ -17,8 +17,8 @@
17
17
 		 	 * intrinsic
18
18
 		 	 */
19
19
 
20
-#define ia64_native_getreg	__getReg
21
-#define ia64_native_setreg	__setReg
20
+#define ia64_getreg		__getReg
21
+#define ia64_setreg		__setReg
22
22
 
23
23
 #define ia64_hint		__hint
24
24
 #define ia64_hint_pause		__hint_pause
..
..
@@ -40,10 +40,10 @@
40
40
 #define ia64_invala_fr		__invala_fr
41
41
 #define ia64_nop		__nop
42
42
 #define ia64_sum		__sum
43
-#define ia64_native_ssm		__ssm
43
+#define ia64_ssm		__ssm
44
44
 #define ia64_rum		__rum
45
-#define ia64_native_rsm		__rsm
46
-#define ia64_native_fc 		__fc
45
+#define ia64_rsm		__rsm
46
+#define ia64_fc			__fc
47
47
 
48
48
 #define ia64_ldfs		__ldfs
49
49
 #define ia64_ldfd		__ldfd
..
..
@@ -89,17 +89,17 @@
89
89
 		__setIndReg(_IA64_REG_INDR_PMC, index, val)
90
90
 #define ia64_set_pmd(index, val)	\
91
91
 		__setIndReg(_IA64_REG_INDR_PMD, index, val)
92
-#define ia64_native_set_rr(index, val)	\
92
+#define ia64_set_rr(index, val)		\
93
93
 		__setIndReg(_IA64_REG_INDR_RR, index, val)
94
94
 
95
-#define ia64_native_get_cpuid(index)	\
95
+#define ia64_get_cpuid(index)	\
96
96
 		__getIndReg(_IA64_REG_INDR_CPUID, index)
97
97
 #define __ia64_get_dbr(index)		__getIndReg(_IA64_REG_INDR_DBR, index)
98
98
 #define ia64_get_ibr(index)		__getIndReg(_IA64_REG_INDR_IBR, index)
99
99
 #define ia64_get_pkr(index)		__getIndReg(_IA64_REG_INDR_PKR, index)
100
100
 #define ia64_get_pmc(index)		__getIndReg(_IA64_REG_INDR_PMC, index)
101
-#define ia64_native_get_pmd(index)	__getIndReg(_IA64_REG_INDR_PMD, index)
102
-#define ia64_native_get_rr(index)	__getIndReg(_IA64_REG_INDR_RR, index)
101
+#define ia64_get_pmd(index)		__getIndReg(_IA64_REG_INDR_PMD, index)
102
+#define ia64_get_rr(index)		__getIndReg(_IA64_REG_INDR_RR, index)
103
103
 
104
104
 #define ia64_srlz_d		__dsrlz
105
105
 #define ia64_srlz_i		__isrlz
..
..
@@ -121,16 +121,16 @@
121
121
 #define ia64_ld8_acq		__ld8_acq
122
122
 
123
123
 #define ia64_sync_i		__synci
124
-#define ia64_native_thash	__thash
125
-#define ia64_native_ttag	__ttag
124
+#define ia64_thash		__thash
125
+#define ia64_ttag		__ttag
126
126
 #define ia64_itcd		__itcd
127
127
 #define ia64_itci		__itci
128
128
 #define ia64_itrd		__itrd
129
129
 #define ia64_itri		__itri
130
130
 #define ia64_ptce		__ptce
131
131
 #define ia64_ptcl		__ptcl
132
-#define ia64_native_ptcg	__ptcg
133
-#define ia64_native_ptcga	__ptcga
132
+#define ia64_ptcg		__ptcg
133
+#define ia64_ptcga		__ptcga
134
134
 #define ia64_ptri		__ptri
135
135
 #define ia64_ptrd		__ptrd
136
136
 #define ia64_dep_mi		_m64_dep_mi
..
..
@@ -147,13 +147,13 @@
147
147
 #define ia64_lfetch_fault	__lfetch_fault
148
148
 #define ia64_lfetch_fault_excl	__lfetch_fault_excl
149
149
 
150
-#define ia64_native_intrin_local_irq_restore(x)		\
150
+#define ia64_intrin_local_irq_restore(x)		\
151
151
 do {							\
152
152
 	if ((x) != 0) {					\
153
-		ia64_native_ssm(IA64_PSR_I);		\
153
+		ia64_ssm(IA64_PSR_I);			\
154
154
 		ia64_srlz_d();				\
155
155
 	} else {					\
156
-		ia64_native_rsm(IA64_PSR_I);		\
156
+		ia64_rsm(IA64_PSR_I);			\
157
157
 	}						\
158
158
 } while (0)
159
159