Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / i386 / kernel / i387.c

diff --git a/arch/i386/kernel/i387.c b/arch/i386/kernel/i387.c
index 5af8b68..d755247 100644 (file)
--- a/arch/i386/kernel/i387.c
+++ b/arch/i386/kernel/i387.c
@@ -10,6 +10,7 @@
 
 #include <linux/config.h>
 #include <linux/sched.h>
+#include <linux/module.h>
 #include <asm/processor.h>
 #include <asm/i387.h>
 #include <asm/math_emu.h>
@@ -24,7 +25,7 @@
 #define HAVE_HWFP 1
 #endif
 
-unsigned long mxcsr_feature_mask = 0xffffffff;
+static unsigned long mxcsr_feature_mask = 0xffffffff;
 
 void mxcsr_feature_mask_init(void)
 {
@@ -79,17 +80,7 @@ void kernel_fpu_begin(void)
        }
        clts();
 }
-
-void restore_fpu( struct task_struct *tsk )
-{
-       if ( cpu_has_fxsr ) {
-               asm volatile( "fxrstor %0"
-                             : : "m" (tsk->thread.i387.fxsave) );
-       } else {
-               asm volatile( "frstor %0"
-                             : : "m" (tsk->thread.i387.fsave) );
-       }
-}
+EXPORT_SYMBOL_GPL(kernel_fpu_begin);
 
 /*
  * FPU tag word conversions.
@@ -177,6 +168,7 @@ unsigned short get_fpu_swd( struct task_struct *tsk )
        }
 }
 
+#if 0
 unsigned short get_fpu_twd( struct task_struct *tsk )
 {
        if ( cpu_has_fxsr ) {
@@ -185,6 +177,7 @@ unsigned short get_fpu_twd( struct task_struct *tsk )
                return (unsigned short)tsk->thread.i387.fsave.twd;
        }
 }
+#endif  /*  0  */
 
 unsigned short get_fpu_mxcsr( struct task_struct *tsk )
 {
@@ -195,6 +188,8 @@ unsigned short get_fpu_mxcsr( struct task_struct *tsk )
        }
 }
 
+#if 0
+
 void set_fpu_cwd( struct task_struct *tsk, unsigned short cwd )
 {
        if ( cpu_has_fxsr ) {
@@ -222,6 +217,8 @@ void set_fpu_twd( struct task_struct *tsk, unsigned short twd )
        }
 }
 
+#endif  /*  0  */
+
 /*
  * FXSR floating point environment conversions.
  */
@@ -520,6 +517,7 @@ int dump_fpu( struct pt_regs *regs, struct user_i387_struct *fpu )
 
        return fpvalid;
 }
+EXPORT_SYMBOL(dump_fpu);
 
 int dump_task_fpu(struct task_struct *tsk, struct user_i387_struct *fpu)
 {