x86: prevent stale state of c1e_mask across CPU offline/online

[pandora-kernel.git] / include / asm-x86 / user.h

diff --git a/include/asm-x86/user.h b/include/asm-x86/user.h
index 484715a..999873b 100644 (file)
--- a/include/asm-x86/user.h
+++ b/include/asm-x86/user.h
@@ -1,13 +1,5 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "user_32.h"
-# else
-#  include "user_64.h"
-# endif
+#ifdef CONFIG_X86_32
+# include "user_32.h"
 #else
-# ifdef __i386__
-#  include "user_32.h"
-# else
-#  include "user_64.h"
-# endif
+# include "user_64.h"
 #endif