3 files changed, 13 insertions, 32 deletions

diff --git a/arch/i386/kernel/i387.c b/arch/i386/kernel/i387.c
index b817168d9c62..d75524758daf 100644
--- a/arch/i386/kernel/i387.c
+++ b/arch/i386/kernel/i387.c
@@ -82,17 +82,6 @@ void kernel_fpu_begin(void)
 }
 EXPORT_SYMBOL_GPL(kernel_fpu_begin);
 
-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) );
-        }
-}
-
 /*
  * FPU tag word conversions.
  */
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index ba243a4cc119..d9492058aaf3 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -700,23 +700,27 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas
 
         /*
          * Restore %fs and %gs if needed.
+         *
+         * Glibc normally makes %fs be zero, and %gs is one of
+         * the TLS segments.
          */
-        if (unlikely(prev->fs | prev->gs | next->fs | next->gs)) {
+        if (unlikely(prev->fs | next->fs))
                 loadsegment(fs, next->fs);
+
+        if (prev->gs | next->gs)
                 loadsegment(gs, next->gs);
-        }
 
         /*
          * Now maybe reload the debug registers
          */
         if (unlikely(next->debugreg[7])) {
-                set_debugreg(current->thread.debugreg[0], 0);
-                set_debugreg(current->thread.debugreg[1], 1);
-                set_debugreg(current->thread.debugreg[2], 2);
-                set_debugreg(current->thread.debugreg[3], 3);
+                set_debugreg(next->debugreg[0], 0);
+                set_debugreg(next->debugreg[1], 1);
+                set_debugreg(next->debugreg[2], 2);
+                set_debugreg(next->debugreg[3], 3);
                 /* no 4 and 5 */
-                set_debugreg(current->thread.debugreg[6], 6);
-                set_debugreg(current->thread.debugreg[7], 7);
+                set_debugreg(next->debugreg[6], 6);
+                set_debugreg(next->debugreg[7], 7);
         }
 
         if (unlikely(prev->io_bitmap_ptr || next->io_bitmap_ptr))
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 7306353c520e..af4de58cab54 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -1414,7 +1414,7 @@ static struct nop {
    This runs before SMP is initialized to avoid SMP problems with
    self modifying code. This implies that assymetric systems where
    APs have less capabilities than the boot processor are not handled. 
-   In this case boot with "noreplacement". */ 
+   Tough. Make sure you disable such features by hand. */ 
 void apply_alternatives(void *start, void *end) 
 { 
         struct alt_instr *a; 
@@ -1442,24 +1442,12 @@ void apply_alternatives(void *start, void *end)
         }
 } 
 
-static int no_replacement __initdata = 0; 
- 
 void __init alternative_instructions(void)
 {
         extern struct alt_instr __alt_instructions[], __alt_instructions_end[];
-        if (no_replacement) 
-                return;
         apply_alternatives(__alt_instructions, __alt_instructions_end);
 }
 
-static int __init noreplacement_setup(char *s)
-{ 
-     no_replacement = 1; 
-     return 0; 
-} 
-
-__setup("noreplacement", noreplacement_setup); 
-
 static char * __init machine_specific_memory_setup(void);
 
 #ifdef CONFIG_MCA