Skip to contentSkip to conversation

x86: fix sparse error in traps_32.c

PATCH New Harvey Harrison 1 participant 1 message Feb 5, 2008 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/8 x86: fix sparse error in traps_32.c

arch/x86/kernel/traps_32.c:1193:31: error: dubious one-bit signed bitfield

This was being used to ensure the proper alignment of the FXSAVE/FXRSTOR data. This would create a sparse error in the _correct_ cases, hiding further warnings. Use BUILD_BUG_ON instead.

---
 arch/x86/kernel/traps_32.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)
arch/x86/kernel/traps_32.c +5 -10
index 2f94f69..47ca425 100644
@@ -1182,17 +1182,12 @@ void __init trap_init(void)
 #endif
 	set_trap_gate(19,&simd_coprocessor_error);
 
+	/*
+	 * Verify that the FXSAVE/FXRSTOR data will be 16-byte aligned.
+	 * Generate a build-time error if the alignment is wrong.
+	 */
+	BUILD_BUG_ON(offsetof(struct task_struct, thread.i387.fxsave) & 15);
 	if (cpu_has_fxsr) {
-		/*
-		 * Verify that the FXSAVE/FXRSTOR data will be 16-byte aligned.
-		 * Generates a compile-time "error: zero width for bit-field" if
-		 * the alignment is wrong.
-		 */
-		struct fxsrAlignAssert {
-			int _:!(offsetof(struct task_struct,
-					thread.i387.fxsave) & 15);
-		};
-
 		printk(KERN_INFO "Enabling fast FPU save and restore... ");
 		set_in_cr4(X86_CR4_OSFXSR);
 		printk("done.\n");
Signature · 1 line
1.5.4.rc5.1138.g2602