@@ -205,41 +205,51 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
205205 register unsigned long r3 asm("r3")
206206
207207#define __declare_arg_1 (a0 , a1 , res ) \
208+ typeof(a1) __a1 = a1; \
208209 struct arm_smccc_res *___res = res; \
209210 register unsigned long r0 asm("r0") = (u32)a0; \
210- register unsigned long r1 asm("r1") = a1 ; \
211+ register unsigned long r1 asm("r1") = __a1 ; \
211212 register unsigned long r2 asm("r2"); \
212213 register unsigned long r3 asm("r3")
213214
214215#define __declare_arg_2 (a0 , a1 , a2 , res ) \
216+ typeof(a1) __a1 = a1; \
217+ typeof(a2) __a2 = a2; \
215218 struct arm_smccc_res *___res = res; \
216219 register unsigned long r0 asm("r0") = (u32)a0; \
217- register unsigned long r1 asm("r1") = a1 ; \
218- register unsigned long r2 asm("r2") = a2 ; \
220+ register unsigned long r1 asm("r1") = __a1 ; \
221+ register unsigned long r2 asm("r2") = __a2 ; \
219222 register unsigned long r3 asm("r3")
220223
221224#define __declare_arg_3 (a0 , a1 , a2 , a3 , res ) \
225+ typeof(a1) __a1 = a1; \
226+ typeof(a2) __a2 = a2; \
227+ typeof(a3) __a3 = a3; \
222228 struct arm_smccc_res *___res = res; \
223229 register unsigned long r0 asm("r0") = (u32)a0; \
224- register unsigned long r1 asm("r1") = a1 ; \
225- register unsigned long r2 asm("r2") = a2 ; \
226- register unsigned long r3 asm("r3") = a3
230+ register unsigned long r1 asm("r1") = __a1 ; \
231+ register unsigned long r2 asm("r2") = __a2 ; \
232+ register unsigned long r3 asm("r3") = __a3
227233
228234#define __declare_arg_4 (a0 , a1 , a2 , a3 , a4 , res ) \
235+ typeof(a4) __a4 = a4; \
229236 __declare_arg_3(a0, a1, a2, a3, res); \
230- register typeof(a4) r4 asm("r4") = a4
237+ register unsigned long r4 asm("r4") = __a4
231238
232239#define __declare_arg_5 (a0 , a1 , a2 , a3 , a4 , a5 , res ) \
240+ typeof(a5) __a5 = a5; \
233241 __declare_arg_4(a0, a1, a2, a3, a4, res); \
234- register typeof(a5) r5 asm("r5") = a5
242+ register unsigned long r5 asm("r5") = __a5
235243
236244#define __declare_arg_6 (a0 , a1 , a2 , a3 , a4 , a5 , a6 , res ) \
245+ typeof(a6) __a6 = a6; \
237246 __declare_arg_5(a0, a1, a2, a3, a4, a5, res); \
238- register typeof(a6) r6 asm("r6") = a6
247+ register unsigned long r6 asm("r6") = __a6
239248
240249#define __declare_arg_7 (a0 , a1 , a2 , a3 , a4 , a5 , a6 , a7 , res ) \
250+ typeof(a7) __a7 = a7; \
241251 __declare_arg_6(a0, a1, a2, a3, a4, a5, a6, res); \
242- register typeof(a7) r7 asm("r7") = a7
252+ register unsigned long r7 asm("r7") = __a7
243253
244254#define ___declare_args (count , ...) __declare_arg_ ## count(__VA_ARGS__)
245255#define __declare_args (count , ...) ___declare_args(count, __VA_ARGS__)
0 commit comments