diff --git a/[refs] b/[refs]
index 6102bc955129..aa9ce85116fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecaea42eb8507735a97a496cc5068de06542e8b2
+refs/heads/master: 148a142495f40d3da729d62cb7127ccb26223106
diff --git a/trunk/arch/x86/kernel/i387.c b/trunk/arch/x86/kernel/i387.c
index 26719bd2c77c..763dfc407232 100644
--- a/trunk/arch/x86/kernel/i387.c
+++ b/trunk/arch/x86/kernel/i387.c
@@ -39,7 +39,7 @@
 #define HAVE_HWFP 1
 #endif
 
-unsigned int mxcsr_feature_mask __read_mostly = 0xffffffffu;
+static unsigned int mxcsr_feature_mask __read_mostly = 0xffffffffu;
 
 void mxcsr_feature_mask_init(void)
 {
diff --git a/trunk/include/asm-x86/i387.h b/trunk/include/asm-x86/i387.h
index 6b1895ccd6b7..f377b76b2f34 100644
--- a/trunk/include/asm-x86/i387.h
+++ b/trunk/include/asm-x86/i387.h
@@ -20,7 +20,6 @@
 #include <asm/uaccess.h>
 
 extern void fpu_init(void);
-extern unsigned int mxcsr_feature_mask;
 extern void mxcsr_feature_mask_init(void);
 extern void init_fpu(struct task_struct *child);
 extern asmlinkage void math_state_restore(void);