x86/fpu: Cleanup variable shadowing

KAGA-KOKO · KAGA-KOKO · commit b91c0922bf1e · 2022-05-02T09:28:31.000+02:00
Addresses: warning: Local variable 'mask' shadows outer variable Remove extra variable declaration and switch the bit mask assignment to use BIT_ULL() while at it. Fixes: 522e927 ("x86/fpu: Deduplicate copy_uabi_from_user/kernel_to_xstate()") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/lkml/202204262032.jFYKit5j-lkp@intel.com
diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
@@ -1233,7 +1233,7 @@ static int copy_uabi_to_xstate(struct fpstate *fpstate, const void *kbuf,
 	}
 
 	for (i = 0; i < XFEATURE_MAX; i++) {
-		u64 mask = ((u64)1 << i);
+		mask = BIT_ULL(i);
 
 		if (hdr.xfeatures & mask) {
 			void *dst = __raw_xsave_addr(xsave, i);

Original file line number	Diff line number	Diff line change
`@@ -1233,7 +1233,7 @@ static int copy_uabi_to_xstate(struct fpstate fpstate, const void kbuf,`
`1233`	`1233`	`}`
`1234`	`1234`
`1235`	`1235`	`for (i = 0; i < XFEATURE_MAX; i++) {`
`1236`		`- u64 mask = ((u64)1 << i);`
	`1236`	`+ mask = BIT_ULL(i);`
`1237`	`1237`
`1238`	`1238`	`if (hdr.xfeatures & mask) {`
`1239`	`1239`	`void *dst = __raw_xsave_addr(xsave, i);`