Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/core

2008-12-25 11:50:41 +01:00
parent bed4f13065 c1c15b65ec 1fcccb008b 4a6908a3a0
commit 79a66b96c3
39 changed files with 126 additions and 102 deletions
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -687,7 +687,7 @@ void math_error(void __user *ip)

 	err = swd & ~cwd & 0x3f;

-#if CONFIG_X86_32
+#ifdef CONFIG_X86_32
 	if (!err)
 		return;
 #endif