Merge branch 'x86-nuke386-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull "Nuke 386-DX/SX support" from Ingo Molnar:
 "This tree removes ancient-386-CPUs support and thus zaps quite a bit
  of complexity:

    24 files changed, 56 insertions(+), 425 deletions(-)

  ... which complexity has plagued us with extra work whenever we wanted
  to change SMP primitives, for years.

  Unfortunately there's a nostalgic cost: your old original 386 DX33
  system from early 1991 won't be able to boot modern Linux kernels
  anymore.  Sniff."

I'm not sentimental.  Good riddance.

* 'x86-nuke386-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, 386 removal: Document Nx586 as a 386 and thus unsupported
  x86, cleanups: Simplify sync_core() in the case of no CPUID
  x86, 386 removal: Remove CONFIG_X86_POPAD_OK
  x86, 386 removal: Remove CONFIG_X86_WP_WORKS_OK
  x86, 386 removal: Remove CONFIG_INVLPG
  x86, 386 removal: Remove CONFIG_BSWAP
  x86, 386 removal: Remove CONFIG_XADD
  x86, 386 removal: Remove CONFIG_CMPXCHG
  x86, 386 removal: Remove CONFIG_M386 from Kconfig

3 files changed, 0 insertions, 112 deletions

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index b00f6785da74..96b2c6697c9d 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -32,7 +32,6 @@ ifeq ($(CONFIG_X86_32),y)
         lib-y += checksum_32.o
         lib-y += strstr_32.o
         lib-y += string_32.o
-        lib-y += cmpxchg.o
 ifneq ($(CONFIG_X86_CMPXCHG64),y)
         lib-y += cmpxchg8b_emu.o atomic64_386_32.o
 endif
diff --git a/arch/x86/lib/cmpxchg.c b/arch/x86/lib/cmpxchg.c
deleted file mode 100644
index 5d619f6df3ee..000000000000
--- a/arch/x86/lib/cmpxchg.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * cmpxchg*() fallbacks for CPU not supporting these instructions
- */
-
-#include <linux/kernel.h>
-#include <linux/smp.h>
-#include <linux/module.h>
-
-#ifndef CONFIG_X86_CMPXCHG
-unsigned long cmpxchg_386_u8(volatile void *ptr, u8 old, u8 new)
-{
-        u8 prev;
-        unsigned long flags;
-
-        /* Poor man's cmpxchg for 386. Unsuitable for SMP */
-        local_irq_save(flags);
-        prev = *(u8 *)ptr;
-        if (prev == old)
-                *(u8 *)ptr = new;
-        local_irq_restore(flags);
-        return prev;
-}
-EXPORT_SYMBOL(cmpxchg_386_u8);
-
-unsigned long cmpxchg_386_u16(volatile void *ptr, u16 old, u16 new)
-{
-        u16 prev;
-        unsigned long flags;
-
-        /* Poor man's cmpxchg for 386. Unsuitable for SMP */
-        local_irq_save(flags);
-        prev = *(u16 *)ptr;
-        if (prev == old)
-                *(u16 *)ptr = new;
-        local_irq_restore(flags);
-        return prev;
-}
-EXPORT_SYMBOL(cmpxchg_386_u16);
-
-unsigned long cmpxchg_386_u32(volatile void *ptr, u32 old, u32 new)
-{
-        u32 prev;
-        unsigned long flags;
-
-        /* Poor man's cmpxchg for 386. Unsuitable for SMP */
-        local_irq_save(flags);
-        prev = *(u32 *)ptr;
-        if (prev == old)
-                *(u32 *)ptr = new;
-        local_irq_restore(flags);
-        return prev;
-}
-EXPORT_SYMBOL(cmpxchg_386_u32);
-#endif
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
index 98f6d6b68f5a..f0312d746402 100644
--- a/arch/x86/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
@@ -570,63 +570,6 @@ do {									\
 unsigned long __copy_to_user_ll(void __user *to, const void *from,
                                 unsigned long n)
 {
-#ifndef CONFIG_X86_WP_WORKS_OK
-        if (unlikely(boot_cpu_data.wp_works_ok == 0) &&
-                        ((unsigned long)to) < TASK_SIZE) {
-                /*
-                 * When we are in an atomic section (see
-                 * mm/filemap.c:file_read_actor), return the full
-                 * length to take the slow path.
-                 */
-                if (in_atomic())
-                        return n;
-
-                /*
-                 * CPU does not honor the WP bit when writing
-                 * from supervisory mode, and due to preemption or SMP,
-                 * the page tables can change at any time.
-                 * Do it manually.      Manfred <manfred@colorfullife.com>
-                 */
-                while (n) {
-                        unsigned long offset = ((unsigned long)to)%PAGE_SIZE;
-                        unsigned long len = PAGE_SIZE - offset;
-                        int retval;
-                        struct page *pg;
-                        void *maddr;
-
-                        if (len > n)
-                                len = n;
-
-survive:
-                        down_read(&current->mm->mmap_sem);
-                        retval = get_user_pages(current, current->mm,
-                                        (unsigned long)to, 1, 1, 0, &pg, NULL);
-
-                        if (retval == -ENOMEM && is_global_init(current)) {
-                                up_read(&current->mm->mmap_sem);
-                                congestion_wait(BLK_RW_ASYNC, HZ/50);
-                                goto survive;
-                        }
-
-                        if (retval != 1) {
-                                up_read(&current->mm->mmap_sem);
-                                break;
-                        }
-
-                        maddr = kmap_atomic(pg);
-                        memcpy(maddr + offset, from, len);
-                        kunmap_atomic(maddr);
-                        set_page_dirty_lock(pg);
-                        put_page(pg);
-                        up_read(&current->mm->mmap_sem);
-
-                        from += len;
-                        to += len;
-                        n -= len;
-                }
-                return n;
-        }
-#endif
         stac();
         if (movsl_is_ok(to, from, n))
                 __copy_user(to, from, n);