10 files changed, 41 insertions, 57 deletions

diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild
index c064a8e9170f..2308190321da 100644
--- a/include/asm-i386/Kbuild
+++ b/include/asm-i386/Kbuild
@@ -1,5 +1,5 @@
 include include/asm-generic/Kbuild.asm
 
-header-y += boot.h cpufeature.h debugreg.h ldt.h setup.h ucontext.h
+header-y += boot.h debugreg.h ldt.h ucontext.h
 
-unifdef-y += mtrr.h vm86.h
+unifdef-y += mtrr.h setup.h vm86.h
diff --git a/include/asm-i386/alternative.h b/include/asm-i386/alternative.h
index 96adbabec740..b01a7ec409ce 100644
--- a/include/asm-i386/alternative.h
+++ b/include/asm-i386/alternative.h
@@ -88,9 +88,6 @@ static inline void alternatives_smp_switch(int smp) {}
 /*
  * Alternative inline assembly for SMP.
  *
- * alternative_smp() takes two versions (SMP first, UP second) and is
- * for more complex stuff such as spinlocks.
- *
  * The LOCK_PREFIX macro defined here replaces the LOCK and
  * LOCK_PREFIX macros used everywhere in the source tree.
  *
@@ -110,21 +107,6 @@ static inline void alternatives_smp_switch(int smp) {}
  */
 
 #ifdef CONFIG_SMP
-#define alternative_smp(smpinstr, upinstr, args...)                     \
-        asm volatile ("661:\n\t" smpinstr "\n662:\n"                    \
-                      ".section .smp_altinstructions,\"a\"\n"           \
-                      "  .align 4\n"                                    \
-                      "  .long 661b\n"            /* label */           \
-                      "  .long 663f\n"            /* new instruction */ \
-                      "  .byte 0x68\n"            /* X86_FEATURE_UP */  \
-                      "  .byte 662b-661b\n"       /* sourcelen */       \
-                      "  .byte 664f-663f\n"       /* replacementlen */  \
-                      ".previous\n"                                     \
-                      ".section .smp_altinstr_replacement,\"awx\"\n"    \
-                      "663:\n\t" upinstr "\n"     /* replacement */     \
-                      "664:\n\t.fill 662b-661b,1,0x42\n" /* space for original */ \
-                      ".previous" : args)
-
 #define LOCK_PREFIX \
                 ".section .smp_locks,\"a\"\n"   \
                 "  .align 4\n"                  \
@@ -133,8 +115,6 @@ static inline void alternatives_smp_switch(int smp) {}
                 "661:\n\tlock; "
 
 #else /* ! CONFIG_SMP */
-#define alternative_smp(smpinstr, upinstr, args...) \
-        asm volatile (upinstr : args)
 #define LOCK_PREFIX ""
 #endif
 
diff --git a/include/asm-i386/elf.h b/include/asm-i386/elf.h
index 1eac92cb5b16..db4344d9f73f 100644
--- a/include/asm-i386/elf.h
+++ b/include/asm-i386/elf.h
@@ -7,10 +7,7 @@
 
 #include <asm/ptrace.h>
 #include <asm/user.h>
-#include <asm/processor.h>
-#include <asm/system.h>         /* for savesegment */
 #include <asm/auxvec.h>
-#include <asm/desc.h>
 
 #include <linux/utsname.h>
 
@@ -48,6 +45,12 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
 #define ELF_DATA        ELFDATA2LSB
 #define ELF_ARCH        EM_386
 
+#ifdef __KERNEL__
+
+#include <asm/processor.h>
+#include <asm/system.h>         /* for savesegment */
+#include <asm/desc.h>
+
 /* SVR4/i386 ABI (pages 3-31, 3-32) says that when the program starts %edx
    contains a pointer to a function which might be registered using `atexit'.
    This provides a mean for the dynamic linker to call DT_FINI functions for
@@ -111,7 +114,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
 
 #define ELF_PLATFORM  (system_utsname.machine)
 
-#ifdef __KERNEL__
 #define SET_PERSONALITY(ex, ibcs2) do { } while (0)
 
 /*
diff --git a/include/asm-i386/mach-default/mach_mpspec.h b/include/asm-i386/mach-default/mach_mpspec.h
index 6b5dadcf1d0e..51c9a9775932 100644
--- a/include/asm-i386/mach-default/mach_mpspec.h
+++ b/include/asm-i386/mach-default/mach_mpspec.h
@@ -3,6 +3,10 @@
 
 #define MAX_IRQ_SOURCES 256
 
+#if CONFIG_BASE_SMALL == 0
+#define MAX_MP_BUSSES 256
+#else
 #define MAX_MP_BUSSES 32
+#endif
 
 #endif /* __ASM_MACH_MPSPEC_H */
diff --git a/include/asm-i386/rwlock.h b/include/asm-i386/rwlock.h
index 96b0bef2ea56..87c069ccba08 100644
--- a/include/asm-i386/rwlock.h
+++ b/include/asm-i386/rwlock.h
@@ -21,23 +21,21 @@
 #define RW_LOCK_BIAS_STR        "0x01000000"
 
 #define __build_read_lock_ptr(rw, helper)   \
-        alternative_smp("lock; subl $1,(%0)\n\t" \
+        asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t" \
                         "jns 1f\n" \
                         "call " helper "\n\t" \
-                        "1:\n", \
-                        "subl $1,(%0)\n\t", \
-                        :"a" (rw) : "memory")
+                        "1:\n" \
+                        ::"a" (rw) : "memory")
 
 #define __build_read_lock_const(rw, helper)   \
-        alternative_smp("lock; subl $1,%0\n\t" \
+        asm volatile(LOCK_PREFIX " subl $1,%0\n\t" \
                         "jns 1f\n" \
                         "pushl %%eax\n\t" \
                         "leal %0,%%eax\n\t" \
                         "call " helper "\n\t" \
                         "popl %%eax\n\t" \
-                        "1:\n", \
-                        "subl $1,%0\n\t", \
-                        "+m" (*(volatile int *)rw) : : "memory")
+                        "1:\n" \
+                        :"+m" (*(volatile int *)rw) : : "memory")
 
 #define __build_read_lock(rw, helper)   do { \
                                                 if (__builtin_constant_p(rw)) \
@@ -47,23 +45,21 @@
                                         } while (0)
 
 #define __build_write_lock_ptr(rw, helper) \
-        alternative_smp("lock; subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
+        asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
                         "jz 1f\n" \
                         "call " helper "\n\t" \
-                        "1:\n", \
-                        "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t", \
-                        :"a" (rw) : "memory")
+                        "1:\n" \
+                        ::"a" (rw) : "memory")
 
 #define __build_write_lock_const(rw, helper) \
-        alternative_smp("lock; subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
+        asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
                         "jz 1f\n" \
                         "pushl %%eax\n\t" \
                         "leal %0,%%eax\n\t" \
                         "call " helper "\n\t" \
                         "popl %%eax\n\t" \
-                        "1:\n", \
-                        "subl $" RW_LOCK_BIAS_STR ",%0\n\t", \
-                        "+m" (*(volatile int *)rw) : : "memory")
+                        "1:\n" \
+                        :"+m" (*(volatile int *)rw) : : "memory")
 
 #define __build_write_lock(rw, helper)  do { \
                                                 if (__builtin_constant_p(rw)) \
diff --git a/include/asm-i386/setup.h b/include/asm-i386/setup.h
index f737e423029e..2734909eff84 100644
--- a/include/asm-i386/setup.h
+++ b/include/asm-i386/setup.h
@@ -6,6 +6,7 @@
 #ifndef _i386_SETUP_H
 #define _i386_SETUP_H
 
+#ifdef __KERNEL__
 #include <linux/pfn.h>
 
 /*
@@ -13,6 +14,7 @@
  */
 #define MAXMEM_PFN      PFN_DOWN(MAXMEM)
 #define MAX_NONPAE_PFN  (1 << 20)
+#endif
 
 #define PARAM_SIZE 4096
 #define COMMAND_LINE_SIZE 256
diff --git a/include/asm-i386/signal.h b/include/asm-i386/signal.h
index 3824a502351f..c3e8adec5918 100644
--- a/include/asm-i386/signal.h
+++ b/include/asm-i386/signal.h
@@ -2,7 +2,6 @@
 #define _ASMi386_SIGNAL_H
 
 #include <linux/types.h>
-#include <linux/linkage.h>
 #include <linux/time.h>
 #include <linux/compiler.h>
 
@@ -10,6 +9,9 @@
 struct siginfo;
 
 #ifdef __KERNEL__
+
+#include <linux/linkage.h>
+
 /* Most things should be clean enough to redefine this at will, if care
    is taken to make libc match.  */
 
diff --git a/include/asm-i386/spinlock.h b/include/asm-i386/spinlock.h
index d816c62a7a1d..d1020363c41a 100644
--- a/include/asm-i386/spinlock.h
+++ b/include/asm-i386/spinlock.h
@@ -22,7 +22,7 @@
 
 #define __raw_spin_lock_string \
         "\n1:\t" \
-        "lock ; decb %0\n\t" \
+        LOCK_PREFIX " ; decb %0\n\t" \
         "jns 3f\n" \
         "2:\t" \
         "rep;nop\n\t" \
@@ -38,7 +38,7 @@
  */
 #define __raw_spin_lock_string_flags \
         "\n1:\t" \
-        "lock ; decb %0\n\t" \
+        LOCK_PREFIX " ; decb %0\n\t" \
         "jns 5f\n" \
         "2:\t" \
         "testl $0x200, %1\n\t" \
@@ -57,15 +57,9 @@
         "jmp 4b\n" \
         "5:\n\t"
 
-#define __raw_spin_lock_string_up \
-        "\n\tdecb %0"
-
 static inline void __raw_spin_lock(raw_spinlock_t *lock)
 {
-        alternative_smp(
-                __raw_spin_lock_string,
-                __raw_spin_lock_string_up,
-                "+m" (lock->slock) : : "memory");
+        asm(__raw_spin_lock_string : "+m" (lock->slock) : : "memory");
 }
 
 /*
@@ -76,10 +70,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
 #ifndef CONFIG_PROVE_LOCKING
 static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
 {
-        alternative_smp(
-                __raw_spin_lock_string_flags,
-                __raw_spin_lock_string_up,
-                "+m" (lock->slock) : "r" (flags) : "memory");
+        asm(__raw_spin_lock_string_flags : "+m" (lock->slock) : "r" (flags) : "memory");
 }
 #endif
 
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index 49928eb33f8b..098bcee94e38 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -11,9 +11,14 @@
 struct task_struct;     /* one of the stranger aspects of C forward declarations.. */
 extern struct task_struct * FASTCALL(__switch_to(struct task_struct *prev, struct task_struct *next));
 
+/*
+ * Saving eflags is important. It switches not only IOPL between tasks,
+ * it also protects other tasks from NT leaking through sysenter etc.
+ */
 #define switch_to(prev,next,last) do {                                  \
         unsigned long esi,edi;                                          \
-        asm volatile("pushl %%ebp\n\t"                                  \
+        asm volatile("pushfl\n\t"               /* Save flags */        \
+                     "pushl %%ebp\n\t"                                  \
                      "movl %%esp,%0\n\t"        /* save ESP */          \
                      "movl %5,%%esp\n\t"        /* restore ESP */       \
                      "movl $1f,%1\n\t"          /* save EIP */          \
@@ -21,6 +26,7 @@ extern struct task_struct * FASTCALL(__switch_to(struct task_struct *prev, struc
                      "jmp __switch_to\n"                                \
                      "1:\t"                                             \
                      "popl %%ebp\n\t"                                   \
+                     "popfl"                                            \
                      :"=m" (prev->thread.esp),"=m" (prev->thread.eip),  \
                       "=a" (last),"=S" (esi),"=D" (edi)                 \
                      :"m" (next->thread.esp),"m" (next->thread.eip),    \
diff --git a/include/asm-i386/unwind.h b/include/asm-i386/unwind.h
index 69f0f1df6722..4c1a0b968569 100644
--- a/include/asm-i386/unwind.h
+++ b/include/asm-i386/unwind.h
@@ -87,6 +87,7 @@ static inline int arch_unw_user_mode(const struct unwind_frame_info *info)
 #else
 
 #define UNW_PC(frame) ((void)(frame), 0)
+#define UNW_SP(frame) ((void)(frame), 0)
 
 static inline int arch_unw_user_mode(const void *info)
 {