167 files changed, 4861 insertions, 2995 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 145d703227bf..83f521aa103f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -90,7 +90,6 @@ config X86
        select GENERIC_IRQ_SHOW
        select GENERIC_CLOCKEVENTS_MIN_ADJUST
        select IRQ_FORCED_THREADING
-        select USE_GENERIC_SMP_HELPERS if SMP
        select HAVE_BPF_JIT if X86_64
        select HAVE_ARCH_TRANSPARENT_HUGEPAGE
        select CLKEVT_I8253
@@ -123,6 +122,7 @@ config X86
        select COMPAT_OLD_SIGACTION if IA32_EMULATION
        select RTC_LIB
        select HAVE_DEBUG_STACKOVERFLOW
+        select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
 config INSTRUCTION_DECODER
        def_bool y
@@ -254,10 +254,6 @@ config ARCH_HWEIGHT_CFLAGS
        default "-fcall-saved-ecx -fcall-saved-edx" if X86_32
        default "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" if X86_64
-config ARCH_CPU_PROBE_RELEASE
-        def_bool y
-        depends on HOTPLUG_CPU
 config ARCH_SUPPORTS_UPROBES
        def_bool y
@@ -638,10 +634,10 @@ config PARAVIRT_SPINLOCKS
          spinlock implementation with something virtualization-friendly
          (for example, block the virtual CPU rather than spinning).
-          Unfortunately the downside is an up to 5% performance hit on
+          It has a minimal impact on native kernels and gives a nice performance
-          native kernels, with various workloads.
+          benefit on paravirtualized KVM / Xen kernels.
-          If you are unsure how to answer this question, answer N.
+          If you are unsure how to answer this question, answer Y.
 source "arch/x86/xen/Kconfig"
@@ -756,20 +752,25 @@ config DMI
          BIOS code.
 config GART_IOMMU
-        bool "GART IOMMU support" if EXPERT
+        bool "Old AMD GART IOMMU support"
-        default y
        select SWIOTLB
        depends on X86_64 && PCI && AMD_NB
        ---help---
-          Support for full DMA access of devices with 32bit memory access only
+          Provides a driver for older AMD Athlon64/Opteron/Turion/Sempron
-          on systems with more than 3GB. This is usually needed for USB,
+          GART based hardware IOMMUs.
-          sound, many IDE/SATA chipsets and some other devices.
-          Provides a driver for the AMD Athlon64/Opteron/Turion/Sempron GART
+          The GART supports full DMA access for devices with 32-bit access
-          based hardware IOMMU and a software bounce buffer based IOMMU used
+          limitations, on systems with more than 3 GB. This is usually needed
-          on Intel systems and as fallback.
+          for USB, sound, many IDE/SATA chipsets and some other devices.
-          The code is only active when needed (enough memory and limited
-          device) unless CONFIG_IOMMU_DEBUG or iommu=force is specified
+          Newer systems typically have a modern AMD IOMMU, supported via
-          too.
+          the CONFIG_AMD_IOMMU=y config option.
+          In normal configurations this driver is only active when needed:
+          there's more than 3 GB of memory and the system contains a
+          32-bit limited device.
+          If unsure, say Y.
 config CALGARY_IOMMU
        bool "IBM Calgary IOMMU support"
@@ -825,14 +826,16 @@ config MAXSMP
 config NR_CPUS
        int "Maximum number of CPUs" if SMP && !MAXSMP
        range 2 8 if SMP && X86_32 && !X86_BIGSMP
-        range 2 512 if SMP && !MAXSMP
+        range 2 512 if SMP && !MAXSMP && !CPUMASK_OFFSTACK
+        range 2 8192 if SMP && !MAXSMP && CPUMASK_OFFSTACK && X86_64
        default "1" if !SMP
-        default "4096" if MAXSMP
+        default "8192" if MAXSMP
        default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000)
        default "8" if SMP
        ---help---
          This allows you to specify the maximum number of CPUs which this
-          kernel will support.  The maximum supported value is 512 and the
+          kernel will support.  If CPUMASK_OFFSTACK is enabled, the maximum
+          supported value is 4096, otherwise the maximum value is 512.  The
          minimum value which makes sense is 2.
          This is purely to save memory - each supported CPU adds
@@ -1033,6 +1036,7 @@ config X86_REBOOTFIXUPS
 config MICROCODE
        tristate "CPU microcode loading support"
+        depends on CPU_SUP_AMD || CPU_SUP_INTEL
        select FW_LOADER
        ---help---
@@ -1593,7 +1597,7 @@ config EFI_STUB
          This kernel feature allows a bzImage to be loaded directly
          by EFI firmware without the use of a bootloader.
-          See Documentation/x86/efi-stub.txt for more information.
+          See Documentation/efi-stub.txt for more information.
 config SECCOMP
        def_bool y
@@ -1880,6 +1884,10 @@ config USE_PERCPU_NUMA_NODE_ID
        def_bool y
        depends on NUMA
+config ARCH_ENABLE_SPLIT_PMD_PTLOCK
+        def_bool y
+        depends on X86_64 || X86_PAE
 menu "Power management and ACPI options"
 config ARCH_HIBERNATION_HEADER
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 78d91afb8e50..0f3621ed1db6 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -59,6 +59,16 @@ config EARLY_PRINTK_DBGP
          with klogd/syslogd or the X server. You should normally N here,
          unless you want to debug such a crash. You need usb debug device.
+config EARLY_PRINTK_EFI
+        bool "Early printk via the EFI framebuffer"
+        depends on EFI && EARLY_PRINTK
+        select FONT_SUPPORT
+        ---help---
+          Write kernel log output directly into the EFI framebuffer.
+          This is useful for kernel debugging when your machine crashes very
+          early before the console code is initialized.
 config X86_PTDUMP
        bool "Export kernel pagetable layout to userspace via debugfs"
        depends on DEBUG_KERNEL
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 379814bc41e3..dce69a256896 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -71,7 +71,8 @@ GCOV_PROFILE := n
 $(obj)/bzImage: asflags-y  := $(SVGA_MODE)
 quiet_cmd_image = BUILD   $@
-cmd_image = $(obj)/tools/build $(obj)/setup.bin $(obj)/vmlinux.bin $(obj)/zoffset.h > $@
+cmd_image = $(obj)/tools/build $(obj)/setup.bin $(obj)/vmlinux.bin \
+                               $(obj)/zoffset.h $@
 $(obj)/bzImage: $(obj)/setup.bin $(obj)/vmlinux.bin $(obj)/tools/build FORCE
        $(call if_changed,image)
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index b7388a425f09..a7677babf946 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -19,214 +19,10 @@
 static efi_system_table_t *sys_table;
-static void efi_char16_printk(efi_char16_t *str)
-{
-        struct efi_simple_text_output_protocol *out;
-        out = (struct efi_simple_text_output_protocol *)sys_table->con_out;
-        efi_call_phys2(out->output_string, out, str);
-}
-static void efi_printk(char *str)
-{
-        char *s8;
-        for (s8 = str; *s8; s8++) {
-                efi_char16_t ch[2] = { 0 };
-                ch[0] = *s8;
-                if (*s8 == '\n') {
-                        efi_char16_t nl[2] = { '\r', 0 };
-                        efi_char16_printk(nl);
-                }
-                efi_char16_printk(ch);
-        }
-}
-static efi_status_t __get_map(efi_memory_desc_t **map, unsigned long *map_size,
-                              unsigned long *desc_size)
-{
-        efi_memory_desc_t *m = NULL;
-        efi_status_t status;
-        unsigned long key;
-        u32 desc_version;
-        *map_size = sizeof(*m) * 32;
-again:
-        /*
-         * Add an additional efi_memory_desc_t because we're doing an
-         * allocation which may be in a new descriptor region.
-         */
-        *map_size += sizeof(*m);
-        status = efi_call_phys3(sys_table->boottime->allocate_pool,
-                                EFI_LOADER_DATA, *map_size, (void **)&m);
-        if (status != EFI_SUCCESS)
-                goto fail;
-        status = efi_call_phys5(sys_table->boottime->get_memory_map, map_size,
-                                m, &key, desc_size, &desc_version);
-        if (status == EFI_BUFFER_TOO_SMALL) {
-                efi_call_phys1(sys_table->boottime->free_pool, m);
-                goto again;
-        }
-        if (status != EFI_SUCCESS)
-                efi_call_phys1(sys_table->boottime->free_pool, m);
-fail:
+#include "../../../../drivers/firmware/efi/efi-stub-helper.c"
-        *map = m;
-        return status;
-}
-/*
- * Allocate at the highest possible address that is not above 'max'.
- */
-static efi_status_t high_alloc(unsigned long size, unsigned long align,
-                              unsigned long *addr, unsigned long max)
-{
-        unsigned long map_size, desc_size;
-        efi_memory_desc_t *map;
-        efi_status_t status;
-        unsigned long nr_pages;
-        u64 max_addr = 0;
-        int i;
-        status = __get_map(&map, &map_size, &desc_size);
-        if (status != EFI_SUCCESS)
-                goto fail;
-        nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
-again:
-        for (i = 0; i < map_size / desc_size; i++) {
-                efi_memory_desc_t *desc;
-                unsigned long m = (unsigned long)map;
-                u64 start, end;
-                desc = (efi_memory_desc_t *)(m + (i * desc_size));
-                if (desc->type != EFI_CONVENTIONAL_MEMORY)
-                        continue;
-                if (desc->num_pages < nr_pages)
-                        continue;
-                start = desc->phys_addr;
-                end = start + desc->num_pages * (1UL << EFI_PAGE_SHIFT);
-                if ((start + size) > end || (start + size) > max)
-                        continue;
-                if (end - size > max)
-                        end = max;
-                if (round_down(end - size, align) < start)
-                        continue;
-                start = round_down(end - size, align);
-                /*
-                 * Don't allocate at 0x0. It will confuse code that
-                 * checks pointers against NULL.
-                 */
-                if (start == 0x0)
-                        continue;
-                if (start > max_addr)
-                        max_addr = start;
-        }
-        if (!max_addr)
-                status = EFI_NOT_FOUND;
-        else {
-                status = efi_call_phys4(sys_table->boottime->allocate_pages,
-                                        EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,
-                                        nr_pages, &max_addr);
-                if (status != EFI_SUCCESS) {
-                        max = max_addr;
-                        max_addr = 0;
-                        goto again;
-                }
-                *addr = max_addr;
-        }
-free_pool:
-        efi_call_phys1(sys_table->boottime->free_pool, map);
-fail:
-        return status;
-}
-/*
- * Allocate at the lowest possible address.
- */
-static efi_status_t low_alloc(unsigned long size, unsigned long align,
-                              unsigned long *addr)
-{
-        unsigned long map_size, desc_size;
-        efi_memory_desc_t *map;
-        efi_status_t status;
-        unsigned long nr_pages;
-        int i;
-        status = __get_map(&map, &map_size, &desc_size);
-        if (status != EFI_SUCCESS)
-                goto fail;
-        nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
-        for (i = 0; i < map_size / desc_size; i++) {
-                efi_memory_desc_t *desc;
-                unsigned long m = (unsigned long)map;
-                u64 start, end;
-                desc = (efi_memory_desc_t *)(m + (i * desc_size));
-                if (desc->type != EFI_CONVENTIONAL_MEMORY)
-                        continue;
-                if (desc->num_pages < nr_pages)
-                        continue;
-                start = desc->phys_addr;
-                end = start + desc->num_pages * (1UL << EFI_PAGE_SHIFT);
-                /*
-                 * Don't allocate at 0x0. It will confuse code that
-                 * checks pointers against NULL. Skip the first 8
-                 * bytes so we start at a nice even number.
-                 */
-                if (start == 0x0)
-                        start += 8;
-                start = round_up(start, align);
-                if ((start + size) > end)
-                        continue;
-                status = efi_call_phys4(sys_table->boottime->allocate_pages,
-                                        EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,
-                                        nr_pages, &start);
-                if (status == EFI_SUCCESS) {
-                        *addr = start;
-                        break;
-                }
-        }
-        if (i == map_size / desc_size)
-                status = EFI_NOT_FOUND;
-free_pool:
-        efi_call_phys1(sys_table->boottime->free_pool, map);
-fail:
-        return status;
-}
-static void low_free(unsigned long size, unsigned long addr)
-{
-        unsigned long nr_pages;
-        nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
-        efi_call_phys2(sys_table->boottime->free_pages, addr, nr_pages);
-}
 static void find_bits(unsigned long mask, u8 *pos, u8 *size)
 {
@@ -624,242 +420,6 @@ void setup_graphics(struct boot_params *boot_params)
        }
 }
-struct initrd {
-        efi_file_handle_t *handle;
-        u64 size;
-};
-/*
- * Check the cmdline for a LILO-style initrd= arguments.
- *
- * We only support loading an initrd from the same filesystem as the
- * kernel image.
- */
-static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
-                                    struct setup_header *hdr)
-{
-        struct initrd *initrds;
-        unsigned long initrd_addr;
-        efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;
-        u64 initrd_total;
-        efi_file_io_interface_t *io;
-        efi_file_handle_t *fh;
-        efi_status_t status;
-        int nr_initrds;
-        char *str;
-        int i, j, k;
-        initrd_addr = 0;
-        initrd_total = 0;
-        str = (char *)(unsigned long)hdr->cmd_line_ptr;
-        j = 0;                  /* See close_handles */
-        if (!str || !*str)
-                return EFI_SUCCESS;
-        for (nr_initrds = 0; *str; nr_initrds++) {
-                str = strstr(str, "initrd=");
-                if (!str)
-                        break;
-                str += 7;
-                /* Skip any leading slashes */
-                while (*str == '/' || *str == '\\')
-                        str++;
-                while (*str && *str != ' ' && *str != '\n')
-                        str++;
-        }
-        if (!nr_initrds)
-                return EFI_SUCCESS;
-        status = efi_call_phys3(sys_table->boottime->allocate_pool,
-                                EFI_LOADER_DATA,
-                                nr_initrds * sizeof(*initrds),
-                                &initrds);
-        if (status != EFI_SUCCESS) {
-                efi_printk("Failed to alloc mem for initrds\n");
-                goto fail;
-        }
-        str = (char *)(unsigned long)hdr->cmd_line_ptr;
-        for (i = 0; i < nr_initrds; i++) {
-                struct initrd *initrd;
-                efi_file_handle_t *h;
-                efi_file_info_t *info;
-                efi_char16_t filename_16[256];
-                unsigned long info_sz;
-                efi_guid_t info_guid = EFI_FILE_INFO_ID;
-                efi_char16_t *p;
-                u64 file_sz;
-                str = strstr(str, "initrd=");
-                if (!str)
-                        break;
-                str += 7;
-                initrd = &initrds[i];
-                p = filename_16;
-                /* Skip any leading slashes */
-                while (*str == '/' || *str == '\\')
-                        str++;
-                while (*str && *str != ' ' && *str != '\n') {
-                        if ((u8 *)p >= (u8 *)filename_16 + sizeof(filename_16))
-                                break;
-                        if (*str == '/') {
-                                *p++ = '\\';
-                                *str++;
-                        } else {
-                                *p++ = *str++;
-                        }
-                }
-                *p = '\0';
-                /* Only open the volume once. */
-                if (!i) {
-                        efi_boot_services_t *boottime;
-                        boottime = sys_table->boottime;
-                        status = efi_call_phys3(boottime->handle_protocol,
-                                        image->device_handle, &fs_proto, &io);
-                        if (status != EFI_SUCCESS) {
-                                efi_printk("Failed to handle fs_proto\n");
-                                goto free_initrds;
-                        }
-                        status = efi_call_phys2(io->open_volume, io, &fh);
-                        if (status != EFI_SUCCESS) {
-                                efi_printk("Failed to open volume\n");
-                                goto free_initrds;
-                        }
-                }
-                status = efi_call_phys5(fh->open, fh, &h, filename_16,
-                                        EFI_FILE_MODE_READ, (u64)0);
-                if (status != EFI_SUCCESS) {
-                        efi_printk("Failed to open initrd file: ");
-                        efi_char16_printk(filename_16);
-                        efi_printk("\n");
-                        goto close_handles;
-                }
-                initrd->handle = h;
-                info_sz = 0;
-                status = efi_call_phys4(h->get_info, h, &info_guid,
-                                        &info_sz, NULL);
-                if (status != EFI_BUFFER_TOO_SMALL) {
-                        efi_printk("Failed to get initrd info size\n");
-                        goto close_handles;
-                }
-grow:
-                status = efi_call_phys3(sys_table->boottime->allocate_pool,
-                                        EFI_LOADER_DATA, info_sz, &info);
-                if (status != EFI_SUCCESS) {
-                        efi_printk("Failed to alloc mem for initrd info\n");
-                        goto close_handles;
-                }
-                status = efi_call_phys4(h->get_info, h, &info_guid,
-                                        &info_sz, info);
-                if (status == EFI_BUFFER_TOO_SMALL) {
-                        efi_call_phys1(sys_table->boottime->free_pool, info);
-                        goto grow;
-                }
-                file_sz = info->file_size;
-                efi_call_phys1(sys_table->boottime->free_pool, info);
-                if (status != EFI_SUCCESS) {
-                        efi_printk("Failed to get initrd info\n");
-                        goto close_handles;
-                }
-                initrd->size = file_sz;
-                initrd_total += file_sz;
-        }
-        if (initrd_total) {
-                unsigned long addr;
-                /*
-                 * Multiple initrd's need to be at consecutive
-                 * addresses in memory, so allocate enough memory for
-                 * all the initrd's.
-                 */
-                status = high_alloc(initrd_total, 0x1000,
-                                   &initrd_addr, hdr->initrd_addr_max);
-                if (status != EFI_SUCCESS) {
-                        efi_printk("Failed to alloc highmem for initrds\n");
-                        goto close_handles;
-                }
-                /* We've run out of free low memory. */
-                if (initrd_addr > hdr->initrd_addr_max) {
-                        efi_printk("We've run out of free low memory\n");
-                        status = EFI_INVALID_PARAMETER;
-                        goto free_initrd_total;
-                }
-                addr = initrd_addr;
-                for (j = 0; j < nr_initrds; j++) {
-                        u64 size;
-                        size = initrds[j].size;
-                        while (size) {
-                                u64 chunksize;
-                                if (size > EFI_READ_CHUNK_SIZE)
-                                        chunksize = EFI_READ_CHUNK_SIZE;
-                                else
-                                        chunksize = size;
-                                status = efi_call_phys3(fh->read,
-                                                        initrds[j].handle,
-                                                        &chunksize, addr);
-                                if (status != EFI_SUCCESS) {
-                                        efi_printk("Failed to read initrd\n");
-                                        goto free_initrd_total;
-                                }
-                                addr += chunksize;
-                                size -= chunksize;
-                        }
-                        efi_call_phys1(fh->close, initrds[j].handle);
-                }
-        }
-        efi_call_phys1(sys_table->boottime->free_pool, initrds);
-        hdr->ramdisk_image = initrd_addr;
-        hdr->ramdisk_size = initrd_total;
-        return status;
-free_initrd_total:
-        low_free(initrd_total, initrd_addr);
-close_handles:
-        for (k = j; k < i; k++)
-                efi_call_phys1(fh->close, initrds[k].handle);
-free_initrds:
-        efi_call_phys1(sys_table->boottime->free_pool, initrds);
-fail:
-        hdr->ramdisk_image = 0;
-        hdr->ramdisk_size = 0;
-        return status;
-}
 /*
 * Because the x86 boot code expects to be passed a boot_params we
@@ -875,14 +435,15 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
        struct efi_info *efi;
        efi_loaded_image_t *image;
        void *options;
-        u32 load_options_size;
        efi_guid_t proto = LOADED_IMAGE_PROTOCOL_GUID;
        int options_size = 0;
        efi_status_t status;
-        unsigned long cmdline;
+        char *cmdline_ptr;
        u16 *s2;
        u8 *s1;
        int i;
+        unsigned long ramdisk_addr;
+        unsigned long ramdisk_size;
        sys_table = _table;
@@ -893,13 +454,14 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
        status = efi_call_phys3(sys_table->boottime->handle_protocol,
                                handle, &proto, (void *)&image);
        if (status != EFI_SUCCESS) {
-                efi_printk("Failed to get handle for LOADED_IMAGE_PROTOCOL\n");
+                efi_printk(sys_table, "Failed to get handle for LOADED_IMAGE_PROTOCOL\n");
                return NULL;
        }
-        status = low_alloc(0x4000, 1, (unsigned long *)&boot_params);
+        status = efi_low_alloc(sys_table, 0x4000, 1,
+                               (unsigned long *)&boot_params);
        if (status != EFI_SUCCESS) {
-                efi_printk("Failed to alloc lowmem for boot params\n");
+                efi_printk(sys_table, "Failed to alloc lowmem for boot params\n");
                return NULL;
        }
@@ -926,40 +488,11 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
        hdr->type_of_loader = 0x21;
        /* Convert unicode cmdline to ascii */
-        options = image->load_options;
+        cmdline_ptr = efi_convert_cmdline_to_ascii(sys_table, image,
-        load_options_size = image->load_options_size / 2; /* ASCII */
+                                                   &options_size);
-        cmdline = 0;
+        if (!cmdline_ptr)
-        s2 = (u16 *)options;
+                goto fail;
+        hdr->cmd_line_ptr = (unsigned long)cmdline_ptr;
-        if (s2) {
-                while (*s2 && *s2 != '\n' && options_size < load_options_size) {
-                        s2++;
-                        options_size++;
-                }
-                if (options_size) {
-                        if (options_size > hdr->cmdline_size)
-                                options_size = hdr->cmdline_size;
-                        options_size++; /* NUL termination */
-                        status = low_alloc(options_size, 1, &cmdline);
-                        if (status != EFI_SUCCESS) {
-                                efi_printk("Failed to alloc mem for cmdline\n");
-                                goto fail;
-                        }
-                        s1 = (u8 *)(unsigned long)cmdline;
-                        s2 = (u16 *)options;
-                        for (i = 0; i < options_size - 1; i++)
-                                *s1++ = *s2++;
-                        *s1 = '\0';
-                }
-        }
-        hdr->cmd_line_ptr = cmdline;
        hdr->ramdisk_image = 0;
        hdr->ramdisk_size = 0;
@@ -969,96 +502,64 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
        memset(sdt, 0, sizeof(*sdt));
-        status = handle_ramdisks(image, hdr);
+        status = handle_cmdline_files(sys_table, image,
+                                      (char *)(unsigned long)hdr->cmd_line_ptr,
+                                      "initrd=", hdr->initrd_addr_max,
+                                      &ramdisk_addr, &ramdisk_size);
        if (status != EFI_SUCCESS)
                goto fail2;
+        hdr->ramdisk_image = ramdisk_addr;
+        hdr->ramdisk_size = ramdisk_size;
        return boot_params;
 fail2:
-        if (options_size)
+        efi_free(sys_table, options_size, hdr->cmd_line_ptr);
-                low_free(options_size, hdr->cmd_line_ptr);
 fail:
-        low_free(0x4000, (unsigned long)boot_params);
+        efi_free(sys_table, 0x4000, (unsigned long)boot_params);
        return NULL;
 }
-static efi_status_t exit_boot(struct boot_params *boot_params,
+static void add_e820ext(struct boot_params *params,
-                              void *handle)
+                        struct setup_data *e820ext, u32 nr_entries)
 {
-        struct efi_info *efi = &boot_params->efi_info;
+        struct setup_data *data;
-        struct e820entry *e820_map = &boot_params->e820_map[0];
-        struct e820entry *prev = NULL;
-        unsigned long size, key, desc_size, _size;
-        efi_memory_desc_t *mem_map;
        efi_status_t status;
-        __u32 desc_version;
+        unsigned long size;
-        bool called_exit = false;
-        u8 nr_entries;
-        int i;
-        size = sizeof(*mem_map) * 32;
-again:
-        size += sizeof(*mem_map) * 2;
-        _size = size;
-        status = low_alloc(size, 1, (unsigned long *)&mem_map);
-        if (status != EFI_SUCCESS)
-                return status;
-get_map:
-        status = efi_call_phys5(sys_table->boottime->get_memory_map, &size,
-                                mem_map, &key, &desc_size, &desc_version);
-        if (status == EFI_BUFFER_TOO_SMALL) {
-                low_free(_size, (unsigned long)mem_map);
-                goto again;
-        }
-        if (status != EFI_SUCCESS)
+        e820ext->type = SETUP_E820_EXT;
-                goto free_mem_map;
+        e820ext->len = nr_entries * sizeof(struct e820entry);
+        e820ext->next = 0;
-        memcpy(&efi->efi_loader_signature, EFI_LOADER_SIGNATURE, sizeof(__u32));
+        data = (struct setup_data *)(unsigned long)params->hdr.setup_data;
-        efi->efi_systab = (unsigned long)sys_table;
-        efi->efi_memdesc_size = desc_size;
-        efi->efi_memdesc_version = desc_version;
-        efi->efi_memmap = (unsigned long)mem_map;
-        efi->efi_memmap_size = size;
-#ifdef CONFIG_X86_64
-        efi->efi_systab_hi = (unsigned long)sys_table >> 32;
-        efi->efi_memmap_hi = (unsigned long)mem_map >> 32;
-#endif
-        /* Might as well exit boot services now */
+        while (data && data->next)
-        status = efi_call_phys2(sys_table->boottime->exit_boot_services,
+                data = (struct setup_data *)(unsigned long)data->next;
-                                handle, key);
-        if (status != EFI_SUCCESS) {
-                /*
-                 * ExitBootServices() will fail if any of the event
-                 * handlers change the memory map. In which case, we
-                 * must be prepared to retry, but only once so that
-                 * we're guaranteed to exit on repeated failures instead
-                 * of spinning forever.
-                 */
-                if (called_exit)
-                        goto free_mem_map;
-                called_exit = true;
+        if (data)
-                goto get_map;
+                data->next = (unsigned long)e820ext;
-        }
+        else
+                params->hdr.setup_data = (unsigned long)e820ext;
+}
-        /* Historic? */
+static efi_status_t setup_e820(struct boot_params *params,
-        boot_params->alt_mem_k = 32 * 1024;
+                               struct setup_data *e820ext, u32 e820ext_size)
+{
+        struct e820entry *e820_map = &params->e820_map[0];
+        struct efi_info *efi = &params->efi_info;
+        struct e820entry *prev = NULL;
+        u32 nr_entries;
+        u32 nr_desc;
+        int i;
-        /*
-         * Convert the EFI memory map to E820.
-         */
        nr_entries = 0;
-        for (i = 0; i < size / desc_size; i++) {
+        nr_desc = efi->efi_memmap_size / efi->efi_memdesc_size;
+        for (i = 0; i < nr_desc; i++) {
                efi_memory_desc_t *d;
                unsigned int e820_type = 0;
-                unsigned long m = (unsigned long)mem_map;
+                unsigned long m = efi->efi_memmap;
-                d = (efi_memory_desc_t *)(m + (i * desc_size));
+                d = (efi_memory_desc_t *)(m + (i * efi->efi_memdesc_size));
                switch (d->type) {
                case EFI_RESERVED_TYPE:
                case EFI_RUNTIME_SERVICES_CODE:
@@ -1095,61 +596,151 @@ get_map:
                /* Merge adjacent mappings */
                if (prev && prev->type == e820_type &&
-                    (prev->addr + prev->size) == d->phys_addr)
+                    (prev->addr + prev->size) == d->phys_addr) {
                        prev->size += d->num_pages << 12;
-                else {
+                        continue;
-                        e820_map->addr = d->phys_addr;
+                }
-                        e820_map->size = d->num_pages << 12;
-                        e820_map->type = e820_type;
+                if (nr_entries == ARRAY_SIZE(params->e820_map)) {
-                        prev = e820_map++;
+                        u32 need = (nr_desc - i) * sizeof(struct e820entry) +
-                        nr_entries++;
+                                   sizeof(struct setup_data);
+                        if (!e820ext || e820ext_size < need)
+                                return EFI_BUFFER_TOO_SMALL;
+                        /* boot_params map full, switch to e820 extended */
+                        e820_map = (struct e820entry *)e820ext->data;
                }
+                e820_map->addr = d->phys_addr;
+                e820_map->size = d->num_pages << PAGE_SHIFT;
+                e820_map->type = e820_type;
+                prev = e820_map++;
+                nr_entries++;
        }
-        boot_params->e820_entries = nr_entries;
+        if (nr_entries > ARRAY_SIZE(params->e820_map)) {
+                u32 nr_e820ext = nr_entries - ARRAY_SIZE(params->e820_map);
+                add_e820ext(params, e820ext, nr_e820ext);
+                nr_entries -= nr_e820ext;
+        }
+        params->e820_entries = (u8)nr_entries;
        return EFI_SUCCESS;
+}
+static efi_status_t alloc_e820ext(u32 nr_desc, struct setup_data **e820ext,
+                                  u32 *e820ext_size)
+{
+        efi_status_t status;
+        unsigned long size;
+        size = sizeof(struct setup_data) +
+                sizeof(struct e820entry) * nr_desc;
+        if (*e820ext) {
+                efi_call_phys1(sys_table->boottime->free_pool, *e820ext);
+                *e820ext = NULL;
+                *e820ext_size = 0;
+        }
+        status = efi_call_phys3(sys_table->boottime->allocate_pool,
+                                EFI_LOADER_DATA, size, e820ext);
+        if (status == EFI_SUCCESS)
+                *e820ext_size = size;
-free_mem_map:
-        low_free(_size, (unsigned long)mem_map);
        return status;
 }
-static efi_status_t relocate_kernel(struct setup_header *hdr)
+static efi_status_t exit_boot(struct boot_params *boot_params,
+                              void *handle)
 {
-        unsigned long start, nr_pages;
+        struct efi_info *efi = &boot_params->efi_info;
+        unsigned long map_sz, key, desc_size;
+        efi_memory_desc_t *mem_map;
+        struct setup_data *e820ext;
+        __u32 e820ext_size;
+        __u32 nr_desc, prev_nr_desc;
        efi_status_t status;
+        __u32 desc_version;
+        bool called_exit = false;
+        u8 nr_entries;
+        int i;
-        /*
+        nr_desc = 0;
-         * The EFI firmware loader could have placed the kernel image
+        e820ext = NULL;
-         * anywhere in memory, but the kernel has various restrictions
+        e820ext_size = 0;
-         * on the max physical address it can run at. Attempt to move
-         * the kernel to boot_params.pref_address, or as low as
-         * possible.
-         */
-        start = hdr->pref_address;
-        nr_pages = round_up(hdr->init_size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
-        status = efi_call_phys4(sys_table->boottime->allocate_pages,
+get_map:
-                                EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,
+        status = efi_get_memory_map(sys_table, &mem_map, &map_sz, &desc_size,
-                                nr_pages, &start);
+                                    &desc_version, &key);
-        if (status != EFI_SUCCESS) {
-                status = low_alloc(hdr->init_size, hdr->kernel_alignment,
+        if (status != EFI_SUCCESS)
-                                   &start);
+                return status;
+        prev_nr_desc = nr_desc;
+        nr_desc = map_sz / desc_size;
+        if (nr_desc > prev_nr_desc &&
+            nr_desc > ARRAY_SIZE(boot_params->e820_map)) {
+                u32 nr_e820ext = nr_desc - ARRAY_SIZE(boot_params->e820_map);
+                status = alloc_e820ext(nr_e820ext, &e820ext, &e820ext_size);
                if (status != EFI_SUCCESS)
-                        efi_printk("Failed to alloc mem for kernel\n");
+                        goto free_mem_map;
+                efi_call_phys1(sys_table->boottime->free_pool, mem_map);
+                goto get_map; /* Allocated memory, get map again */
        }
-        if (status == EFI_SUCCESS)
+        memcpy(&efi->efi_loader_signature, EFI_LOADER_SIGNATURE, sizeof(__u32));
-                memcpy((void *)start, (void *)(unsigned long)hdr->code32_start,
+        efi->efi_systab = (unsigned long)sys_table;
-                       hdr->init_size);
+        efi->efi_memdesc_size = desc_size;
+        efi->efi_memdesc_version = desc_version;
+        efi->efi_memmap = (unsigned long)mem_map;
+        efi->efi_memmap_size = map_sz;
+#ifdef CONFIG_X86_64
+        efi->efi_systab_hi = (unsigned long)sys_table >> 32;
+        efi->efi_memmap_hi = (unsigned long)mem_map >> 32;
+#endif
-        hdr->pref_address = hdr->code32_start;
+        /* Might as well exit boot services now */
-        hdr->code32_start = (__u32)start;
+        status = efi_call_phys2(sys_table->boottime->exit_boot_services,
+                                handle, key);
+        if (status != EFI_SUCCESS) {
+                /*
+                 * ExitBootServices() will fail if any of the event
+                 * handlers change the memory map. In which case, we
+                 * must be prepared to retry, but only once so that
+                 * we're guaranteed to exit on repeated failures instead
+                 * of spinning forever.
+                 */
+                if (called_exit)
+                        goto free_mem_map;
+                called_exit = true;
+                efi_call_phys1(sys_table->boottime->free_pool, mem_map);
+                goto get_map;
+        }
+        /* Historic? */
+        boot_params->alt_mem_k = 32 * 1024;
+        status = setup_e820(boot_params, e820ext, e820ext_size);
+        if (status != EFI_SUCCESS)
+                return status;
+        return EFI_SUCCESS;
+free_mem_map:
+        efi_call_phys1(sys_table->boottime->free_pool, mem_map);
        return status;
 }
 /*
 * On success we return a pointer to a boot_params structure, and NULL
 * on failure.
@@ -1157,7 +748,7 @@ static efi_status_t relocate_kernel(struct setup_header *hdr)
 struct boot_params *efi_main(void *handle, efi_system_table_t *_table,
                             struct boot_params *boot_params)
 {
-        struct desc_ptr *gdt, *idt;
+        struct desc_ptr *gdt;
        efi_loaded_image_t *image;
        struct setup_header *hdr = &boot_params->hdr;
        efi_status_t status;
@@ -1177,37 +768,33 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table,
                                EFI_LOADER_DATA, sizeof(*gdt),
                                (void **)&gdt);
        if (status != EFI_SUCCESS) {
-                efi_printk("Failed to alloc mem for gdt structure\n");
+                efi_printk(sys_table, "Failed to alloc mem for gdt structure\n");
                goto fail;
        }
        gdt->size = 0x800;
-        status = low_alloc(gdt->size, 8, (unsigned long *)&gdt->address);
+        status = efi_low_alloc(sys_table, gdt->size, 8,
-        if (status != EFI_SUCCESS) {
+                           (unsigned long *)&gdt->address);
-                efi_printk("Failed to alloc mem for gdt\n");
-                goto fail;
-        }
-        status = efi_call_phys3(sys_table->boottime->allocate_pool,
-                                EFI_LOADER_DATA, sizeof(*idt),
-                                (void **)&idt);
        if (status != EFI_SUCCESS) {
-                efi_printk("Failed to alloc mem for idt structure\n");
+                efi_printk(sys_table, "Failed to alloc mem for gdt\n");
                goto fail;
        }
-        idt->size = 0;
-        idt->address = 0;
        /*
         * If the kernel isn't already loaded at the preferred load
         * address, relocate it.
         */
        if (hdr->pref_address != hdr->code32_start) {
-                status = relocate_kernel(hdr);
+                unsigned long bzimage_addr = hdr->code32_start;
+                status = efi_relocate_kernel(sys_table, &bzimage_addr,
+                                             hdr->init_size, hdr->init_size,
+                                             hdr->pref_address,
+                                             hdr->kernel_alignment);
                if (status != EFI_SUCCESS)
                        goto fail;
+                hdr->pref_address = hdr->code32_start;
+                hdr->code32_start = bzimage_addr;
        }
        status = exit_boot(boot_params, handle);
@@ -1267,10 +854,8 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table,
        desc->base2 = 0x00;
 #endif /* CONFIG_X86_64 */
-        asm volatile ("lidt %0" : : "m" (*idt));
-        asm volatile ("lgdt %0" : : "m" (*gdt));
        asm volatile("cli");
+        asm volatile ("lgdt %0" : : "m" (*gdt));
        return boot_params;
 fail:
diff --git a/arch/x86/boot/compressed/eboot.h b/arch/x86/boot/compressed/eboot.h
index e5b0a8f91c5f..81b6b652b46a 100644
--- a/arch/x86/boot/compressed/eboot.h
+++ b/arch/x86/boot/compressed/eboot.h
@@ -11,9 +11,6 @@
 #define DESC_TYPE_CODE_DATA     (1 << 0)
-#define EFI_PAGE_SIZE           (1UL << EFI_PAGE_SHIFT)
-#define EFI_READ_CHUNK_SIZE     (1024 * 1024)
 #define EFI_CONSOLE_OUT_DEVICE_GUID    \
        EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, \
                  0x3f, 0xc1, 0x4d)
@@ -62,10 +59,4 @@ struct efi_uga_draw_protocol {
        void *blt;
 };
-struct efi_simple_text_output_protocol {
-        void *reset;
-        void *output_string;
-        void *test_string;
-};
 #endif /* BOOT_COMPRESSED_EBOOT_H */
diff --git a/arch/x86/boot/compressed/mkpiggy.c b/arch/x86/boot/compressed/mkpiggy.c
index 958a641483dd..b669ab65bf6c 100644
--- a/arch/x86/boot/compressed/mkpiggy.c
+++ b/arch/x86/boot/compressed/mkpiggy.c
@@ -36,11 +36,12 @@ int main(int argc, char *argv[])
        uint32_t olen;
        long ilen;
        unsigned long offs;
-        FILE *f;
+        FILE *f = NULL;
+        int retval = 1;
        if (argc < 2) {
                fprintf(stderr, "Usage: %s compressed_file\n", argv[0]);
-                return 1;
+                goto bail;
        }
        /* Get the information for the compressed kernel image first */
@@ -48,7 +49,7 @@ int main(int argc, char *argv[])
        f = fopen(argv[1], "r");
        if (!f) {
                perror(argv[1]);
-                return 1;
+                goto bail;
        }
@@ -58,12 +59,11 @@ int main(int argc, char *argv[])
        if (fread(&olen, sizeof(olen), 1, f) != 1) {
                perror(argv[1]);
-                return 1;
+                goto bail;
        }
        ilen = ftell(f);
        olen = get_unaligned_le32(&olen);
-        fclose(f);
        /*
         * Now we have the input (compressed) and output (uncompressed)
@@ -91,5 +91,9 @@ int main(int argc, char *argv[])
        printf(".incbin \"%s\"\n", argv[1]);
        printf("input_data_end:\n");
-        return 0;
+        retval = 0;
+bail:
+        if (f)
+                fclose(f);
+        return retval;
 }
diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c
index c941d6a8887f..8e15b22391fc 100644
--- a/arch/x86/boot/tools/build.c
+++ b/arch/x86/boot/tools/build.c
@@ -5,14 +5,15 @@
 */
 /*
- * This file builds a disk-image from two different files:
+ * This file builds a disk-image from three different files:
 *
 * - setup: 8086 machine code, sets up system parm
 * - system: 80386 code for actual system
+ * - zoffset.h: header with ZO_* defines
 *
- * It does some checking that all files are of the correct type, and
+ * It does some checking that all files are of the correct type, and writes
- * just writes the result to stdout, removing headers and padding to
+ * the result to the specified destination, removing headers and padding to
- * the right amount. It also writes some system data to stderr.
+ * the right amount. It also writes some system data to stdout.
 */
 /*
@@ -136,7 +137,7 @@ static void die(const char * str, ...)
 static void usage(void)
 {
-        die("Usage: build setup system [zoffset.h] [> image]");
+        die("Usage: build setup system zoffset.h image");
 }
 #ifdef CONFIG_EFI_STUB
@@ -265,7 +266,7 @@ int main(int argc, char ** argv)
        int c;
        u32 sys_size;
        struct stat sb;
-        FILE *file;
+        FILE *file, *dest;
        int fd;
        void *kernel;
        u32 crc = 0xffffffffUL;
@@ -280,10 +281,13 @@ int main(int argc, char ** argv)
        startup_64 = 0x200;
 #endif
-        if (argc == 4)
+        if (argc != 5)
-                parse_zoffset(argv[3]);
-        else if (argc != 3)
                usage();
+        parse_zoffset(argv[3]);
+        dest = fopen(argv[4], "w");
+        if (!dest)
+                die("Unable to write `%s': %m", argv[4]);
        /* Copy the setup code */
        file = fopen(argv[1], "r");
@@ -318,7 +322,7 @@ int main(int argc, char ** argv)
        /* Set the default root device */
        put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]);
-        fprintf(stderr, "Setup is %d bytes (padded to %d bytes).\n", c, i);
+        printf("Setup is %d bytes (padded to %d bytes).\n", c, i);
        /* Open and stat the kernel file */
        fd = open(argv[2], O_RDONLY);
@@ -327,7 +331,7 @@ int main(int argc, char ** argv)
        if (fstat(fd, &sb))
                die("Unable to stat `%s': %m", argv[2]);
        sz = sb.st_size;
-        fprintf (stderr, "System is %d kB\n", (sz+1023)/1024);
+        printf("System is %d kB\n", (sz+1023)/1024);
        kernel = mmap(NULL, sz, PROT_READ, MAP_SHARED, fd, 0);
        if (kernel == MAP_FAILED)
                die("Unable to mmap '%s': %m", argv[2]);
@@ -348,27 +352,31 @@ int main(int argc, char ** argv)
 #endif
        crc = partial_crc32(buf, i, crc);
-        if (fwrite(buf, 1, i, stdout) != i)
+        if (fwrite(buf, 1, i, dest) != i)
                die("Writing setup failed");
        /* Copy the kernel code */
        crc = partial_crc32(kernel, sz, crc);
-        if (fwrite(kernel, 1, sz, stdout) != sz)
+        if (fwrite(kernel, 1, sz, dest) != sz)
                die("Writing kernel failed");
        /* Add padding leaving 4 bytes for the checksum */
        while (sz++ < (sys_size*16) - 4) {
                crc = partial_crc32_one('\0', crc);
-                if (fwrite("\0", 1, 1, stdout) != 1)
+                if (fwrite("\0", 1, 1, dest) != 1)
                        die("Writing padding failed");
        }
        /* Write the CRC */
-        fprintf(stderr, "CRC %x\n", crc);
+        printf("CRC %x\n", crc);
        put_unaligned_le32(crc, buf);
-        if (fwrite(buf, 1, 4, stdout) != 4)
+        if (fwrite(buf, 1, 4, dest) != 4)
                die("Writing CRC failed");
+        /* Catch any delayed write failures */
+        if (fclose(dest))
+                die("Writing image failed");
        close(fd);
        /* Everything is OK */
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
index 94447086e551..a7fef2621cc9 100644
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@ -142,6 +142,8 @@ CONFIG_MAC80211=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DEBUG_DEVRES=y
 CONFIG_CONNECTOR=y
 CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index 671524d0f6c0..c1119d4c1281 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -141,6 +141,8 @@ CONFIG_MAC80211=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DEBUG_DEVRES=y
 CONFIG_CONNECTOR=y
 CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
index bae3aba95b15..d21ff89207cd 100644
--- a/arch/x86/ia32/ia32_aout.c
+++ b/arch/x86/ia32/ia32_aout.c
@@ -25,6 +25,7 @@
 #include <linux/personality.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
+#include <linux/perf_event.h>
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
@@ -33,14 +34,18 @@
 #include <asm/ia32.h>
 #undef WARN_OLD
-#undef CORE_DUMP /* definitely broken */
 static int load_aout_binary(struct linux_binprm *);
 static int load_aout_library(struct file *);
-#ifdef CORE_DUMP
+#ifdef CONFIG_COREDUMP
-static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
+static int aout_core_dump(struct coredump_params *);
-                          unsigned long limit);
+static unsigned long get_dr(int n)
+{
+        struct perf_event *bp = current->thread.ptrace_bps[n];
+        return bp ? bp->hw.info.address : 0;
+}
 /*
 * fill in the user structure for a core dump..
@@ -48,6 +53,7 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
 static void dump_thread32(struct pt_regs *regs, struct user32 *dump)
 {
        u32 fs, gs;
+        memset(dump, 0, sizeof(*dump));
 /* changed the size calculations - should hopefully work better. lbt */
        dump->magic = CMAGIC;
@@ -57,15 +63,12 @@ static void dump_thread32(struct pt_regs *regs, struct user32 *dump)
        dump->u_dsize = ((unsigned long)
                         (current->mm->brk + (PAGE_SIZE-1))) >> PAGE_SHIFT;
        dump->u_dsize -= dump->u_tsize;
-        dump->u_ssize = 0;
+        dump->u_debugreg[0] = get_dr(0);
-        dump->u_debugreg[0] = current->thread.debugreg0;
+        dump->u_debugreg[1] = get_dr(1);
-        dump->u_debugreg[1] = current->thread.debugreg1;
+        dump->u_debugreg[2] = get_dr(2);
-        dump->u_debugreg[2] = current->thread.debugreg2;
+        dump->u_debugreg[3] = get_dr(3);
-        dump->u_debugreg[3] = current->thread.debugreg3;
-        dump->u_debugreg[4] = 0;
-        dump->u_debugreg[5] = 0;
        dump->u_debugreg[6] = current->thread.debugreg6;
-        dump->u_debugreg[7] = current->thread.debugreg7;
+        dump->u_debugreg[7] = current->thread.ptrace_dr7;
        if (dump->start_stack < 0xc0000000) {
                unsigned long tmp;
@@ -74,24 +77,24 @@ static void dump_thread32(struct pt_regs *regs, struct user32 *dump)
                dump->u_ssize = tmp >> PAGE_SHIFT;
        }
-        dump->regs.bx = regs->bx;
+        dump->regs.ebx = regs->bx;
-        dump->regs.cx = regs->cx;
+        dump->regs.ecx = regs->cx;
-        dump->regs.dx = regs->dx;
+        dump->regs.edx = regs->dx;
-        dump->regs.si = regs->si;
+        dump->regs.esi = regs->si;
-        dump->regs.di = regs->di;
+        dump->regs.edi = regs->di;
-        dump->regs.bp = regs->bp;
+        dump->regs.ebp = regs->bp;
-        dump->regs.ax = regs->ax;
+        dump->regs.eax = regs->ax;
        dump->regs.ds = current->thread.ds;
        dump->regs.es = current->thread.es;
        savesegment(fs, fs);
        dump->regs.fs = fs;
        savesegment(gs, gs);
        dump->regs.gs = gs;
-        dump->regs.orig_ax = regs->orig_ax;
+        dump->regs.orig_eax = regs->orig_ax;
-        dump->regs.ip = regs->ip;
+        dump->regs.eip = regs->ip;
        dump->regs.cs = regs->cs;
-        dump->regs.flags = regs->flags;
+        dump->regs.eflags = regs->flags;
-        dump->regs.sp = regs->sp;
+        dump->regs.esp = regs->sp;
        dump->regs.ss = regs->ss;
 #if 1 /* FIXME */
@@ -107,7 +110,7 @@ static struct linux_binfmt aout_format = {
        .module         = THIS_MODULE,
        .load_binary    = load_aout_binary,
        .load_shlib     = load_aout_library,
-#ifdef CORE_DUMP
+#ifdef CONFIG_COREDUMP
        .core_dump      = aout_core_dump,
 #endif
        .min_coredump   = PAGE_SIZE
@@ -122,7 +125,7 @@ static void set_brk(unsigned long start, unsigned long end)
        vm_brk(start, end - start);
 }
-#ifdef CORE_DUMP
+#ifdef CONFIG_COREDUMP
 /*
 * These are the only things you should do on a core-file: use only these
 * macros to write out all the necessary info.
@@ -130,15 +133,7 @@ static void set_brk(unsigned long start, unsigned long end)
 #include <linux/coredump.h>
-#define DUMP_WRITE(addr, nr)                         \
+#define START_DATA(u)   (u.u_tsize << PAGE_SHIFT)
-        if (!dump_write(file, (void *)(addr), (nr))) \
-                goto end_coredump;
-#define DUMP_SEEK(offset)               \
-        if (!dump_seek(file, offset))   \
-                goto end_coredump;
-#define START_DATA()    (u.u_tsize << PAGE_SHIFT)
 #define START_STACK(u)  (u.start_stack)
 /*
@@ -151,8 +146,7 @@ static void set_brk(unsigned long start, unsigned long end)
 * dumping of the process results in another error..
 */
-static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
+static int aout_core_dump(struct coredump_params *cprm)
-                          unsigned long limit)
 {
        mm_segment_t fs;
        int has_dumped = 0;
@@ -164,19 +158,19 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
        has_dumped = 1;
        strncpy(dump.u_comm, current->comm, sizeof(current->comm));
        dump.u_ar0 = offsetof(struct user32, regs);
-        dump.signal = signr;
+        dump.signal = cprm->siginfo->si_signo;
-        dump_thread32(regs, &dump);
+        dump_thread32(cprm->regs, &dump);
        /*
         * If the size of the dump file exceeds the rlimit, then see
         * what would happen if we wrote the stack, but not the data
         * area.
         */
-        if ((dump.u_dsize + dump.u_ssize + 1) * PAGE_SIZE > limit)
+        if ((dump.u_dsize + dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
                dump.u_dsize = 0;
        /* Make sure we have enough room to write the stack and data areas. */
-        if ((dump.u_ssize + 1) * PAGE_SIZE > limit)
+        if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
                dump.u_ssize = 0;
        /* make sure we actually have a data and stack area to dump */
@@ -190,22 +184,26 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
        set_fs(KERNEL_DS);
        /* struct user */
-        DUMP_WRITE(&dump, sizeof(dump));
+        if (!dump_emit(cprm, &dump, sizeof(dump)))
+                goto end_coredump;
        /* Now dump all of the user data.  Include malloced stuff as well */
-        DUMP_SEEK(PAGE_SIZE - sizeof(dump));
+        if (!dump_skip(cprm, PAGE_SIZE - sizeof(dump)))
+                goto end_coredump;
        /* now we start writing out the user space info */
        set_fs(USER_DS);
        /* Dump the data area */
        if (dump.u_dsize != 0) {
                dump_start = START_DATA(dump);
                dump_size = dump.u_dsize << PAGE_SHIFT;
-                DUMP_WRITE(dump_start, dump_size);
+                if (!dump_emit(cprm, (void *)dump_start, dump_size))
+                        goto end_coredump;
        }
        /* Now prepare to dump the stack area */
        if (dump.u_ssize != 0) {
                dump_start = START_STACK(dump);
                dump_size = dump.u_ssize << PAGE_SHIFT;
-                DUMP_WRITE(dump_start, dump_size);
+                if (!dump_emit(cprm, (void *)dump_start, dump_size))
+                        goto end_coredump;
        }
 end_coredump:
        set_fs(fs);
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 665a730307f2..220675795e08 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -34,7 +34,7 @@
 #include <asm/sys_ia32.h>
 #include <asm/smap.h>
-int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
+int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from)
 {
        int err = 0;
        bool ia32 = test_thread_flag(TIF_IA32);
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index b1977bad5435..c8c1e700c26e 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -26,6 +26,7 @@
 #include <acpi/pdc_intel.h>
 #include <asm/numa.h>
+#include <asm/fixmap.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/mpspec.h>
diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
index 722aa3b04624..da31c8b8a92d 100644
--- a/arch/x86/include/asm/atomic.h
+++ b/arch/x86/include/asm/atomic.h
@@ -6,6 +6,7 @@
 #include <asm/processor.h>
 #include <asm/alternative.h>
 #include <asm/cmpxchg.h>
+#include <asm/rmwcc.h>
 /*
 * Atomic operations that C can't guarantee us.  Useful for
@@ -76,12 +77,7 @@ static inline void atomic_sub(int i, atomic_t *v)
 */
 static inline int atomic_sub_and_test(int i, atomic_t *v)
 {
-        unsigned char c;
+        GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, i, "%0", "e");
-        asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
-                     : "+m" (v->counter), "=qm" (c)
-                     : "ir" (i) : "memory");
-        return c;
 }
 /**
@@ -118,12 +114,7 @@ static inline void atomic_dec(atomic_t *v)
 */
 static inline int atomic_dec_and_test(atomic_t *v)
 {
-        unsigned char c;
+        GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
-        asm volatile(LOCK_PREFIX "decl %0; sete %1"
-                     : "+m" (v->counter), "=qm" (c)
-                     : : "memory");
-        return c != 0;
 }
 /**
@@ -136,12 +127,7 @@ static inline int atomic_dec_and_test(atomic_t *v)
 */
 static inline int atomic_inc_and_test(atomic_t *v)
 {
-        unsigned char c;
+        GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
-        asm volatile(LOCK_PREFIX "incl %0; sete %1"
-                     : "+m" (v->counter), "=qm" (c)
-                     : : "memory");
-        return c != 0;
 }
 /**
@@ -155,12 +141,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
 */
 static inline int atomic_add_negative(int i, atomic_t *v)
 {
-        unsigned char c;
+        GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, i, "%0", "s");
-        asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
-                     : "+m" (v->counter), "=qm" (c)
-                     : "ir" (i) : "memory");
-        return c;
 }
 /**
diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
index 0e1cbfc8ee06..3f065c985aee 100644
--- a/arch/x86/include/asm/atomic64_64.h
+++ b/arch/x86/include/asm/atomic64_64.h
@@ -72,12 +72,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
 */
 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
 {
-        unsigned char c;
+        GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, i, "%0", "e");
-        asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
-                     : "=m" (v->counter), "=qm" (c)
-                     : "er" (i), "m" (v->counter) : "memory");
-        return c;
 }
 /**
@@ -116,12 +111,7 @@ static inline void atomic64_dec(atomic64_t *v)
 */
 static inline int atomic64_dec_and_test(atomic64_t *v)
 {
-        unsigned char c;
+        GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
-        asm volatile(LOCK_PREFIX "decq %0; sete %1"
-                     : "=m" (v->counter), "=qm" (c)
-                     : "m" (v->counter) : "memory");
-        return c != 0;
 }
 /**
@@ -134,12 +124,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
 */
 static inline int atomic64_inc_and_test(atomic64_t *v)
 {
-        unsigned char c;
+        GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
-        asm volatile(LOCK_PREFIX "incq %0; sete %1"
-                     : "=m" (v->counter), "=qm" (c)
-                     : "m" (v->counter) : "memory");
-        return c != 0;
 }
 /**
@@ -153,12 +138,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
 */
 static inline int atomic64_add_negative(long i, atomic64_t *v)
 {
-        unsigned char c;
+        GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, i, "%0", "s");
-        asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
-                     : "=m" (v->counter), "=qm" (c)
-                     : "er" (i), "m" (v->counter) : "memory");
-        return c;
 }
 /**
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index 41639ce8fd63..6d76d0935989 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -14,6 +14,7 @@
 #include <linux/compiler.h>
 #include <asm/alternative.h>
+#include <asm/rmwcc.h>
 #if BITS_PER_LONG == 32
 # define _BITOPS_LONG_SHIFT 5
@@ -204,12 +205,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
 */
 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
 {
-        int oldbit;
+        GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, nr, "%0", "c");
-        asm volatile(LOCK_PREFIX "bts %2,%1\n\t"
-                     "sbb %0,%0" : "=r" (oldbit), ADDR : "Ir" (nr) : "memory");
-        return oldbit;
 }
 /**
@@ -255,13 +251,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
 */
 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
 {
-        int oldbit;
+        GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, nr, "%0", "c");
-        asm volatile(LOCK_PREFIX "btr %2,%1\n\t"
-                     "sbb %0,%0"
-                     : "=r" (oldbit), ADDR : "Ir" (nr) : "memory");
-        return oldbit;
 }
 /**
@@ -314,13 +304,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
 */
 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
 {
-        int oldbit;
+        GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, nr, "%0", "c");
-        asm volatile(LOCK_PREFIX "btc %2,%1\n\t"
-                     "sbb %0,%0"
-                     : "=r" (oldbit), ADDR : "Ir" (nr) : "memory");
-        return oldbit;
 }
 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
index 0fa675033912..cb4c73bfeb48 100644
--- a/arch/x86/include/asm/calling.h
+++ b/arch/x86/include/asm/calling.h
@@ -48,6 +48,8 @@ For 32-bit we have the following conventions - kernel is built with
 #include <asm/dwarf2.h>
+#ifdef CONFIG_X86_64
 /*
 * 64-bit system call stack frame layout defines and helpers,
 * for assembly code:
@@ -192,3 +194,51 @@ For 32-bit we have the following conventions - kernel is built with
        .macro icebp
        .byte 0xf1
        .endm
+#else /* CONFIG_X86_64 */
+/*
+ * For 32bit only simplified versions of SAVE_ALL/RESTORE_ALL. These
+ * are different from the entry_32.S versions in not changing the segment
+ * registers. So only suitable for in kernel use, not when transitioning
+ * from or to user space. The resulting stack frame is not a standard
+ * pt_regs frame. The main use case is calling C code from assembler
+ * when all the registers need to be preserved.
+ */
+        .macro SAVE_ALL
+        pushl_cfi %eax
+        CFI_REL_OFFSET eax, 0
+        pushl_cfi %ebp
+        CFI_REL_OFFSET ebp, 0
+        pushl_cfi %edi
+        CFI_REL_OFFSET edi, 0
+        pushl_cfi %esi
+        CFI_REL_OFFSET esi, 0
+        pushl_cfi %edx
+        CFI_REL_OFFSET edx, 0
+        pushl_cfi %ecx
+        CFI_REL_OFFSET ecx, 0
+        pushl_cfi %ebx
+        CFI_REL_OFFSET ebx, 0
+        .endm
+        .macro RESTORE_ALL
+        popl_cfi %ebx
+        CFI_RESTORE ebx
+        popl_cfi %ecx
+        CFI_RESTORE ecx
+        popl_cfi %edx
+        CFI_RESTORE edx
+        popl_cfi %esi
+        CFI_RESTORE esi
+        popl_cfi %edi
+        CFI_RESTORE edi
+        popl_cfi %ebp
+        CFI_RESTORE ebp
+        popl_cfi %eax
+        CFI_RESTORE eax
+        .endm
+#endif /* CONFIG_X86_64 */
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
index b90e5dfeee46..50d033a8947d 100644
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@ -327,10 +327,25 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
 {
        write_idt_entry(trace_idt_table, entry, gate);
 }
+static inline void _trace_set_gate(int gate, unsigned type, void *addr,
+                                   unsigned dpl, unsigned ist, unsigned seg)
+{
+        gate_desc s;
+        pack_gate(&s, type, (unsigned long)addr, dpl, ist, seg);
+        /*
+         * does not need to be atomic because it is only done once at
+         * setup time
+         */
+        write_trace_idt_entry(gate, &s);
+}
 #else
 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
 {
 }
+#define _trace_set_gate(gate, type, addr, dpl, ist, seg)
 #endif
 static inline void _set_gate(int gate, unsigned type, void *addr,
@@ -353,11 +368,14 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
 * Pentium F0 0F bugfix can have resulted in the mapped
 * IDT being write-protected.
 */
-static inline void set_intr_gate(unsigned int n, void *addr)
+#define set_intr_gate(n, addr)                                          \
-{
+        do {                                                            \
-        BUG_ON((unsigned)n > 0xFF);
+                BUG_ON((unsigned)n > 0xFF);                             \
-        _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
+                _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0,        \
-}
+                          __KERNEL_CS);                                 \
+                _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
+                                0, 0, __KERNEL_CS);                     \
+        } while (0)
 extern int first_system_vector;
 /* used_vectors is BITMAP for irq is not managed by percpu vector_irq */
@@ -374,37 +392,10 @@ static inline void alloc_system_vector(int vector)
        }
 }
-#ifdef CONFIG_TRACING
-static inline void trace_set_intr_gate(unsigned int gate, void *addr)
-{
-        gate_desc s;
-        pack_gate(&s, GATE_INTERRUPT, (unsigned long)addr, 0, 0, __KERNEL_CS);
-        write_idt_entry(trace_idt_table, gate, &s);
-}
-static inline void __trace_alloc_intr_gate(unsigned int n, void *addr)
-{
-        trace_set_intr_gate(n, addr);
-}
-#else
-static inline void trace_set_intr_gate(unsigned int gate, void *addr)
-{
-}
-#define __trace_alloc_intr_gate(n, addr)
-#endif
-static inline void __alloc_intr_gate(unsigned int n, void *addr)
-{
-        set_intr_gate(n, addr);
-}
 #define alloc_intr_gate(n, addr)                                \
        do {                                                    \
                alloc_system_vector(n);                         \
-                __alloc_intr_gate(n, addr);                     \
+                set_intr_gate(n, addr);                         \
-                __trace_alloc_intr_gate(n, trace_##addr);       \
        } while (0)
 /*
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 0062a0125041..65c6e6e3a552 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -109,6 +109,8 @@ static inline bool efi_is_native(void)
        return IS_ENABLED(CONFIG_X86_64) == efi_enabled(EFI_64BIT);
 }
+extern struct console early_efi_console;
 #else
 /*
 * IF EFI is not configured, have the EFI calls return -ENOSYS.
diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
index 4d0bda7b11e3..c49a613c6452 100644
--- a/arch/x86/include/asm/fpu-internal.h
+++ b/arch/x86/include/asm/fpu-internal.h
@@ -365,7 +365,7 @@ static inline void drop_fpu(struct task_struct *tsk)
         * Forget coprocessor state..
         */
        preempt_disable();
-        tsk->fpu_counter = 0;
+        tsk->thread.fpu_counter = 0;
        __drop_fpu(tsk);
        clear_used_math();
        preempt_enable();
@@ -424,7 +424,7 @@ static inline fpu_switch_t switch_fpu_prepare(struct task_struct *old, struct ta
         * or if the past 5 consecutive context-switches used math.
         */
        fpu.preload = tsk_used_math(new) && (use_eager_fpu() ||
-                                             new->fpu_counter > 5);
+                                             new->thread.fpu_counter > 5);
        if (__thread_has_fpu(old)) {
                if (!__save_init_fpu(old))
                        cpu = ~0;
@@ -433,16 +433,16 @@ static inline fpu_switch_t switch_fpu_prepare(struct task_struct *old, struct ta
                /* Don't change CR0.TS if we just switch! */
                if (fpu.preload) {
-                        new->fpu_counter++;
+                        new->thread.fpu_counter++;
                        __thread_set_has_fpu(new);
                        prefetch(new->thread.fpu.state);
                } else if (!use_eager_fpu())
                        stts();
        } else {
-                old->fpu_counter = 0;
+                old->thread.fpu_counter = 0;
                old->thread.fpu.last_cpu = ~0;
                if (fpu.preload) {
-                        new->fpu_counter++;
+                        new->thread.fpu_counter++;
                        if (!use_eager_fpu() && fpu_lazy_restore(new, cpu))
                                fpu.preload = 0;
                        else
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
index 92b3bae08b74..cba45d99ac1a 100644
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
@@ -187,6 +187,9 @@ extern __visible void smp_invalidate_interrupt(struct pt_regs *);
 #endif
 extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void);
+#ifdef CONFIG_TRACING
+#define trace_interrupt interrupt
+#endif
 typedef int vector_irq_t[NR_VECTORS];
 DECLARE_PER_CPU(vector_irq_t, vector_irq);
diff --git a/arch/x86/include/asm/intel-mid.h b/arch/x86/include/asm/intel-mid.h
new file mode 100644
index 000000000000..459769d39263
--- /dev/null
+++ b/arch/x86/include/asm/intel-mid.h
@@ -0,0 +1,113 @@
+/*
+ * intel-mid.h: Intel MID specific setup code
+ *
+ * (C) Copyright 2009 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#ifndef _ASM_X86_INTEL_MID_H
+#define _ASM_X86_INTEL_MID_H
+#include <linux/sfi.h>
+#include <linux/platform_device.h>
+extern int intel_mid_pci_init(void);
+extern int get_gpio_by_name(const char *name);
+extern void intel_scu_device_register(struct platform_device *pdev);
+extern int __init sfi_parse_mrtc(struct sfi_table_header *table);
+extern int __init sfi_parse_mtmr(struct sfi_table_header *table);
+extern int sfi_mrtc_num;
+extern struct sfi_rtc_table_entry sfi_mrtc_array[];
+/*
+ * Here defines the array of devices platform data that IAFW would export
+ * through SFI "DEVS" table, we use name and type to match the device and
+ * its platform data.
+ */
+struct devs_id {
+        char name[SFI_NAME_LEN + 1];
+        u8 type;
+        u8 delay;
+        void *(*get_platform_data)(void *info);
+        /* Custom handler for devices */
+        void (*device_handler)(struct sfi_device_table_entry *pentry,
+                                struct devs_id *dev);
+};
+#define sfi_device(i)   \
+        static const struct devs_id *const __intel_mid_sfi_##i##_dev __used \
+        __attribute__((__section__(".x86_intel_mid_dev.init"))) = &i
+/*
+ * Medfield is the follow-up of Moorestown, it combines two chip solution into
+ * one. Other than that it also added always-on and constant tsc and lapic
+ * timers. Medfield is the platform name, and the chip name is called Penwell
+ * we treat Medfield/Penwell as a variant of Moorestown. Penwell can be
+ * identified via MSRs.
+ */
+enum intel_mid_cpu_type {
+        /* 1 was Moorestown */
+        INTEL_MID_CPU_CHIP_PENWELL = 2,
+};
+extern enum intel_mid_cpu_type __intel_mid_cpu_chip;
+#ifdef CONFIG_X86_INTEL_MID
+static inline enum intel_mid_cpu_type intel_mid_identify_cpu(void)
+{
+        return __intel_mid_cpu_chip;
+}
+static inline bool intel_mid_has_msic(void)
+{
+        return (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_PENWELL);
+}
+#else /* !CONFIG_X86_INTEL_MID */
+#define intel_mid_identify_cpu()    (0)
+#define intel_mid_has_msic()    (0)
+#endif /* !CONFIG_X86_INTEL_MID */
+enum intel_mid_timer_options {
+        INTEL_MID_TIMER_DEFAULT,
+        INTEL_MID_TIMER_APBT_ONLY,
+        INTEL_MID_TIMER_LAPIC_APBT,
+};
+extern enum intel_mid_timer_options intel_mid_timer_options;
+/*
+ * Penwell uses spread spectrum clock, so the freq number is not exactly
+ * the same as reported by MSR based on SDM.
+ */
+#define PENWELL_FSB_FREQ_83SKU         83200
+#define PENWELL_FSB_FREQ_100SKU        99840
+#define SFI_MTMR_MAX_NUM 8
+#define SFI_MRTC_MAX    8
+extern struct console early_mrst_console;
+extern void mrst_early_console_init(void);
+extern struct console early_hsu_console;
+extern void hsu_early_console_init(const char *);
+extern void intel_scu_devices_create(void);
+extern void intel_scu_devices_destroy(void);
+/* VRTC timer */
+#define MRST_VRTC_MAP_SZ        (1024)
+/*#define MRST_VRTC_PGOFFSET    (0xc00) */
+extern void intel_mid_rtc_init(void);
+/* the offset for the mapping of global gpio pin to irq */
+#define INTEL_MID_IRQ_OFFSET 0x100
+#endif /* _ASM_X86_INTEL_MID_H */
diff --git a/arch/x86/include/asm/mrst-vrtc.h b/arch/x86/include/asm/intel_mid_vrtc.h
index 1e69a75412a4..86ff4685c409 100644
--- a/arch/x86/include/asm/mrst-vrtc.h
+++ b/arch/x86/include/asm/intel_mid_vrtc.h
@@ -1,5 +1,5 @@
-#ifndef _MRST_VRTC_H
+#ifndef _INTEL_MID_VRTC_H
-#define _MRST_VRTC_H
+#define _INTEL_MID_VRTC_H
 extern unsigned char vrtc_cmos_read(unsigned char reg);
 extern void vrtc_cmos_write(unsigned char val, unsigned char reg);
diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h
index 2c37aadcbc35..32ce71375b21 100644
--- a/arch/x86/include/asm/kdebug.h
+++ b/arch/x86/include/asm/kdebug.h
@@ -21,7 +21,7 @@ enum die_val {
        DIE_NMIUNKNOWN,
 };
-extern void printk_address(unsigned long address, int reliable);
+extern void printk_address(unsigned long address);
 extern void die(const char *, struct pt_regs *,long);
 extern int __must_check __die(const char *, struct pt_regs *, long);
 extern void show_trace(struct task_struct *t, struct pt_regs *regs,
diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
index 2d89e3980cbd..5b23e605e707 100644
--- a/arch/x86/include/asm/local.h
+++ b/arch/x86/include/asm/local.h
@@ -52,12 +52,7 @@ static inline void local_sub(long i, local_t *l)
 */
 static inline int local_sub_and_test(long i, local_t *l)
 {
-        unsigned char c;
+        GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, i, "%0", "e");
-        asm volatile(_ASM_SUB "%2,%0; sete %1"
-                     : "+m" (l->a.counter), "=qm" (c)
-                     : "ir" (i) : "memory");
-        return c;
 }
 /**
@@ -70,12 +65,7 @@ static inline int local_sub_and_test(long i, local_t *l)
 */
 static inline int local_dec_and_test(local_t *l)
 {
-        unsigned char c;
+        GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
-        asm volatile(_ASM_DEC "%0; sete %1"
-                     : "+m" (l->a.counter), "=qm" (c)
-                     : : "memory");
-        return c != 0;
 }
 /**
@@ -88,12 +78,7 @@ static inline int local_dec_and_test(local_t *l)
 */
 static inline int local_inc_and_test(local_t *l)
 {
-        unsigned char c;
+        GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
-        asm volatile(_ASM_INC "%0; sete %1"
-                     : "+m" (l->a.counter), "=qm" (c)
-                     : : "memory");
-        return c != 0;
 }
 /**
@@ -107,12 +92,7 @@ static inline int local_inc_and_test(local_t *l)
 */
 static inline int local_add_negative(long i, local_t *l)
 {
-        unsigned char c;
+        GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, i, "%0", "s");
-        asm volatile(_ASM_ADD "%2,%0; sets %1"
-                     : "+m" (l->a.counter), "=qm" (c)
-                     : "ir" (i) : "memory");
-        return c;
 }
 /**
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index cbe6b9e404ce..c696a8687567 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -16,6 +16,7 @@
 #define MCG_EXT_CNT_SHIFT       16
 #define MCG_EXT_CNT(c)          (((c) & MCG_EXT_CNT_MASK) >> MCG_EXT_CNT_SHIFT)
 #define MCG_SER_P               (1ULL<<24)   /* MCA recovery/new status bits */
+#define MCG_ELOG_P              (1ULL<<26)   /* Extended error log supported */
 /* MCG_STATUS register defines */
 #define MCG_STATUS_RIPV  (1ULL<<0)   /* restart ip valid */
diff --git a/arch/x86/include/asm/misc.h b/arch/x86/include/asm/misc.h
new file mode 100644
index 000000000000..475f5bbc7f53
--- /dev/null
+++ b/arch/x86/include/asm/misc.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_X86_MISC_H
+#define _ASM_X86_MISC_H
+int num_digits(int val);
+#endif /* _ASM_X86_MISC_H */
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index 626cf70082d7..3142a94c7b4b 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -94,7 +94,7 @@ static inline void early_reserve_e820_mpc_new(void) { }
 #define default_get_smp_config x86_init_uint_noop
 #endif
-void generic_processor_info(int apicid, int version);
+int generic_processor_info(int apicid, int version);
 #ifdef CONFIG_ACPI
 extern void mp_register_ioapic(int id, u32 address, u32 gsi_base);
 extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h
deleted file mode 100644
index fc18bf3ce7c8..000000000000
--- a/arch/x86/include/asm/mrst.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * mrst.h: Intel Moorestown platform specific setup code
- *
- * (C) Copyright 2009 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
- * of the License.
- */
-#ifndef _ASM_X86_MRST_H
-#define _ASM_X86_MRST_H
-#include <linux/sfi.h>
-extern int pci_mrst_init(void);
-extern int __init sfi_parse_mrtc(struct sfi_table_header *table);
-extern int sfi_mrtc_num;
-extern struct sfi_rtc_table_entry sfi_mrtc_array[];
-/*
- * Medfield is the follow-up of Moorestown, it combines two chip solution into
- * one. Other than that it also added always-on and constant tsc and lapic
- * timers. Medfield is the platform name, and the chip name is called Penwell
- * we treat Medfield/Penwell as a variant of Moorestown. Penwell can be
- * identified via MSRs.
- */
-enum mrst_cpu_type {
-        /* 1 was Moorestown */
-        MRST_CPU_CHIP_PENWELL = 2,
-};
-extern enum mrst_cpu_type __mrst_cpu_chip;
-#ifdef CONFIG_X86_INTEL_MID
-static inline enum mrst_cpu_type mrst_identify_cpu(void)
-{
-        return __mrst_cpu_chip;
-}
-#else /* !CONFIG_X86_INTEL_MID */
-#define mrst_identify_cpu()    (0)
-#endif /* !CONFIG_X86_INTEL_MID */
-enum mrst_timer_options {
-        MRST_TIMER_DEFAULT,
-        MRST_TIMER_APBT_ONLY,
-        MRST_TIMER_LAPIC_APBT,
-};
-extern enum mrst_timer_options mrst_timer_options;
-/*
- * Penwell uses spread spectrum clock, so the freq number is not exactly
- * the same as reported by MSR based on SDM.
- */
-#define PENWELL_FSB_FREQ_83SKU         83200
-#define PENWELL_FSB_FREQ_100SKU        99840
-#define SFI_MTMR_MAX_NUM 8
-#define SFI_MRTC_MAX    8
-extern struct console early_mrst_console;
-extern void mrst_early_console_init(void);
-extern struct console early_hsu_console;
-extern void hsu_early_console_init(const char *);
-extern void intel_scu_devices_create(void);
-extern void intel_scu_devices_destroy(void);
-/* VRTC timer */
-#define MRST_VRTC_MAP_SZ        (1024)
-/*#define MRST_VRTC_PGOFFSET    (0xc00) */
-extern void mrst_rtc_init(void);
-#endif /* _ASM_X86_MRST_H */
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index cb7502852acb..e139b13f2a33 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -218,10 +218,14 @@ void msrs_free(struct msr *msrs);
 #ifdef CONFIG_SMP
 int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);
 int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);
+int rdmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 *q);
+int wrmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 q);
 void rdmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs);
 void wrmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs);
 int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);
 int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);
+int rdmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 *q);
+int wrmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q);
 int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]);
 int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8]);
 #else  /*  CONFIG_SMP  */
@@ -235,6 +239,16 @@ static inline int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
        wrmsr(msr_no, l, h);
        return 0;
 }
+static inline int rdmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 *q)
+{
+        rdmsrl(msr_no, *q);
+        return 0;
+}
+static inline int wrmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 q)
+{
+        wrmsrl(msr_no, q);
+        return 0;
+}
 static inline void rdmsr_on_cpus(const struct cpumask *m, u32 msr_no,
                                struct msr *msrs)
 {
@@ -254,6 +268,14 @@ static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
 {
        return wrmsr_safe(msr_no, l, h);
 }
+static inline int rdmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 *q)
+{
+        return rdmsrl_safe(msr_no, q);
+}
+static inline int wrmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q)
+{
+        return wrmsrl_safe(msr_no, q);
+}
 static inline int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8])
 {
        return rdmsr_safe_regs(regs);
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index 0da5200ee79d..94220d14d5cc 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -128,7 +128,8 @@ do {							\
 do {                                                                    \
        typedef typeof(var) pao_T__;                                    \
        const int pao_ID__ = (__builtin_constant_p(val) &&              \
-                              ((val) == 1 || (val) == -1)) ? (val) : 0; \
+                              ((val) == 1 || (val) == -1)) ?            \
+                                (int)(val) : 0;                         \
        if (0) {                                                        \
                pao_T__ pao_tmp__;                                      \
                pao_tmp__ = (val);                                      \
@@ -377,9 +378,6 @@ do {									\
 #define __this_cpu_or_1(pcp, val)       percpu_to_op("or", (pcp), val)
 #define __this_cpu_or_2(pcp, val)       percpu_to_op("or", (pcp), val)
 #define __this_cpu_or_4(pcp, val)       percpu_to_op("or", (pcp), val)
-#define __this_cpu_xor_1(pcp, val)      percpu_to_op("xor", (pcp), val)
-#define __this_cpu_xor_2(pcp, val)      percpu_to_op("xor", (pcp), val)
-#define __this_cpu_xor_4(pcp, val)      percpu_to_op("xor", (pcp), val)
 #define __this_cpu_xchg_1(pcp, val)     percpu_xchg_op(pcp, val)
 #define __this_cpu_xchg_2(pcp, val)     percpu_xchg_op(pcp, val)
 #define __this_cpu_xchg_4(pcp, val)     percpu_xchg_op(pcp, val)
@@ -399,9 +397,6 @@ do {									\
 #define this_cpu_or_1(pcp, val)         percpu_to_op("or", (pcp), val)
 #define this_cpu_or_2(pcp, val)         percpu_to_op("or", (pcp), val)
 #define this_cpu_or_4(pcp, val)         percpu_to_op("or", (pcp), val)
-#define this_cpu_xor_1(pcp, val)        percpu_to_op("xor", (pcp), val)
-#define this_cpu_xor_2(pcp, val)        percpu_to_op("xor", (pcp), val)
-#define this_cpu_xor_4(pcp, val)        percpu_to_op("xor", (pcp), val)
 #define this_cpu_xchg_1(pcp, nval)      percpu_xchg_op(pcp, nval)
 #define this_cpu_xchg_2(pcp, nval)      percpu_xchg_op(pcp, nval)
 #define this_cpu_xchg_4(pcp, nval)      percpu_xchg_op(pcp, nval)
@@ -446,7 +441,6 @@ do {									\
 #define __this_cpu_add_8(pcp, val)      percpu_add_op((pcp), val)
 #define __this_cpu_and_8(pcp, val)      percpu_to_op("and", (pcp), val)
 #define __this_cpu_or_8(pcp, val)       percpu_to_op("or", (pcp), val)
-#define __this_cpu_xor_8(pcp, val)      percpu_to_op("xor", (pcp), val)
 #define __this_cpu_add_return_8(pcp, val) percpu_add_return_op(pcp, val)
 #define __this_cpu_xchg_8(pcp, nval)    percpu_xchg_op(pcp, nval)
 #define __this_cpu_cmpxchg_8(pcp, oval, nval)   percpu_cmpxchg_op(pcp, oval, nval)
@@ -456,7 +450,6 @@ do {									\
 #define this_cpu_add_8(pcp, val)        percpu_add_op((pcp), val)
 #define this_cpu_and_8(pcp, val)        percpu_to_op("and", (pcp), val)
 #define this_cpu_or_8(pcp, val)         percpu_to_op("or", (pcp), val)
-#define this_cpu_xor_8(pcp, val)        percpu_to_op("xor", (pcp), val)
 #define this_cpu_add_return_8(pcp, val) percpu_add_return_op(pcp, val)
 #define this_cpu_xchg_8(pcp, nval)      percpu_xchg_op(pcp, nval)
 #define this_cpu_cmpxchg_8(pcp, oval, nval)     percpu_cmpxchg_op(pcp, oval, nval)
diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
index b4389a468fb6..c4412e972bbd 100644
--- a/arch/x86/include/asm/pgalloc.h
+++ b/arch/x86/include/asm/pgalloc.h
@@ -80,12 +80,21 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
 #if PAGETABLE_LEVELS > 2
 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
 {
-        return (pmd_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
+        struct page *page;
+        page = alloc_pages(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO, 0);
+        if (!page)
+                return NULL;
+        if (!pgtable_pmd_page_ctor(page)) {
+                __free_pages(page, 0);
+                return NULL;
+        }
+        return (pmd_t *)page_address(page);
 }
 static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
 {
        BUG_ON((unsigned long)pmd & (PAGE_SIZE-1));
+        pgtable_pmd_page_dtor(virt_to_page(pmd));
        free_page((unsigned long)pmd);
 }
diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
new file mode 100644
index 000000000000..8729723636fd
--- /dev/null
+++ b/arch/x86/include/asm/preempt.h
@@ -0,0 +1,100 @@
+#ifndef __ASM_PREEMPT_H
+#define __ASM_PREEMPT_H
+#include <asm/rmwcc.h>
+#include <asm/percpu.h>
+#include <linux/thread_info.h>
+DECLARE_PER_CPU(int, __preempt_count);
+/*
+ * We mask the PREEMPT_NEED_RESCHED bit so as not to confuse all current users
+ * that think a non-zero value indicates we cannot preempt.
+ */
+static __always_inline int preempt_count(void)
+{
+        return __this_cpu_read_4(__preempt_count) & ~PREEMPT_NEED_RESCHED;
+}
+static __always_inline void preempt_count_set(int pc)
+{
+        __this_cpu_write_4(__preempt_count, pc);
+}
+/*
+ * must be macros to avoid header recursion hell
+ */
+#define task_preempt_count(p) \
+        (task_thread_info(p)->saved_preempt_count & ~PREEMPT_NEED_RESCHED)
+#define init_task_preempt_count(p) do { \
+        task_thread_info(p)->saved_preempt_count = PREEMPT_DISABLED; \
+} while (0)
+#define init_idle_preempt_count(p, cpu) do { \
+        task_thread_info(p)->saved_preempt_count = PREEMPT_ENABLED; \
+        per_cpu(__preempt_count, (cpu)) = PREEMPT_ENABLED; \
+} while (0)
+/*
+ * We fold the NEED_RESCHED bit into the preempt count such that
+ * preempt_enable() can decrement and test for needing to reschedule with a
+ * single instruction.
+ *
+ * We invert the actual bit, so that when the decrement hits 0 we know we both
+ * need to resched (the bit is cleared) and can resched (no preempt count).
+ */
+static __always_inline void set_preempt_need_resched(void)
+{
+        __this_cpu_and_4(__preempt_count, ~PREEMPT_NEED_RESCHED);
+}
+static __always_inline void clear_preempt_need_resched(void)
+{
+        __this_cpu_or_4(__preempt_count, PREEMPT_NEED_RESCHED);
+}
+static __always_inline bool test_preempt_need_resched(void)
+{
+        return !(__this_cpu_read_4(__preempt_count) & PREEMPT_NEED_RESCHED);
+}
+/*
+ * The various preempt_count add/sub methods
+ */
+static __always_inline void __preempt_count_add(int val)
+{
+        __this_cpu_add_4(__preempt_count, val);
+}
+static __always_inline void __preempt_count_sub(int val)
+{
+        __this_cpu_add_4(__preempt_count, -val);
+}
+static __always_inline bool __preempt_count_dec_and_test(void)
+{
+        GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
+}
+/*
+ * Returns true when we need to resched and can (barring IRQ state).
+ */
+static __always_inline bool should_resched(void)
+{
+        return unlikely(!__this_cpu_read_4(__preempt_count));
+}
+#ifdef CONFIG_PREEMPT
+  extern asmlinkage void ___preempt_schedule(void);
+# define __preempt_schedule() asm ("call ___preempt_schedule")
+  extern asmlinkage void preempt_schedule(void);
+# ifdef CONFIG_CONTEXT_TRACKING
+    extern asmlinkage void ___preempt_schedule_context(void);
+#   define __preempt_schedule_context() asm ("call ___preempt_schedule_context")
+# endif
+#endif
+#endif /* __ASM_PREEMPT_H */
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 987c75ecc334..7b034a4057f9 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -488,6 +488,15 @@ struct thread_struct {
        unsigned long           iopl;
        /* Max allowed port in the bitmap, in bytes: */
        unsigned                io_bitmap_max;
+        /*
+         * fpu_counter contains the number of consecutive context switches
+         * that the FPU is used. If this is over a threshold, the lazy fpu
+         * saving becomes unlazy to save the trap. This is an unsigned char
+         * so that after 256 times the counter wraps and the behavior turns
+         * lazy again; this to deal with bursty apps that only use FPU for
+         * a short time
+         */
+        unsigned char fpu_counter;
 };
 /*
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index bade6ac3b14f..fbeb06ed0eaa 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -39,10 +39,5 @@ static inline void x86_dtb_init(void) { }
 extern char cmd_line[COMMAND_LINE_SIZE];
-#define pci_address_to_pio pci_address_to_pio
-unsigned long pci_address_to_pio(phys_addr_t addr);
-#define HAVE_ARCH_DEVTREE_FIXUPS
 #endif /* __ASSEMBLY__ */
 #endif
diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
new file mode 100644
index 000000000000..1ff990f1de8e
--- /dev/null
+++ b/arch/x86/include/asm/rmwcc.h
@@ -0,0 +1,41 @@
+#ifndef _ASM_X86_RMWcc
+#define _ASM_X86_RMWcc
+#ifdef CC_HAVE_ASM_GOTO
+#define __GEN_RMWcc(fullop, var, cc, ...)                               \
+do {                                                                    \
+        asm_volatile_goto (fullop "; j" cc " %l[cc_label]"              \
+                        : : "m" (var), ## __VA_ARGS__                   \
+                        : "memory" : cc_label);                         \
+        return 0;                                                       \
+cc_label:                                                               \
+        return 1;                                                       \
+} while (0)
+#define GEN_UNARY_RMWcc(op, var, arg0, cc)                              \
+        __GEN_RMWcc(op " " arg0, var, cc)
+#define GEN_BINARY_RMWcc(op, var, val, arg0, cc)                        \
+        __GEN_RMWcc(op " %1, " arg0, var, cc, "er" (val))
+#else /* !CC_HAVE_ASM_GOTO */
+#define __GEN_RMWcc(fullop, var, cc, ...)                               \
+do {                                                                    \
+        char c;                                                         \
+        asm volatile (fullop "; set" cc " %1"                           \
+                        : "+m" (var), "=qm" (c)                         \
+                        : __VA_ARGS__ : "memory");                      \
+        return c != 0;                                                  \
+} while (0)
+#define GEN_UNARY_RMWcc(op, var, arg0, cc)                              \
+        __GEN_RMWcc(op " " arg0, var, cc)
+#define GEN_BINARY_RMWcc(op, var, val, arg0, cc)                        \
+        __GEN_RMWcc(op " %2, " arg0, var, cc, "er" (val))
+#endif /* CC_HAVE_ASM_GOTO */
+#endif /* _ASM_X86_RMWcc */
diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
index c48a95035a77..6f1c3a8a33ab 100644
--- a/arch/x86/include/asm/segment.h
+++ b/arch/x86/include/asm/segment.h
@@ -214,6 +214,9 @@
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 extern const char early_idt_handlers[NUM_EXCEPTION_VECTORS][2+2+5];
+#ifdef CONFIG_TRACING
+#define trace_early_idt_handlers early_idt_handlers
+#endif
 /*
 * Load a segment. Fall back on loading the zero
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 347555492dad..59bcf4e22418 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -51,9 +51,9 @@ extern void i386_reserve_resources(void);
 extern void setup_default_timer_irq(void);
 #ifdef CONFIG_X86_INTEL_MID
-extern void x86_mrst_early_setup(void);
+extern void x86_intel_mid_early_setup(void);
 #else
-static inline void x86_mrst_early_setup(void) { }
+static inline void x86_intel_mid_early_setup(void) { }
 #endif
 #ifdef CONFIG_X86_INTEL_CE
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index 27811190cbd7..c46a46be1ec6 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -28,8 +28,7 @@ struct thread_info {
        __u32                   flags;          /* low level flags */
        __u32                   status;         /* thread synchronous flags */
        __u32                   cpu;            /* current CPU */
-        int                     preempt_count;  /* 0 => preemptable,
+        int                     saved_preempt_count;
-                                                   <0 => BUG */
        mm_segment_t            addr_limit;
        struct restart_block    restart_block;
        void __user             *sysenter_return;
@@ -49,7 +48,7 @@ struct thread_info {
        .exec_domain    = &default_exec_domain, \
        .flags          = 0,                    \
        .cpu            = 0,                    \
-        .preempt_count  = INIT_PREEMPT_COUNT,   \
+        .saved_preempt_count = INIT_PREEMPT_COUNT,      \
        .addr_limit     = KERNEL_DS,            \
        .restart_block = {                      \
                .fn = do_no_restart_syscall,    \
diff --git a/arch/x86/include/asm/trace/exceptions.h b/arch/x86/include/asm/trace/exceptions.h
new file mode 100644
index 000000000000..2fbc66c7885b
--- /dev/null
+++ b/arch/x86/include/asm/trace/exceptions.h
@@ -0,0 +1,52 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM exceptions
+#if !defined(_TRACE_PAGE_FAULT_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_PAGE_FAULT_H
+#include <linux/tracepoint.h>
+extern void trace_irq_vector_regfunc(void);
+extern void trace_irq_vector_unregfunc(void);
+DECLARE_EVENT_CLASS(x86_exceptions,
+        TP_PROTO(unsigned long address, struct pt_regs *regs,
+                 unsigned long error_code),
+        TP_ARGS(address, regs, error_code),
+        TP_STRUCT__entry(
+                __field(                unsigned long, address  )
+                __field(                unsigned long, ip       )
+                __field(                unsigned long, error_code )
+        ),
+        TP_fast_assign(
+                __entry->address = address;
+                __entry->ip = regs->ip;
+                __entry->error_code = error_code;
+        ),
+        TP_printk("address=%pf ip=%pf error_code=0x%lx",
+                  (void *)__entry->address, (void *)__entry->ip,
+                  __entry->error_code) );
+#define DEFINE_PAGE_FAULT_EVENT(name)                           \
+DEFINE_EVENT_FN(x86_exceptions, name,                           \
+        TP_PROTO(unsigned long address, struct pt_regs *regs,   \
+                 unsigned long error_code),                     \
+        TP_ARGS(address, regs, error_code),                     \
+        trace_irq_vector_regfunc,                               \
+        trace_irq_vector_unregfunc);
+DEFINE_PAGE_FAULT_EVENT(page_fault_user);
+DEFINE_PAGE_FAULT_EVENT(page_fault_kernel);
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_FILE exceptions
+#endif /*  _TRACE_PAGE_FAULT_H */
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
index 7036cb60cd87..58d66fe06b61 100644
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.h
@@ -37,6 +37,23 @@ asmlinkage void machine_check(void);
 #endif /* CONFIG_X86_MCE */
 asmlinkage void simd_coprocessor_error(void);
+#ifdef CONFIG_TRACING
+asmlinkage void trace_page_fault(void);
+#define trace_divide_error divide_error
+#define trace_bounds bounds
+#define trace_invalid_op invalid_op
+#define trace_device_not_available device_not_available
+#define trace_coprocessor_segment_overrun coprocessor_segment_overrun
+#define trace_invalid_TSS invalid_TSS
+#define trace_segment_not_present segment_not_present
+#define trace_general_protection general_protection
+#define trace_spurious_interrupt_bug spurious_interrupt_bug
+#define trace_coprocessor_error coprocessor_error
+#define trace_alignment_check alignment_check
+#define trace_simd_coprocessor_error simd_coprocessor_error
+#define trace_async_page_fault async_page_fault
+#endif
 dotraplinkage void do_divide_error(struct pt_regs *, long);
 dotraplinkage void do_debug(struct pt_regs *, long);
 dotraplinkage void do_nmi(struct pt_regs *, long);
@@ -55,6 +72,9 @@ asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *);
 #endif
 dotraplinkage void do_general_protection(struct pt_regs *, long);
 dotraplinkage void do_page_fault(struct pt_regs *, unsigned long);
+#ifdef CONFIG_TRACING
+dotraplinkage void trace_do_page_fault(struct pt_regs *, unsigned long);
+#endif
 dotraplinkage void do_spurious_interrupt_bug(struct pt_regs *, long);
 dotraplinkage void do_coprocessor_error(struct pt_regs *, long);
 dotraplinkage void do_alignment_check(struct pt_regs *, long);
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index 5838fa911aa0..8ec57c07b125 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -542,5 +542,103 @@ extern struct movsl_mask {
 # include <asm/uaccess_64.h>
 #endif
+unsigned long __must_check _copy_from_user(void *to, const void __user *from,
+                                           unsigned n);
+unsigned long __must_check _copy_to_user(void __user *to, const void *from,
+                                         unsigned n);
+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
+# define copy_user_diag __compiletime_error
+#else
+# define copy_user_diag __compiletime_warning
+#endif
+extern void copy_user_diag("copy_from_user() buffer size is too small")
+copy_from_user_overflow(void);
+extern void copy_user_diag("copy_to_user() buffer size is too small")
+copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
+#undef copy_user_diag
+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
+extern void
+__compiletime_warning("copy_from_user() buffer size is not provably correct")
+__copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
+#define __copy_from_user_overflow(size, count) __copy_from_user_overflow()
+extern void
+__compiletime_warning("copy_to_user() buffer size is not provably correct")
+__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
+#define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
+#else
+static inline void
+__copy_from_user_overflow(int size, unsigned long count)
+{
+        WARN(1, "Buffer overflow detected (%d < %lu)!\n", size, count);
+}
+#define __copy_to_user_overflow __copy_from_user_overflow
+#endif
+static inline unsigned long __must_check
+copy_from_user(void *to, const void __user *from, unsigned long n)
+{
+        int sz = __compiletime_object_size(to);
+        might_fault();
+        /*
+         * While we would like to have the compiler do the checking for us
+         * even in the non-constant size case, any false positives there are
+         * a problem (especially when DEBUG_STRICT_USER_COPY_CHECKS, but even
+         * without - the [hopefully] dangerous looking nature of the warning
+         * would make people go look at the respecitive call sites over and
+         * over again just to find that there's no problem).
+         *
+         * And there are cases where it's just not realistic for the compiler
+         * to prove the count to be in range. For example when multiple call
+         * sites of a helper function - perhaps in different source files -
+         * all doing proper range checking, yet the helper function not doing
+         * so again.
+         *
+         * Therefore limit the compile time checking to the constant size
+         * case, and do only runtime checking for non-constant sizes.
+         */
+        if (likely(sz < 0 || sz >= n))
+                n = _copy_from_user(to, from, n);
+        else if(__builtin_constant_p(n))
+                copy_from_user_overflow();
+        else
+                __copy_from_user_overflow(sz, n);
+        return n;
+}
+static inline unsigned long __must_check
+copy_to_user(void __user *to, const void *from, unsigned long n)
+{
+        int sz = __compiletime_object_size(from);
+        might_fault();
+        /* See the comment in copy_from_user() above. */
+        if (likely(sz < 0 || sz >= n))
+                n = _copy_to_user(to, from, n);
+        else if(__builtin_constant_p(n))
+                copy_to_user_overflow();
+        else
+                __copy_to_user_overflow(sz, n);
+        return n;
+}
+#undef __copy_from_user_overflow
+#undef __copy_to_user_overflow
 #endif /* _ASM_X86_UACCESS_H */
diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
index 7f760a9f1f61..3c03a5de64d3 100644
--- a/arch/x86/include/asm/uaccess_32.h
+++ b/arch/x86/include/asm/uaccess_32.h
@@ -184,33 +184,4 @@ __copy_from_user_inatomic_nocache(void *to, const void __user *from,
       return __copy_from_user_ll_nocache_nozero(to, from, n);
 }
-unsigned long __must_check copy_to_user(void __user *to,
-                                        const void *from, unsigned long n);
-unsigned long __must_check _copy_from_user(void *to,
-                                          const void __user *from,
-                                          unsigned long n);
-extern void copy_from_user_overflow(void)
-#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
-        __compiletime_error("copy_from_user() buffer size is not provably correct")
-#else
-        __compiletime_warning("copy_from_user() buffer size is not provably correct")
-#endif
-;
-static inline unsigned long __must_check copy_from_user(void *to,
-                                          const void __user *from,
-                                          unsigned long n)
-{
-        int sz = __compiletime_object_size(to);
-        if (likely(sz == -1 || sz >= n))
-                n = _copy_from_user(to, from, n);
-        else
-                copy_from_user_overflow();
-        return n;
-}
 #endif /* _ASM_X86_UACCESS_32_H */
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
index 4f7923dd0007..190413d0de57 100644
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -46,42 +46,13 @@ copy_user_generic(void *to, const void *from, unsigned len)
 }
 __must_check unsigned long
-_copy_to_user(void __user *to, const void *from, unsigned len);
-__must_check unsigned long
-_copy_from_user(void *to, const void __user *from, unsigned len);
-__must_check unsigned long
 copy_in_user(void __user *to, const void __user *from, unsigned len);
-static inline unsigned long __must_check copy_from_user(void *to,
-                                          const void __user *from,
-                                          unsigned long n)
-{
-        int sz = __compiletime_object_size(to);
-        might_fault();
-        if (likely(sz == -1 || sz >= n))
-                n = _copy_from_user(to, from, n);
-#ifdef CONFIG_DEBUG_VM
-        else
-                WARN(1, "Buffer overflow detected!\n");
-#endif
-        return n;
-}
 static __always_inline __must_check
-int copy_to_user(void __user *dst, const void *src, unsigned size)
+int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
-{
-        might_fault();
-        return _copy_to_user(dst, src, size);
-}
-static __always_inline __must_check
-int __copy_from_user(void *dst, const void __user *src, unsigned size)
 {
        int ret = 0;
-        might_fault();
        if (!__builtin_constant_p(size))
                return copy_user_generic(dst, (__force void *)src, size);
        switch (size) {
@@ -121,11 +92,17 @@ int __copy_from_user(void *dst, const void __user *src, unsigned size)
 }
 static __always_inline __must_check
-int __copy_to_user(void __user *dst, const void *src, unsigned size)
+int __copy_from_user(void *dst, const void __user *src, unsigned size)
+{
+        might_fault();
+        return __copy_from_user_nocheck(dst, src, size);
+}
+static __always_inline __must_check
+int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
 {
        int ret = 0;
-        might_fault();
        if (!__builtin_constant_p(size))
                return copy_user_generic((__force void *)dst, src, size);
        switch (size) {
@@ -165,6 +142,13 @@ int __copy_to_user(void __user *dst, const void *src, unsigned size)
 }
 static __always_inline __must_check
+int __copy_to_user(void __user *dst, const void *src, unsigned size)
+{
+        might_fault();
+        return __copy_to_user_nocheck(dst, src, size);
+}
+static __always_inline __must_check
 int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
 {
        int ret = 0;
@@ -220,13 +204,13 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
 static __must_check __always_inline int
 __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
 {
-        return copy_user_generic(dst, (__force const void *)src, size);
+        return __copy_from_user_nocheck(dst, (__force const void *)src, size);
 }
 static __must_check __always_inline int
 __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
 {
-        return copy_user_generic((__force void *)dst, src, size);
+        return __copy_to_user_nocheck((__force void *)dst, src, size);
 }
 extern long __copy_user_nocache(void *dst, const void __user *src,
diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h
index 6e5197910fd8..3087ea9c5f2e 100644
--- a/arch/x86/include/asm/uprobes.h
+++ b/arch/x86/include/asm/uprobes.h
@@ -35,7 +35,10 @@ typedef u8 uprobe_opcode_t;
 struct arch_uprobe {
        u16                             fixups;
-        u8                              insn[MAX_UINSN_BYTES];
+        union {
+                u8                      insn[MAX_UINSN_BYTES];
+                u8                      ixol[MAX_UINSN_BYTES];
+        };
 #ifdef CONFIG_X86_64
        unsigned long                   rip_rela_target_address;
 #endif
@@ -49,11 +52,4 @@ struct arch_uprobe_task {
        unsigned int                    saved_tf;
 };
-extern int  arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long addr);
-extern int  arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs);
-extern int  arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs);
-extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk);
-extern int  arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, void *data);
-extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, struct pt_regs *regs);
-extern unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs *regs);
 #endif  /* _ASM_UPROBES_H */
diff --git a/arch/x86/include/asm/uv/uv.h b/arch/x86/include/asm/uv/uv.h
index 062921ef34e9..6b964a0b86d1 100644
--- a/arch/x86/include/asm/uv/uv.h
+++ b/arch/x86/include/asm/uv/uv.h
@@ -12,6 +12,7 @@ extern enum uv_system_type get_uv_system_type(void);
 extern int is_uv_system(void);
 extern void uv_cpu_init(void);
 extern void uv_nmi_init(void);
+extern void uv_register_nmi_notifier(void);
 extern void uv_system_init(void);
 extern const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,
                                                 struct mm_struct *mm,
@@ -25,6 +26,7 @@ static inline enum uv_system_type get_uv_system_type(void) { return UV_NONE; }
 static inline int is_uv_system(void)    { return 0; }
 static inline void uv_cpu_init(void)    { }
 static inline void uv_system_init(void) { }
+static inline void uv_register_nmi_notifier(void) { }
 static inline const struct cpumask *
 uv_flush_tlb_others(const struct cpumask *cpumask, struct mm_struct *mm,
                    unsigned long start, unsigned long end, unsigned int cpu)
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index 2c32df95bb78..a30836c8ac4d 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -502,8 +502,8 @@ struct uv_blade_info {
        unsigned short  nr_online_cpus;
        unsigned short  pnode;
        short           memory_nid;
-        spinlock_t      nmi_lock;
+        spinlock_t      nmi_lock;       /* obsolete, see uv_hub_nmi */
-        unsigned long   nmi_count;
+        unsigned long   nmi_count;      /* obsolete, see uv_hub_nmi */
 };
 extern struct uv_blade_info *uv_blade_info;
 extern short *uv_node_to_blade;
@@ -576,6 +576,59 @@ static inline int uv_num_possible_blades(void)
        return uv_possible_blades;
 }
+/* Per Hub NMI support */
+extern void uv_nmi_setup(void);
+/* BMC sets a bit this MMR non-zero before sending an NMI */
+#define UVH_NMI_MMR             UVH_SCRATCH5
+#define UVH_NMI_MMR_CLEAR       UVH_SCRATCH5_ALIAS
+#define UVH_NMI_MMR_SHIFT       63
+#define UVH_NMI_MMR_TYPE        "SCRATCH5"
+/* Newer SMM NMI handler, not present in all systems */
+#define UVH_NMI_MMRX            UVH_EVENT_OCCURRED0
+#define UVH_NMI_MMRX_CLEAR      UVH_EVENT_OCCURRED0_ALIAS
+#define UVH_NMI_MMRX_SHIFT      (is_uv1_hub() ? \
+                                        UV1H_EVENT_OCCURRED0_EXTIO_INT0_SHFT :\
+                                        UVXH_EVENT_OCCURRED0_EXTIO_INT0_SHFT)
+#define UVH_NMI_MMRX_TYPE       "EXTIO_INT0"
+/* Non-zero indicates newer SMM NMI handler present */
+#define UVH_NMI_MMRX_SUPPORTED  UVH_EXTIO_INT0_BROADCAST
+/* Indicates to BIOS that we want to use the newer SMM NMI handler */
+#define UVH_NMI_MMRX_REQ        UVH_SCRATCH5_ALIAS_2
+#define UVH_NMI_MMRX_REQ_SHIFT  62
+struct uv_hub_nmi_s {
+        raw_spinlock_t  nmi_lock;
+        atomic_t        in_nmi;         /* flag this node in UV NMI IRQ */
+        atomic_t        cpu_owner;      /* last locker of this struct */
+        atomic_t        read_mmr_count; /* count of MMR reads */
+        atomic_t        nmi_count;      /* count of true UV NMIs */
+        unsigned long   nmi_value;      /* last value read from NMI MMR */
+};
+struct uv_cpu_nmi_s {
+        struct uv_hub_nmi_s     *hub;
+        atomic_t                state;
+        atomic_t                pinging;
+        int                     queries;
+        int                     pings;
+};
+DECLARE_PER_CPU(struct uv_cpu_nmi_s, __uv_cpu_nmi);
+#define uv_cpu_nmi                      (__get_cpu_var(__uv_cpu_nmi))
+#define uv_hub_nmi                      (uv_cpu_nmi.hub)
+#define uv_cpu_nmi_per(cpu)             (per_cpu(__uv_cpu_nmi, cpu))
+#define uv_hub_nmi_per(cpu)             (uv_cpu_nmi_per(cpu).hub)
+/* uv_cpu_nmi_states */
+#define UV_NMI_STATE_OUT                0
+#define UV_NMI_STATE_IN                 1
+#define UV_NMI_STATE_DUMP               2
+#define UV_NMI_STATE_DUMP_DONE          3
 /* Update SCIR state */
 static inline void uv_set_scir_bits(unsigned char value)
 {
diff --git a/arch/x86/include/asm/uv/uv_mmrs.h b/arch/x86/include/asm/uv/uv_mmrs.h
index bd5f80e58a23..e42249bcf7e1 100644
--- a/arch/x86/include/asm/uv/uv_mmrs.h
+++ b/arch/x86/include/asm/uv/uv_mmrs.h
@@ -461,6 +461,23 @@ union uvh_event_occurred0_u {
 /* ========================================================================= */
+/*                         UVH_EXTIO_INT0_BROADCAST                          */
+/* ========================================================================= */
+#define UVH_EXTIO_INT0_BROADCAST 0x61448UL
+#define UVH_EXTIO_INT0_BROADCAST_32 0x3f0
+#define UVH_EXTIO_INT0_BROADCAST_ENABLE_SHFT            0
+#define UVH_EXTIO_INT0_BROADCAST_ENABLE_MASK            0x0000000000000001UL
+union uvh_extio_int0_broadcast_u {
+        unsigned long   v;
+        struct uvh_extio_int0_broadcast_s {
+                unsigned long   enable:1;                       /* RW */
+                unsigned long   rsvd_1_63:63;
+        } s;
+};
+/* ========================================================================= */
 /*                         UVH_GR0_TLB_INT0_CONFIG                           */
 /* ========================================================================= */
 #define UVH_GR0_TLB_INT0_CONFIG 0x61b00UL
@@ -2606,6 +2623,20 @@ union uvh_scratch5_u {
 };
 /* ========================================================================= */
+/*                            UVH_SCRATCH5_ALIAS                             */
+/* ========================================================================= */
+#define UVH_SCRATCH5_ALIAS 0x2d0208UL
+#define UVH_SCRATCH5_ALIAS_32 0x780
+/* ========================================================================= */
+/*                           UVH_SCRATCH5_ALIAS_2                            */
+/* ========================================================================= */
+#define UVH_SCRATCH5_ALIAS_2 0x2d0210UL
+#define UVH_SCRATCH5_ALIAS_2_32 0x788
+/* ========================================================================= */
 /*                          UVXH_EVENT_OCCURRED2                             */
 /* ========================================================================= */
 #define UVXH_EVENT_OCCURRED2 0x70100UL
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 828a1565ba57..0f1be11e43d2 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -172,6 +172,7 @@ struct x86_platform_ops {
 struct pci_dev;
 struct msi_msg;
+struct msi_desc;
 struct x86_msi_ops {
        int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
@@ -182,6 +183,8 @@ struct x86_msi_ops {
        void (*teardown_msi_irqs)(struct pci_dev *dev);
        void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
        int  (*setup_hpet_msi)(unsigned int irq, unsigned int id);
+        u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);
+        u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);
 };
 struct IO_APIC_route_entry;
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
index c15ddaf90710..9c3733c5f8f7 100644
--- a/arch/x86/include/uapi/asm/bootparam.h
+++ b/arch/x86/include/uapi/asm/bootparam.h
@@ -158,7 +158,7 @@ enum {
        X86_SUBARCH_PC = 0,
        X86_SUBARCH_LGUEST,
        X86_SUBARCH_XEN,
-        X86_SUBARCH_MRST,
+        X86_SUBARCH_INTEL_MID,
        X86_SUBARCH_CE4100,
        X86_NR_SUBARCHS,
 };
diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h
index b80420bcd09d..b8f1c0176cbc 100644
--- a/arch/x86/include/uapi/asm/hyperv.h
+++ b/arch/x86/include/uapi/asm/hyperv.h
@@ -27,6 +27,19 @@
 #define HV_X64_MSR_VP_RUNTIME_AVAILABLE         (1 << 0)
 /* Partition Reference Counter (HV_X64_MSR_TIME_REF_COUNT) available*/
 #define HV_X64_MSR_TIME_REF_COUNT_AVAILABLE     (1 << 1)
+/*
+ * There is a single feature flag that signifies the presence of the MSR
+ * that can be used to retrieve both the local APIC Timer frequency as
+ * well as the TSC frequency.
+ */
+/* Local APIC timer frequency MSR (HV_X64_MSR_APIC_FREQUENCY) is available */
+#define HV_X64_MSR_APIC_FREQUENCY_AVAILABLE (1 << 11)
+/* TSC frequency MSR (HV_X64_MSR_TSC_FREQUENCY) is available */
+#define HV_X64_MSR_TSC_FREQUENCY_AVAILABLE (1 << 11)
 /*
 * Basic SynIC MSRs (HV_X64_MSR_SCONTROL through HV_X64_MSR_EOM
 * and HV_X64_MSR_SINT0 through HV_X64_MSR_SINT15) available
@@ -136,6 +149,12 @@
 /* MSR used to read the per-partition time reference counter */
 #define HV_X64_MSR_TIME_REF_COUNT               0x40000020
+/* MSR used to retrieve the TSC frequency */
+#define HV_X64_MSR_TSC_FREQUENCY                0x40000022
+/* MSR used to retrieve the local APIC timer frequency */
+#define HV_X64_MSR_APIC_FREQUENCY               0x40000023
 /* Define the virtual APIC registers */
 #define HV_X64_MSR_EOI                          0x40000070
 #define HV_X64_MSR_ICR                          0x40000071
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index a5408b965c9d..9b0a34e2cd79 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -36,6 +36,8 @@ obj-y			+= tsc.o io_delay.o rtc.o
 obj-y                   += pci-iommu_table.o
 obj-y                   += resource.o
+obj-$(CONFIG_PREEMPT)   += preempt.o
 obj-y                           += process.o
 obj-y                           += i387.o xsave.o
 obj-y                           += ptrace.o
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 40c76604199f..6c0b43bd024b 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -189,24 +189,31 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)
        return 0;
 }
-static void acpi_register_lapic(int id, u8 enabled)
+/**
+ * acpi_register_lapic - register a local apic and generates a logic cpu number
+ * @id: local apic id to register
+ * @enabled: this cpu is enabled or not
+ *
+ * Returns the logic cpu number which maps to the local apic
+ */
+static int acpi_register_lapic(int id, u8 enabled)
 {
        unsigned int ver = 0;
        if (id >= MAX_LOCAL_APIC) {
                printk(KERN_INFO PREFIX "skipped apicid that is too big\n");
-                return;
+                return -EINVAL;
        }
        if (!enabled) {
                ++disabled_cpus;
-                return;
+                return -EINVAL;
        }
        if (boot_cpu_physical_apicid != -1U)
                ver = apic_version[boot_cpu_physical_apicid];
-        generic_processor_info(id, ver);
+        return generic_processor_info(id, ver);
 }
 static int __init
@@ -614,84 +621,27 @@ static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
 #endif
 }
-static int _acpi_map_lsapic(acpi_handle handle, int *pcpu)
+static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)
 {
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-        union acpi_object *obj;
-        struct acpi_madt_local_apic *lapic;
-        cpumask_var_t tmp_map, new_map;
-        u8 physid;
        int cpu;
-        int retval = -ENOMEM;
-        if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer)))
-                return -EINVAL;
-        if (!buffer.length || !buffer.pointer)
-                return -EINVAL;
-        obj = buffer.pointer;
-        if (obj->type != ACPI_TYPE_BUFFER ||
-            obj->buffer.length < sizeof(*lapic)) {
-                kfree(buffer.pointer);
-                return -EINVAL;
-        }
-        lapic = (struct acpi_madt_local_apic *)obj->buffer.pointer;
+        cpu = acpi_register_lapic(physid, ACPI_MADT_ENABLED);
+        if (cpu < 0) {
-        if (lapic->header.type != ACPI_MADT_TYPE_LOCAL_APIC ||
+                pr_info(PREFIX "Unable to map lapic to logical cpu number\n");
-            !(lapic->lapic_flags & ACPI_MADT_ENABLED)) {
+                return cpu;
-                kfree(buffer.pointer);
-                return -EINVAL;
-        }
-        physid = lapic->id;
-        kfree(buffer.pointer);
-        buffer.length = ACPI_ALLOCATE_BUFFER;
-        buffer.pointer = NULL;
-        lapic = NULL;
-        if (!alloc_cpumask_var(&tmp_map, GFP_KERNEL))
-                goto out;
-        if (!alloc_cpumask_var(&new_map, GFP_KERNEL))
-                goto free_tmp_map;
-        cpumask_copy(tmp_map, cpu_present_mask);
-        acpi_register_lapic(physid, ACPI_MADT_ENABLED);
-        /*
-         * If acpi_register_lapic successfully generates a new logical cpu
-         * number, then the following will get us exactly what was mapped
-         */
-        cpumask_andnot(new_map, cpu_present_mask, tmp_map);
-        if (cpumask_empty(new_map)) {
-                printk ("Unable to map lapic to logical cpu number\n");
-                retval = -EINVAL;
-                goto free_new_map;
        }
        acpi_processor_set_pdc(handle);
-        cpu = cpumask_first(new_map);
        acpi_map_cpu2node(handle, cpu, physid);
        *pcpu = cpu;
-        retval = 0;
+        return 0;
-free_new_map:
-        free_cpumask_var(new_map);
-free_tmp_map:
-        free_cpumask_var(tmp_map);
-out:
-        return retval;
 }
 /* wrapper to silence section mismatch warning */
-int __ref acpi_map_lsapic(acpi_handle handle, int *pcpu)
+int __ref acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)
 {
-        return _acpi_map_lsapic(handle, pcpu);
+        return _acpi_map_lsapic(handle, physid, pcpu);
 }
 EXPORT_SYMBOL(acpi_map_lsapic);
@@ -745,7 +695,7 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table)
 #ifdef CONFIG_HPET_TIMER
 #include <asm/hpet.h>
-static struct __initdata resource *hpet_res;
+static struct resource *hpet_res __initdata;
 static int __init acpi_parse_hpet(struct acpi_table_header *table)
 {
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 33120100ff5e..3a2ae4c88948 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -26,6 +26,17 @@ static char temp_stack[4096];
 #endif
 /**
+ * x86_acpi_enter_sleep_state - enter sleep state
+ * @state: Sleep state to enter.
+ *
+ * Wrapper around acpi_enter_sleep_state() to be called by assmebly.
+ */
+acpi_status asmlinkage x86_acpi_enter_sleep_state(u8 state)
+{
+        return acpi_enter_sleep_state(state);
+}
+/**
 * x86_acpi_suspend_lowlevel - save kernel state
 *
 * Create an identity mapped page table and copy the wakeup routine to
diff --git a/arch/x86/kernel/acpi/sleep.h b/arch/x86/kernel/acpi/sleep.h
index c9c2c982d5e4..65c7b606b606 100644
--- a/arch/x86/kernel/acpi/sleep.h
+++ b/arch/x86/kernel/acpi/sleep.h
@@ -17,3 +17,5 @@ extern void wakeup_long64(void);
 extern void do_suspend_lowlevel(void);
 extern int x86_acpi_suspend_lowlevel(void);
+acpi_status asmlinkage x86_acpi_enter_sleep_state(u8 state);
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
index d1daa66ab162..665c6b7d2ea9 100644
--- a/arch/x86/kernel/acpi/wakeup_32.S
+++ b/arch/x86/kernel/acpi/wakeup_32.S
@@ -73,7 +73,7 @@ ENTRY(do_suspend_lowlevel)
        call    save_processor_state
        call    save_registers
        pushl   $3
-        call    acpi_enter_sleep_state
+        call    x86_acpi_enter_sleep_state
        addl    $4, %esp
 #       In case of S3 failure, we'll emerge here.  Jump
diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S
index 8ea5164cbd04..ae693b51ed8e 100644
--- a/arch/x86/kernel/acpi/wakeup_64.S
+++ b/arch/x86/kernel/acpi/wakeup_64.S
@@ -73,7 +73,7 @@ ENTRY(do_suspend_lowlevel)
        addq    $8, %rsp
        movl    $3, %edi
        xorl    %eax, %eax
-        call    acpi_enter_sleep_state
+        call    x86_acpi_enter_sleep_state
        /* in case something went wrong, restore the machine status and go on */
        jmp     resume_point
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 15e8563e5c24..df94598ad05a 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -402,17 +402,6 @@ void alternatives_enable_smp(void)
 {
        struct smp_alt_module *mod;
-#ifdef CONFIG_LOCKDEP
-        /*
-         * Older binutils section handling bug prevented
-         * alternatives-replacement from working reliably.
-         *
-         * If this still occurs then you should see a hang
-         * or crash shortly after this line:
-         */
-        pr_info("lockdep: fixing up alternatives\n");
-#endif
        /* Why bother if there are no other CPUs? */
        BUG_ON(num_possible_cpus() == 1);
diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index c9876efecafb..af5b08ab3b71 100644
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -40,7 +40,7 @@
 #include <asm/fixmap.h>
 #include <asm/apb_timer.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/time.h>
 #define APBT_CLOCKEVENT_RATING          110
@@ -157,13 +157,13 @@ static int __init apbt_clockevent_register(void)
        adev->num = smp_processor_id();
        adev->timer = dw_apb_clockevent_init(smp_processor_id(), "apbt0",
-                mrst_timer_options == MRST_TIMER_LAPIC_APBT ?
+                intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT ?
                APBT_CLOCKEVENT_RATING - 100 : APBT_CLOCKEVENT_RATING,
                adev_virt_addr(adev), 0, apbt_freq);
        /* Firmware does EOI handling for us. */
        adev->timer->eoi = NULL;
-        if (mrst_timer_options == MRST_TIMER_LAPIC_APBT) {
+        if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT) {
                global_clock_event = &adev->timer->ced;
                printk(KERN_DEBUG "%s clockevent registered as global\n",
                       global_clock_event->name);
@@ -253,7 +253,7 @@ static int apbt_cpuhp_notify(struct notifier_block *n,
 static __init int apbt_late_init(void)
 {
-        if (mrst_timer_options == MRST_TIMER_LAPIC_APBT ||
+        if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT ||
                !apb_timer_block_enabled)
                return 0;
        /* This notifier should be called after workqueue is ready */
@@ -340,7 +340,7 @@ void __init apbt_time_init(void)
        }
 #ifdef CONFIG_SMP
        /* kernel cmdline disable apb timer, so we will use lapic timers */
-        if (mrst_timer_options == MRST_TIMER_LAPIC_APBT) {
+        if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT) {
                printk(KERN_INFO "apbt: disabled per cpu timer\n");
                return;
        }
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index a7eb82d9b012..ed165d657380 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2107,7 +2107,7 @@ void disconnect_bsp_APIC(int virt_wire_setup)
        apic_write(APIC_LVT1, value);
 }
-void generic_processor_info(int apicid, int version)
+int generic_processor_info(int apicid, int version)
 {
        int cpu, max = nr_cpu_ids;
        bool boot_cpu_detected = physid_isset(boot_cpu_physical_apicid,
@@ -2127,7 +2127,7 @@ void generic_processor_info(int apicid, int version)
                        "  Processor %d/0x%x ignored.\n", max, thiscpu, apicid);
                disabled_cpus++;
-                return;
+                return -ENODEV;
        }
        if (num_processors >= nr_cpu_ids) {
@@ -2138,7 +2138,7 @@ void generic_processor_info(int apicid, int version)
                        "  Processor %d/0x%x ignored.\n", max, thiscpu, apicid);
                disabled_cpus++;
-                return;
+                return -EINVAL;
        }
        num_processors++;
@@ -2183,6 +2183,8 @@ void generic_processor_info(int apicid, int version)
 #endif
        set_cpu_possible(cpu, true);
        set_cpu_present(cpu, true);
+        return cpu;
 }
 int hard_smp_processor_id(void)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 1191ac1c9d25..ad0dc0428baf 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -39,12 +39,6 @@
 #include <asm/x86_init.h>
 #include <asm/nmi.h>
-/* BMC sets a bit this MMR non-zero before sending an NMI */
-#define UVH_NMI_MMR                             UVH_SCRATCH5
-#define UVH_NMI_MMR_CLEAR                       (UVH_NMI_MMR + 8)
-#define UV_NMI_PENDING_MASK                     (1UL << 63)
-DEFINE_PER_CPU(unsigned long, cpu_last_nmi_count);
 DEFINE_PER_CPU(int, x2apic_extra_bits);
 #define PR_DEVEL(fmt, args...)  pr_devel("%s: " fmt, __func__, args)
@@ -58,7 +52,6 @@ int uv_min_hub_revision_id;
 EXPORT_SYMBOL_GPL(uv_min_hub_revision_id);
 unsigned int uv_apicid_hibits;
 EXPORT_SYMBOL_GPL(uv_apicid_hibits);
-static DEFINE_SPINLOCK(uv_nmi_lock);
 static struct apic apic_x2apic_uv_x;
@@ -113,7 +106,7 @@ static int __init early_get_pnodeid(void)
                break;
        case UV3_HUB_PART_NUMBER:
        case UV3_HUB_PART_NUMBER_X:
-                uv_min_hub_revision_id += UV3_HUB_REVISION_BASE - 1;
+                uv_min_hub_revision_id += UV3_HUB_REVISION_BASE;
                break;
        }
@@ -847,68 +840,6 @@ void uv_cpu_init(void)
                set_x2apic_extra_bits(uv_hub_info->pnode);
 }
-/*
- * When NMI is received, print a stack trace.
- */
-int uv_handle_nmi(unsigned int reason, struct pt_regs *regs)
-{
-        unsigned long real_uv_nmi;
-        int bid;
-        /*
-         * Each blade has an MMR that indicates when an NMI has been sent
-         * to cpus on the blade. If an NMI is detected, atomically
-         * clear the MMR and update a per-blade NMI count used to
-         * cause each cpu on the blade to notice a new NMI.
-         */
-        bid = uv_numa_blade_id();
-        real_uv_nmi = (uv_read_local_mmr(UVH_NMI_MMR) & UV_NMI_PENDING_MASK);
-        if (unlikely(real_uv_nmi)) {
-                spin_lock(&uv_blade_info[bid].nmi_lock);
-                real_uv_nmi = (uv_read_local_mmr(UVH_NMI_MMR) & UV_NMI_PENDING_MASK);
-                if (real_uv_nmi) {
-                        uv_blade_info[bid].nmi_count++;
-                        uv_write_local_mmr(UVH_NMI_MMR_CLEAR, UV_NMI_PENDING_MASK);
-                }
-                spin_unlock(&uv_blade_info[bid].nmi_lock);
-        }
-        if (likely(__get_cpu_var(cpu_last_nmi_count) == uv_blade_info[bid].nmi_count))
-                return NMI_DONE;
-        __get_cpu_var(cpu_last_nmi_count) = uv_blade_info[bid].nmi_count;
-        /*
-         * Use a lock so only one cpu prints at a time.
-         * This prevents intermixed output.
-         */
-        spin_lock(&uv_nmi_lock);
-        pr_info("UV NMI stack dump cpu %u:\n", smp_processor_id());
-        dump_stack();
-        spin_unlock(&uv_nmi_lock);
-        return NMI_HANDLED;
-}
-void uv_register_nmi_notifier(void)
-{
-        if (register_nmi_handler(NMI_UNKNOWN, uv_handle_nmi, 0, "uv"))
-                printk(KERN_WARNING "UV NMI handler failed to register\n");
-}
-void uv_nmi_init(void)
-{
-        unsigned int value;
-        /*
-         * Unmask NMI on all cpus
-         */
-        value = apic_read(APIC_LVT1) | APIC_DM_NMI;
-        value &= ~APIC_LVT_MASKED;
-        apic_write(APIC_LVT1, value);
-}
 void __init uv_system_init(void)
 {
        union uvh_rh_gam_config_mmr_u  m_n_config;
@@ -1046,6 +977,7 @@ void __init uv_system_init(void)
        map_mmr_high(max_pnode);
        map_mmioh_high(min_pnode, max_pnode);
+        uv_nmi_setup();
        uv_cpu_init();
        uv_scir_register_cpu_notifier();
        uv_register_nmi_notifier();
diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
index 28610822fb3c..9f6b9341950f 100644
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -32,7 +32,6 @@ void common(void) {
        OFFSET(TI_flags, thread_info, flags);
        OFFSET(TI_status, thread_info, status);
        OFFSET(TI_addr_limit, thread_info, addr_limit);
-        OFFSET(TI_preempt_count, thread_info, preempt_count);
        BLANK();
        OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 903a264af981..3daece79a142 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -823,8 +823,8 @@ static const struct cpu_dev amd_cpu_dev = {
        .c_vendor       = "AMD",
        .c_ident        = { "AuthenticAMD" },
 #ifdef CONFIG_X86_32
-        .c_models = {
+        .legacy_models = {
-                { .vendor = X86_VENDOR_AMD, .family = 4, .model_names =
+                { .family = 4, .model_names =
                  {
                          [3] = "486 DX/2",
                          [7] = "486 DX/2-WB",
@@ -835,7 +835,7 @@ static const struct cpu_dev amd_cpu_dev = {
                  }
                },
        },
-        .c_size_cache   = amd_size_cache,
+        .legacy_cache_size = amd_size_cache,
 #endif
        .c_early_init   = early_init_amd,
        .c_detect_tlb   = cpu_detect_tlb_amd,
diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
index fbf6c3bc2400..8d5652dc99dd 100644
--- a/arch/x86/kernel/cpu/centaur.c
+++ b/arch/x86/kernel/cpu/centaur.c
@@ -468,10 +468,10 @@ static void init_centaur(struct cpuinfo_x86 *c)
 #endif
 }
+#ifdef CONFIG_X86_32
 static unsigned int
 centaur_size_cache(struct cpuinfo_x86 *c, unsigned int size)
 {
-#ifdef CONFIG_X86_32
        /* VIA C3 CPUs (670-68F) need further shifting. */
        if ((c->x86 == 6) && ((c->x86_model == 7) || (c->x86_model == 8)))
                size >>= 8;
@@ -484,16 +484,18 @@ centaur_size_cache(struct cpuinfo_x86 *c, unsigned int size)
        if ((c->x86 == 6) && (c->x86_model == 9) &&
                                (c->x86_mask == 1) && (size == 65))
                size -= 1;
-#endif
        return size;
 }
+#endif
 static const struct cpu_dev centaur_cpu_dev = {
        .c_vendor       = "Centaur",
        .c_ident        = { "CentaurHauls" },
        .c_early_init   = early_init_centaur,
        .c_init         = init_centaur,
-        .c_size_cache   = centaur_size_cache,
+#ifdef CONFIG_X86_32
+        .legacy_cache_size = centaur_size_cache,
+#endif
        .c_x86_vendor   = X86_VENDOR_CENTAUR,
 };
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 2793d1f095a2..6abc172b8258 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -346,7 +346,8 @@ static void filter_cpuid_features(struct cpuinfo_x86 *c, bool warn)
 /* Look up CPU names by table lookup. */
 static const char *table_lookup_model(struct cpuinfo_x86 *c)
 {
-        const struct cpu_model_info *info;
+#ifdef CONFIG_X86_32
+        const struct legacy_cpu_model_info *info;
        if (c->x86_model >= 16)
                return NULL;    /* Range check */
@@ -354,13 +355,14 @@ static const char *table_lookup_model(struct cpuinfo_x86 *c)
        if (!this_cpu)
                return NULL;
-        info = this_cpu->c_models;
+        info = this_cpu->legacy_models;
-        while (info && info->family) {
+        while (info->family) {
                if (info->family == c->x86)
                        return info->model_names[c->x86_model];
                info++;
        }
+#endif
        return NULL;            /* Not found */
 }
@@ -450,8 +452,8 @@ void cpu_detect_cache_sizes(struct cpuinfo_x86 *c)
        c->x86_tlbsize += ((ebx >> 16) & 0xfff) + (ebx & 0xfff);
 #else
        /* do processor-specific cache resizing */
-        if (this_cpu->c_size_cache)
+        if (this_cpu->legacy_cache_size)
-                l2size = this_cpu->c_size_cache(c, l2size);
+                l2size = this_cpu->legacy_cache_size(c, l2size);
        /* Allow user to override all this if necessary. */
        if (cachesize_override != -1)
@@ -1095,6 +1097,9 @@ DEFINE_PER_CPU(char *, irq_stack_ptr) =
 DEFINE_PER_CPU(unsigned int, irq_count) __visible = -1;
+DEFINE_PER_CPU(int, __preempt_count) = INIT_PREEMPT_COUNT;
+EXPORT_PER_CPU_SYMBOL(__preempt_count);
 DEFINE_PER_CPU(struct task_struct *, fpu_owner_task);
 /*
@@ -1169,6 +1174,8 @@ void debug_stack_reset(void)
 DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task;
 EXPORT_PER_CPU_SYMBOL(current_task);
+DEFINE_PER_CPU(int, __preempt_count) = INIT_PREEMPT_COUNT;
+EXPORT_PER_CPU_SYMBOL(__preempt_count);
 DEFINE_PER_CPU(struct task_struct *, fpu_owner_task);
 #ifdef CONFIG_CC_STACKPROTECTOR
diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h
index 4041c24ae7db..c37dc37e8317 100644
--- a/arch/x86/kernel/cpu/cpu.h
+++ b/arch/x86/kernel/cpu/cpu.h
@@ -1,12 +1,6 @@
 #ifndef ARCH_X86_CPU_H
 #define ARCH_X86_CPU_H
-struct cpu_model_info {
-        int             vendor;
-        int             family;
-        const char      *model_names[16];
-};
 /* attempt to consolidate cpu attributes */
 struct cpu_dev {
        const char      *c_vendor;
@@ -14,15 +8,23 @@ struct cpu_dev {
        /* some have two possibilities for cpuid string */
        const char      *c_ident[2];
-        struct          cpu_model_info c_models[4];
        void            (*c_early_init)(struct cpuinfo_x86 *);
        void            (*c_bsp_init)(struct cpuinfo_x86 *);
        void            (*c_init)(struct cpuinfo_x86 *);
        void            (*c_identify)(struct cpuinfo_x86 *);
        void            (*c_detect_tlb)(struct cpuinfo_x86 *);
-        unsigned int    (*c_size_cache)(struct cpuinfo_x86 *, unsigned int);
        int             c_x86_vendor;
+#ifdef CONFIG_X86_32
+        /* Optional vendor specific routine to obtain the cache size. */
+        unsigned int    (*legacy_cache_size)(struct cpuinfo_x86 *,
+                                             unsigned int);
+        /* Family/stepping-based lookup table for model names. */
+        struct legacy_cpu_model_info {
+                int             family;
+                const char      *model_names[16];
+        }               legacy_models[5];
+#endif
 };
 struct _tlb_table {
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index ec7299566f79..dc1ec0dff939 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -665,8 +665,8 @@ static const struct cpu_dev intel_cpu_dev = {
        .c_vendor       = "Intel",
        .c_ident        = { "GenuineIntel" },
 #ifdef CONFIG_X86_32
-        .c_models = {
+        .legacy_models = {
-                { .vendor = X86_VENDOR_INTEL, .family = 4, .model_names =
+                { .family = 4, .model_names =
                  {
                          [0] = "486 DX-25/33",
                          [1] = "486 DX-50",
@@ -679,7 +679,7 @@ static const struct cpu_dev intel_cpu_dev = {
                          [9] = "486 DX/4-WB"
                  }
                },
-                { .vendor = X86_VENDOR_INTEL, .family = 5, .model_names =
+                { .family = 5, .model_names =
                  {
                          [0] = "Pentium 60/66 A-step",
                          [1] = "Pentium 60/66",
@@ -690,7 +690,7 @@ static const struct cpu_dev intel_cpu_dev = {
                          [8] = "Mobile Pentium MMX"
                  }
                },
-                { .vendor = X86_VENDOR_INTEL, .family = 6, .model_names =
+                { .family = 6, .model_names =
                  {
                          [0] = "Pentium Pro A-step",
                          [1] = "Pentium Pro",
@@ -704,7 +704,7 @@ static const struct cpu_dev intel_cpu_dev = {
                          [11] = "Pentium III (Tualatin)",
                  }
                },
-                { .vendor = X86_VENDOR_INTEL, .family = 15, .model_names =
+                { .family = 15, .model_names =
                  {
                          [0] = "Pentium 4 (Unknown)",
                          [1] = "Pentium 4 (Willamette)",
@@ -714,7 +714,7 @@ static const struct cpu_dev intel_cpu_dev = {
                  }
                },
        },
-        .c_size_cache   = intel_size_cache,
+        .legacy_cache_size = intel_size_cache,
 #endif
        .c_detect_tlb   = intel_detect_tlb,
        .c_early_init   = early_init_intel,
diff --git a/arch/x86/kernel/cpu/mcheck/mce-apei.c b/arch/x86/kernel/cpu/mcheck/mce-apei.c
index cd8b166a1735..de8b60a53f69 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-apei.c
+++ b/arch/x86/kernel/cpu/mcheck/mce-apei.c
@@ -42,8 +42,7 @@ void apei_mce_report_mem_error(int corrected, struct cper_sec_mem_err *mem_err)
        struct mce m;
        /* Only corrected MC is reported */
-        if (!corrected || !(mem_err->validation_bits &
+        if (!corrected || !(mem_err->validation_bits & CPER_MEM_VALID_PA))
-                                CPER_MEM_VALID_PHYSICAL_ADDRESS))
                return;
        mce_setup(&m);
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index 71a39f3621ba..9f7ca266864a 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -15,6 +15,7 @@
 #include <linux/clocksource.h>
 #include <linux/module.h>
 #include <linux/hardirq.h>
+#include <linux/efi.h>
 #include <linux/interrupt.h>
 #include <asm/processor.h>
 #include <asm/hypervisor.h>
@@ -23,6 +24,8 @@
 #include <asm/desc.h>
 #include <asm/idle.h>
 #include <asm/irq_regs.h>
+#include <asm/i8259.h>
+#include <asm/apic.h>
 struct ms_hyperv_info ms_hyperv;
 EXPORT_SYMBOL_GPL(ms_hyperv);
@@ -76,6 +79,30 @@ static void __init ms_hyperv_init_platform(void)
        printk(KERN_INFO "HyperV: features 0x%x, hints 0x%x\n",
               ms_hyperv.features, ms_hyperv.hints);
+#ifdef CONFIG_X86_LOCAL_APIC
+        if (ms_hyperv.features & HV_X64_MSR_APIC_FREQUENCY_AVAILABLE) {
+                /*
+                 * Get the APIC frequency.
+                 */
+                u64     hv_lapic_frequency;
+                rdmsrl(HV_X64_MSR_APIC_FREQUENCY, hv_lapic_frequency);
+                hv_lapic_frequency = div_u64(hv_lapic_frequency, HZ);
+                lapic_timer_frequency = hv_lapic_frequency;
+                printk(KERN_INFO "HyperV: LAPIC Timer Frequency: %#x\n",
+                                lapic_timer_frequency);
+                /*
+                 * On Hyper-V, when we are booting off an EFI firmware stack,
+                 * we do not have many legacy devices including PIC, PIT etc.
+                 */
+                if (efi_enabled(EFI_BOOT)) {
+                        printk(KERN_INFO "HyperV: Using null_legacy_pic\n");
+                        legacy_pic = &null_legacy_pic;
+                }
+        }
+#endif
        if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)
                clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);
 }
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 9d8449158cf9..8e132931614d 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1276,16 +1276,16 @@ void perf_events_lapic_init(void)
 static int __kprobes
 perf_event_nmi_handler(unsigned int cmd, struct pt_regs *regs)
 {
-        int ret;
        u64 start_clock;
        u64 finish_clock;
+        int ret;
        if (!atomic_read(&active_events))
                return NMI_DONE;
-        start_clock = local_clock();
+        start_clock = sched_clock();
        ret = x86_pmu.handle_irq(regs);
-        finish_clock = local_clock();
+        finish_clock = sched_clock();
        perf_sample_event_took(finish_clock - start_clock);
@@ -1989,7 +1989,7 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry *entry)
                frame.return_address = 0;
                bytes = copy_from_user_nmi(&frame, fp, sizeof(frame));
-                if (bytes != sizeof(frame))
+                if (bytes != 0)
                        break;
                if (!valid_user_frame(fp, sizeof(frame)))
@@ -2041,7 +2041,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
                frame.return_address = 0;
                bytes = copy_from_user_nmi(&frame, fp, sizeof(frame));
-                if (bytes != sizeof(frame))
+                if (bytes != 0)
                        break;
                if (!valid_user_frame(fp, sizeof(frame)))
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h
index cc16faae0538..fd00bb29425d 100644
--- a/arch/x86/kernel/cpu/perf_event.h
+++ b/arch/x86/kernel/cpu/perf_event.h
@@ -164,6 +164,11 @@ struct cpu_hw_events {
        struct perf_guest_switch_msr    guest_switch_msrs[X86_PMC_IDX_MAX];
        /*
+         * Intel checkpoint mask
+         */
+        u64                             intel_cp_status;
+        /*
         * manage shared (per-core, per-cpu) registers
         * used on Intel NHM/WSM/SNB
         */
@@ -440,6 +445,7 @@ struct x86_pmu {
        int             lbr_nr;                    /* hardware stack size */
        u64             lbr_sel_mask;              /* LBR_SELECT valid bits */
        const int       *lbr_sel_map;              /* lbr_select mappings */
+        bool            lbr_double_abort;          /* duplicated lbr aborts */
        /*
         * Extra registers for events
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index f31a1655d1ff..0fa4f242f050 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -190,9 +190,9 @@ static struct extra_reg intel_snbep_extra_regs[] __read_mostly = {
        EVENT_EXTRA_END
 };
-EVENT_ATTR_STR(mem-loads, mem_ld_nhm, "event=0x0b,umask=0x10,ldlat=3");
+EVENT_ATTR_STR(mem-loads,       mem_ld_nhm,     "event=0x0b,umask=0x10,ldlat=3");
-EVENT_ATTR_STR(mem-loads, mem_ld_snb, "event=0xcd,umask=0x1,ldlat=3");
+EVENT_ATTR_STR(mem-loads,       mem_ld_snb,     "event=0xcd,umask=0x1,ldlat=3");
-EVENT_ATTR_STR(mem-stores, mem_st_snb, "event=0xcd,umask=0x2");
+EVENT_ATTR_STR(mem-stores,      mem_st_snb,     "event=0xcd,umask=0x2");
 struct attribute *nhm_events_attrs[] = {
        EVENT_PTR(mem_ld_nhm),
@@ -1184,6 +1184,11 @@ static void intel_pmu_disable_fixed(struct hw_perf_event *hwc)
        wrmsrl(hwc->config_base, ctrl_val);
 }
+static inline bool event_is_checkpointed(struct perf_event *event)
+{
+        return (event->hw.config & HSW_IN_TX_CHECKPOINTED) != 0;
+}
 static void intel_pmu_disable_event(struct perf_event *event)
 {
        struct hw_perf_event *hwc = &event->hw;
@@ -1197,6 +1202,7 @@ static void intel_pmu_disable_event(struct perf_event *event)
        cpuc->intel_ctrl_guest_mask &= ~(1ull << hwc->idx);
        cpuc->intel_ctrl_host_mask &= ~(1ull << hwc->idx);
+        cpuc->intel_cp_status &= ~(1ull << hwc->idx);
        /*
         * must disable before any actual event
@@ -1271,6 +1277,9 @@ static void intel_pmu_enable_event(struct perf_event *event)
        if (event->attr.exclude_guest)
                cpuc->intel_ctrl_host_mask |= (1ull << hwc->idx);
+        if (unlikely(event_is_checkpointed(event)))
+                cpuc->intel_cp_status |= (1ull << hwc->idx);
        if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL)) {
                intel_pmu_enable_fixed(hwc);
                return;
@@ -1289,6 +1298,17 @@ static void intel_pmu_enable_event(struct perf_event *event)
 int intel_pmu_save_and_restart(struct perf_event *event)
 {
        x86_perf_event_update(event);
+        /*
+         * For a checkpointed counter always reset back to 0.  This
+         * avoids a situation where the counter overflows, aborts the
+         * transaction and is then set back to shortly before the
+         * overflow, and overflows and aborts again.
+         */
+        if (unlikely(event_is_checkpointed(event))) {
+                /* No race with NMIs because the counter should not be armed */
+                wrmsrl(event->hw.event_base, 0);
+                local64_set(&event->hw.prev_count, 0);
+        }
        return x86_perf_event_set_period(event);
 }
@@ -1372,6 +1392,13 @@ again:
                x86_pmu.drain_pebs(regs);
        }
+        /*
+         * Checkpointed counters can lead to 'spurious' PMIs because the
+         * rollback caused by the PMI will have cleared the overflow status
+         * bit. Therefore always force probe these counters.
+         */
+        status |= cpuc->intel_cp_status;
        for_each_set_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
                struct perf_event *event = cpuc->events[bit];
@@ -1837,6 +1864,20 @@ static int hsw_hw_config(struct perf_event *event)
              event->attr.precise_ip > 0))
                return -EOPNOTSUPP;
+        if (event_is_checkpointed(event)) {
+                /*
+                 * Sampling of checkpointed events can cause situations where
+                 * the CPU constantly aborts because of a overflow, which is
+                 * then checkpointed back and ignored. Forbid checkpointing
+                 * for sampling.
+                 *
+                 * But still allow a long sampling period, so that perf stat
+                 * from KVM works.
+                 */
+                if (event->attr.sample_period > 0 &&
+                    event->attr.sample_period < 0x7fffffff)
+                        return -EOPNOTSUPP;
+        }
        return 0;
 }
@@ -2182,10 +2223,36 @@ static __init void intel_nehalem_quirk(void)
        }
 }
-EVENT_ATTR_STR(mem-loads,      mem_ld_hsw,     "event=0xcd,umask=0x1,ldlat=3");
+EVENT_ATTR_STR(mem-loads,       mem_ld_hsw,     "event=0xcd,umask=0x1,ldlat=3");
-EVENT_ATTR_STR(mem-stores,     mem_st_hsw,     "event=0xd0,umask=0x82")
+EVENT_ATTR_STR(mem-stores,      mem_st_hsw,     "event=0xd0,umask=0x82")
+/* Haswell special events */
+EVENT_ATTR_STR(tx-start,        tx_start,       "event=0xc9,umask=0x1");
+EVENT_ATTR_STR(tx-commit,       tx_commit,      "event=0xc9,umask=0x2");
+EVENT_ATTR_STR(tx-abort,        tx_abort,       "event=0xc9,umask=0x4");
+EVENT_ATTR_STR(tx-capacity,     tx_capacity,    "event=0x54,umask=0x2");
+EVENT_ATTR_STR(tx-conflict,     tx_conflict,    "event=0x54,umask=0x1");
+EVENT_ATTR_STR(el-start,        el_start,       "event=0xc8,umask=0x1");
+EVENT_ATTR_STR(el-commit,       el_commit,      "event=0xc8,umask=0x2");
+EVENT_ATTR_STR(el-abort,        el_abort,       "event=0xc8,umask=0x4");
+EVENT_ATTR_STR(el-capacity,     el_capacity,    "event=0x54,umask=0x2");
+EVENT_ATTR_STR(el-conflict,     el_conflict,    "event=0x54,umask=0x1");
+EVENT_ATTR_STR(cycles-t,        cycles_t,       "event=0x3c,in_tx=1");
+EVENT_ATTR_STR(cycles-ct,       cycles_ct,      "event=0x3c,in_tx=1,in_tx_cp=1");
 static struct attribute *hsw_events_attrs[] = {
+        EVENT_PTR(tx_start),
+        EVENT_PTR(tx_commit),
+        EVENT_PTR(tx_abort),
+        EVENT_PTR(tx_capacity),
+        EVENT_PTR(tx_conflict),
+        EVENT_PTR(el_start),
+        EVENT_PTR(el_commit),
+        EVENT_PTR(el_abort),
+        EVENT_PTR(el_capacity),
+        EVENT_PTR(el_conflict),
+        EVENT_PTR(cycles_t),
+        EVENT_PTR(cycles_ct),
        EVENT_PTR(mem_ld_hsw),
        EVENT_PTR(mem_st_hsw),
        NULL
@@ -2452,6 +2519,7 @@ __init int intel_pmu_init(void)
                x86_pmu.hw_config = hsw_hw_config;
                x86_pmu.get_event_constraints = hsw_get_event_constraints;
                x86_pmu.cpu_events = hsw_events_attrs;
+                x86_pmu.lbr_double_abort = true;
                pr_cont("Haswell events, ");
                break;
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c
index ab3ba1c1b7dd..ae96cfa5eddd 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -12,6 +12,7 @@
 #define BTS_BUFFER_SIZE         (PAGE_SIZE << 4)
 #define PEBS_BUFFER_SIZE        PAGE_SIZE
+#define PEBS_FIXUP_SIZE         PAGE_SIZE
 /*
 * pebs_record_32 for p4 and core not supported
@@ -182,18 +183,32 @@ struct pebs_record_nhm {
 * Same as pebs_record_nhm, with two additional fields.
 */
 struct pebs_record_hsw {
-        struct pebs_record_nhm nhm;
+        u64 flags, ip;
-        /*
+        u64 ax, bx, cx, dx;
-         * Real IP of the event. In the Intel documentation this
+        u64 si, di, bp, sp;
-         * is called eventingrip.
+        u64 r8,  r9,  r10, r11;
-         */
+        u64 r12, r13, r14, r15;
-        u64 real_ip;
+        u64 status, dla, dse, lat;
-        /*
+        u64 real_ip, tsx_tuning;
-         * TSX tuning information field: abort cycles and abort flags.
+};
-         */
-        u64 tsx_tuning;
+union hsw_tsx_tuning {
+        struct {
+                u32 cycles_last_block     : 32,
+                    hle_abort             : 1,
+                    rtm_abort             : 1,
+                    instruction_abort     : 1,
+                    non_instruction_abort : 1,
+                    retry                 : 1,
+                    data_conflict         : 1,
+                    capacity_writes       : 1,
+                    capacity_reads        : 1;
+        };
+        u64         value;
 };
+#define PEBS_HSW_TSX_FLAGS      0xff00000000ULL
 void init_debug_store_on_cpu(int cpu)
 {
        struct debug_store *ds = per_cpu(cpu_hw_events, cpu).ds;
@@ -214,12 +229,14 @@ void fini_debug_store_on_cpu(int cpu)
        wrmsr_on_cpu(cpu, MSR_IA32_DS_AREA, 0, 0);
 }
+static DEFINE_PER_CPU(void *, insn_buffer);
 static int alloc_pebs_buffer(int cpu)
 {
        struct debug_store *ds = per_cpu(cpu_hw_events, cpu).ds;
        int node = cpu_to_node(cpu);
        int max, thresh = 1; /* always use a single PEBS record */
-        void *buffer;
+        void *buffer, *ibuffer;
        if (!x86_pmu.pebs)
                return 0;
@@ -228,6 +245,19 @@ static int alloc_pebs_buffer(int cpu)
        if (unlikely(!buffer))
                return -ENOMEM;
+        /*
+         * HSW+ already provides us the eventing ip; no need to allocate this
+         * buffer then.
+         */
+        if (x86_pmu.intel_cap.pebs_format < 2) {
+                ibuffer = kzalloc_node(PEBS_FIXUP_SIZE, GFP_KERNEL, node);
+                if (!ibuffer) {
+                        kfree(buffer);
+                        return -ENOMEM;
+                }
+                per_cpu(insn_buffer, cpu) = ibuffer;
+        }
        max = PEBS_BUFFER_SIZE / x86_pmu.pebs_record_size;
        ds->pebs_buffer_base = (u64)(unsigned long)buffer;
@@ -248,6 +278,9 @@ static void release_pebs_buffer(int cpu)
        if (!ds || !x86_pmu.pebs)
                return;
+        kfree(per_cpu(insn_buffer, cpu));
+        per_cpu(insn_buffer, cpu) = NULL;
        kfree((void *)(unsigned long)ds->pebs_buffer_base);
        ds->pebs_buffer_base = 0;
 }
@@ -715,6 +748,7 @@ static int intel_pmu_pebs_fixup_ip(struct pt_regs *regs)
        unsigned long old_to, to = cpuc->lbr_entries[0].to;
        unsigned long ip = regs->ip;
        int is_64bit = 0;
+        void *kaddr;
        /*
         * We don't need to fixup if the PEBS assist is fault like
@@ -738,7 +772,7 @@ static int intel_pmu_pebs_fixup_ip(struct pt_regs *regs)
         * unsigned math, either ip is before the start (impossible) or
         * the basic block is larger than 1 page (sanity)
         */
-        if ((ip - to) > PAGE_SIZE)
+        if ((ip - to) > PEBS_FIXUP_SIZE)
                return 0;
        /*
@@ -749,29 +783,33 @@ static int intel_pmu_pebs_fixup_ip(struct pt_regs *regs)
                return 1;
        }
+        if (!kernel_ip(ip)) {
+                int size, bytes;
+                u8 *buf = this_cpu_read(insn_buffer);
+                size = ip - to; /* Must fit our buffer, see above */
+                bytes = copy_from_user_nmi(buf, (void __user *)to, size);
+                if (bytes != 0)
+                        return 0;
+                kaddr = buf;
+        } else {
+                kaddr = (void *)to;
+        }
        do {
                struct insn insn;
-                u8 buf[MAX_INSN_SIZE];
-                void *kaddr;
                old_to = to;
-                if (!kernel_ip(ip)) {
-                        int bytes, size = MAX_INSN_SIZE;
-                        bytes = copy_from_user_nmi(buf, (void __user *)to, size);
-                        if (bytes != size)
-                                return 0;
-                        kaddr = buf;
-                } else
-                        kaddr = (void *)to;
 #ifdef CONFIG_X86_64
                is_64bit = kernel_ip(to) || !test_thread_flag(TIF_IA32);
 #endif
                insn_init(&insn, kaddr, is_64bit);
                insn_get_length(&insn);
                to += insn.length;
+                kaddr += insn.length;
        } while (to < ip);
        if (to == ip) {
@@ -786,16 +824,34 @@ static int intel_pmu_pebs_fixup_ip(struct pt_regs *regs)
        return 0;
 }
+static inline u64 intel_hsw_weight(struct pebs_record_hsw *pebs)
+{
+        if (pebs->tsx_tuning) {
+                union hsw_tsx_tuning tsx = { .value = pebs->tsx_tuning };
+                return tsx.cycles_last_block;
+        }
+        return 0;
+}
+static inline u64 intel_hsw_transaction(struct pebs_record_hsw *pebs)
+{
+        u64 txn = (pebs->tsx_tuning & PEBS_HSW_TSX_FLAGS) >> 32;
+        /* For RTM XABORTs also log the abort code from AX */
+        if ((txn & PERF_TXN_TRANSACTION) && (pebs->ax & 1))
+                txn |= ((pebs->ax >> 24) & 0xff) << PERF_TXN_ABORT_SHIFT;
+        return txn;
+}
 static void __intel_pmu_pebs_event(struct perf_event *event,
                                   struct pt_regs *iregs, void *__pebs)
 {
        /*
-         * We cast to pebs_record_nhm to get the load latency data
+         * We cast to the biggest pebs_record but are careful not to
-         * if extra_reg MSR_PEBS_LD_LAT_THRESHOLD used
+         * unconditionally access the 'extra' entries.
         */
        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
-        struct pebs_record_nhm *pebs = __pebs;
+        struct pebs_record_hsw *pebs = __pebs;
-        struct pebs_record_hsw *pebs_hsw = __pebs;
        struct perf_sample_data data;
        struct pt_regs regs;
        u64 sample_type;
@@ -854,7 +910,7 @@ static void __intel_pmu_pebs_event(struct perf_event *event,
        regs.sp = pebs->sp;
        if (event->attr.precise_ip > 1 && x86_pmu.intel_cap.pebs_format >= 2) {
-                regs.ip = pebs_hsw->real_ip;
+                regs.ip = pebs->real_ip;
                regs.flags |= PERF_EFLAGS_EXACT;
        } else if (event->attr.precise_ip > 1 && intel_pmu_pebs_fixup_ip(&regs))
                regs.flags |= PERF_EFLAGS_EXACT;
@@ -862,9 +918,18 @@ static void __intel_pmu_pebs_event(struct perf_event *event,
                regs.flags &= ~PERF_EFLAGS_EXACT;
        if ((event->attr.sample_type & PERF_SAMPLE_ADDR) &&
-                x86_pmu.intel_cap.pebs_format >= 1)
+            x86_pmu.intel_cap.pebs_format >= 1)
                data.addr = pebs->dla;
+        if (x86_pmu.intel_cap.pebs_format >= 2) {
+                /* Only set the TSX weight when no memory weight. */
+                if ((event->attr.sample_type & PERF_SAMPLE_WEIGHT) && !fll)
+                        data.weight = intel_hsw_weight(pebs);
+                if (event->attr.sample_type & PERF_SAMPLE_TRANSACTION)
+                        data.txn = intel_hsw_transaction(pebs);
+        }
        if (has_branch_stack(event))
                data.br_stack = &cpuc->lbr_stack;
@@ -913,17 +978,34 @@ static void intel_pmu_drain_pebs_core(struct pt_regs *iregs)
        __intel_pmu_pebs_event(event, iregs, at);
 }
-static void __intel_pmu_drain_pebs_nhm(struct pt_regs *iregs, void *at,
+static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)
-                                        void *top)
 {
        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
        struct debug_store *ds = cpuc->ds;
        struct perf_event *event = NULL;
+        void *at, *top;
        u64 status = 0;
        int bit;
+        if (!x86_pmu.pebs_active)
+                return;
+        at  = (struct pebs_record_nhm *)(unsigned long)ds->pebs_buffer_base;
+        top = (struct pebs_record_nhm *)(unsigned long)ds->pebs_index;
        ds->pebs_index = ds->pebs_buffer_base;
+        if (unlikely(at > top))
+                return;
+        /*
+         * Should not happen, we program the threshold at 1 and do not
+         * set a reset value.
+         */
+        WARN_ONCE(top - at > x86_pmu.max_pebs_events * x86_pmu.pebs_record_size,
+                  "Unexpected number of pebs records %ld\n",
+                  (long)(top - at) / x86_pmu.pebs_record_size);
        for (; at < top; at += x86_pmu.pebs_record_size) {
                struct pebs_record_nhm *p = at;
@@ -951,61 +1033,6 @@ static void __intel_pmu_drain_pebs_nhm(struct pt_regs *iregs, void *at,
        }
 }
-static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)
-{
-        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
-        struct debug_store *ds = cpuc->ds;
-        struct pebs_record_nhm *at, *top;
-        int n;
-        if (!x86_pmu.pebs_active)
-                return;
-        at  = (struct pebs_record_nhm *)(unsigned long)ds->pebs_buffer_base;
-        top = (struct pebs_record_nhm *)(unsigned long)ds->pebs_index;
-        ds->pebs_index = ds->pebs_buffer_base;
-        n = top - at;
-        if (n <= 0)
-                return;
-        /*
-         * Should not happen, we program the threshold at 1 and do not
-         * set a reset value.
-         */
-        WARN_ONCE(n > x86_pmu.max_pebs_events,
-                  "Unexpected number of pebs records %d\n", n);
-        return __intel_pmu_drain_pebs_nhm(iregs, at, top);
-}
-static void intel_pmu_drain_pebs_hsw(struct pt_regs *iregs)
-{
-        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
-        struct debug_store *ds = cpuc->ds;
-        struct pebs_record_hsw *at, *top;
-        int n;
-        if (!x86_pmu.pebs_active)
-                return;
-        at  = (struct pebs_record_hsw *)(unsigned long)ds->pebs_buffer_base;
-        top = (struct pebs_record_hsw *)(unsigned long)ds->pebs_index;
-        n = top - at;
-        if (n <= 0)
-                return;
-        /*
-         * Should not happen, we program the threshold at 1 and do not
-         * set a reset value.
-         */
-        WARN_ONCE(n > x86_pmu.max_pebs_events,
-                  "Unexpected number of pebs records %d\n", n);
-        return __intel_pmu_drain_pebs_nhm(iregs, at, top);
-}
 /*
 * BTS, PEBS probe and setup
 */
@@ -1040,7 +1067,7 @@ void intel_ds_init(void)
                case 2:
                        pr_cont("PEBS fmt2%c, ", pebs_type);
                        x86_pmu.pebs_record_size = sizeof(struct pebs_record_hsw);
-                        x86_pmu.drain_pebs = intel_pmu_drain_pebs_hsw;
+                        x86_pmu.drain_pebs = intel_pmu_drain_pebs_nhm;
                        break;
                default:
diff --git a/arch/x86/kernel/cpu/perf_event_intel_lbr.c b/arch/x86/kernel/cpu/perf_event_intel_lbr.c
index d5be06a5005e..d82d155aca8c 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_lbr.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_lbr.c
@@ -284,6 +284,7 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc)
        int lbr_format = x86_pmu.intel_cap.lbr_format;
        u64 tos = intel_pmu_lbr_tos();
        int i;
+        int out = 0;
        for (i = 0; i < x86_pmu.lbr_nr; i++) {
                unsigned long lbr_idx = (tos - i) & mask;
@@ -306,15 +307,27 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc)
                }
                from = (u64)((((s64)from) << skip) >> skip);
-                cpuc->lbr_entries[i].from       = from;
+                /*
-                cpuc->lbr_entries[i].to         = to;
+                 * Some CPUs report duplicated abort records,
-                cpuc->lbr_entries[i].mispred    = mis;
+                 * with the second entry not having an abort bit set.
-                cpuc->lbr_entries[i].predicted  = pred;
+                 * Skip them here. This loop runs backwards,
-                cpuc->lbr_entries[i].in_tx      = in_tx;
+                 * so we need to undo the previous record.
-                cpuc->lbr_entries[i].abort      = abort;
+                 * If the abort just happened outside the window
-                cpuc->lbr_entries[i].reserved   = 0;
+                 * the extra entry cannot be removed.
+                 */
+                if (abort && x86_pmu.lbr_double_abort && out > 0)
+                        out--;
+                cpuc->lbr_entries[out].from      = from;
+                cpuc->lbr_entries[out].to        = to;
+                cpuc->lbr_entries[out].mispred   = mis;
+                cpuc->lbr_entries[out].predicted = pred;
+                cpuc->lbr_entries[out].in_tx     = in_tx;
+                cpuc->lbr_entries[out].abort     = abort;
+                cpuc->lbr_entries[out].reserved  = 0;
+                out++;
        }
-        cpuc->lbr_stack.nr = i;
+        cpuc->lbr_stack.nr = out;
 }
 void intel_pmu_lbr_read(void)
@@ -478,7 +491,7 @@ static int branch_type(unsigned long from, unsigned long to, int abort)
                /* may fail if text not present */
                bytes = copy_from_user_nmi(buf, (void __user *)from, size);
-                if (bytes != size)
+                if (bytes != 0)
                        return X86_BR_NONE;
                addr = buf;
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 4118f9f68315..29c248799ced 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -997,6 +997,20 @@ static int snbep_pci2phy_map_init(int devid)
                }
        }
+        if (!err) {
+                /*
+                 * For PCI bus with no UBOX device, find the next bus
+                 * that has UBOX device and use its mapping.
+                 */
+                i = -1;
+                for (bus = 255; bus >= 0; bus--) {
+                        if (pcibus_to_physid[bus] >= 0)
+                                i = pcibus_to_physid[bus];
+                        else
+                                pcibus_to_physid[bus] = i;
+                }
+        }
        if (ubox_dev)
                pci_dev_put(ubox_dev);
@@ -1099,6 +1113,24 @@ static struct attribute *ivt_uncore_qpi_formats_attr[] = {
        &format_attr_umask.attr,
        &format_attr_edge.attr,
        &format_attr_thresh8.attr,
+        &format_attr_match_rds.attr,
+        &format_attr_match_rnid30.attr,
+        &format_attr_match_rnid4.attr,
+        &format_attr_match_dnid.attr,
+        &format_attr_match_mc.attr,
+        &format_attr_match_opc.attr,
+        &format_attr_match_vnw.attr,
+        &format_attr_match0.attr,
+        &format_attr_match1.attr,
+        &format_attr_mask_rds.attr,
+        &format_attr_mask_rnid30.attr,
+        &format_attr_mask_rnid4.attr,
+        &format_attr_mask_dnid.attr,
+        &format_attr_mask_mc.attr,
+        &format_attr_mask_opc.attr,
+        &format_attr_mask_vnw.attr,
+        &format_attr_mask0.attr,
+        &format_attr_mask1.attr,
        NULL,
 };
@@ -1312,17 +1344,83 @@ static struct intel_uncore_type ivt_uncore_imc = {
        IVT_UNCORE_PCI_COMMON_INIT(),
 };
+/* registers in IRP boxes are not properly aligned */
+static unsigned ivt_uncore_irp_ctls[] = {0xd8, 0xdc, 0xe0, 0xe4};
+static unsigned ivt_uncore_irp_ctrs[] = {0xa0, 0xb0, 0xb8, 0xc0};
+static void ivt_uncore_irp_enable_event(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct pci_dev *pdev = box->pci_dev;
+        struct hw_perf_event *hwc = &event->hw;
+        pci_write_config_dword(pdev, ivt_uncore_irp_ctls[hwc->idx],
+                               hwc->config | SNBEP_PMON_CTL_EN);
+}
+static void ivt_uncore_irp_disable_event(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct pci_dev *pdev = box->pci_dev;
+        struct hw_perf_event *hwc = &event->hw;
+        pci_write_config_dword(pdev, ivt_uncore_irp_ctls[hwc->idx], hwc->config);
+}
+static u64 ivt_uncore_irp_read_counter(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct pci_dev *pdev = box->pci_dev;
+        struct hw_perf_event *hwc = &event->hw;
+        u64 count = 0;
+        pci_read_config_dword(pdev, ivt_uncore_irp_ctrs[hwc->idx], (u32 *)&count);
+        pci_read_config_dword(pdev, ivt_uncore_irp_ctrs[hwc->idx] + 4, (u32 *)&count + 1);
+        return count;
+}
+static struct intel_uncore_ops ivt_uncore_irp_ops = {
+        .init_box       = ivt_uncore_pci_init_box,
+        .disable_box    = snbep_uncore_pci_disable_box,
+        .enable_box     = snbep_uncore_pci_enable_box,
+        .disable_event  = ivt_uncore_irp_disable_event,
+        .enable_event   = ivt_uncore_irp_enable_event,
+        .read_counter   = ivt_uncore_irp_read_counter,
+};
+static struct intel_uncore_type ivt_uncore_irp = {
+        .name                   = "irp",
+        .num_counters           = 4,
+        .num_boxes              = 1,
+        .perf_ctr_bits          = 48,
+        .event_mask             = IVT_PMON_RAW_EVENT_MASK,
+        .box_ctl                = SNBEP_PCI_PMON_BOX_CTL,
+        .ops                    = &ivt_uncore_irp_ops,
+        .format_group           = &ivt_uncore_format_group,
+};
+static struct intel_uncore_ops ivt_uncore_qpi_ops = {
+        .init_box       = ivt_uncore_pci_init_box,
+        .disable_box    = snbep_uncore_pci_disable_box,
+        .enable_box     = snbep_uncore_pci_enable_box,
+        .disable_event  = snbep_uncore_pci_disable_event,
+        .enable_event   = snbep_qpi_enable_event,
+        .read_counter   = snbep_uncore_pci_read_counter,
+        .hw_config      = snbep_qpi_hw_config,
+        .get_constraint = uncore_get_constraint,
+        .put_constraint = uncore_put_constraint,
+};
 static struct intel_uncore_type ivt_uncore_qpi = {
-        .name           = "qpi",
+        .name                   = "qpi",
-        .num_counters   = 4,
+        .num_counters           = 4,
-        .num_boxes      = 3,
+        .num_boxes              = 3,
-        .perf_ctr_bits  = 48,
+        .perf_ctr_bits          = 48,
-        .perf_ctr       = SNBEP_PCI_PMON_CTR0,
+        .perf_ctr               = SNBEP_PCI_PMON_CTR0,
-        .event_ctl      = SNBEP_PCI_PMON_CTL0,
+        .event_ctl              = SNBEP_PCI_PMON_CTL0,
-        .event_mask     = IVT_QPI_PCI_PMON_RAW_EVENT_MASK,
+        .event_mask             = IVT_QPI_PCI_PMON_RAW_EVENT_MASK,
-        .box_ctl        = SNBEP_PCI_PMON_BOX_CTL,
+        .box_ctl                = SNBEP_PCI_PMON_BOX_CTL,
-        .ops            = &ivt_uncore_pci_ops,
+        .num_shared_regs        = 1,
-        .format_group   = &ivt_uncore_qpi_format_group,
+        .ops                    = &ivt_uncore_qpi_ops,
+        .format_group           = &ivt_uncore_qpi_format_group,
 };
 static struct intel_uncore_type ivt_uncore_r2pcie = {
@@ -1346,6 +1444,7 @@ static struct intel_uncore_type ivt_uncore_r3qpi = {
 enum {
        IVT_PCI_UNCORE_HA,
        IVT_PCI_UNCORE_IMC,
+        IVT_PCI_UNCORE_IRP,
        IVT_PCI_UNCORE_QPI,
        IVT_PCI_UNCORE_R2PCIE,
        IVT_PCI_UNCORE_R3QPI,
@@ -1354,6 +1453,7 @@ enum {
 static struct intel_uncore_type *ivt_pci_uncores[] = {
        [IVT_PCI_UNCORE_HA]     = &ivt_uncore_ha,
        [IVT_PCI_UNCORE_IMC]    = &ivt_uncore_imc,
+        [IVT_PCI_UNCORE_IRP]    = &ivt_uncore_irp,
        [IVT_PCI_UNCORE_QPI]    = &ivt_uncore_qpi,
        [IVT_PCI_UNCORE_R2PCIE] = &ivt_uncore_r2pcie,
        [IVT_PCI_UNCORE_R3QPI]  = &ivt_uncore_r3qpi,
@@ -1401,6 +1501,10 @@ static DEFINE_PCI_DEVICE_TABLE(ivt_uncore_pci_ids) = {
                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xef1),
                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_IMC, 7),
        },
+        { /* IRP */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe39),
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_IRP, 0),
+        },
        { /* QPI0 Port 0 */
                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe32),
                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_QPI, 0),
@@ -1429,6 +1533,16 @@ static DEFINE_PCI_DEVICE_TABLE(ivt_uncore_pci_ids) = {
                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe3e),
                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_R3QPI, 2),
        },
+        { /* QPI Port 0 filter  */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe86),
+                .driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV,
+                                                   SNBEP_PCI_QPI_PORT0_FILTER),
+        },
+        { /* QPI Port 0 filter  */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe96),
+                .driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV,
+                                                   SNBEP_PCI_QPI_PORT1_FILTER),
+        },
        { /* end: all zeroes */ }
 };
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index aee6317b902f..06fe3ed8b851 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -11,15 +11,12 @@ static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,
                              unsigned int cpu)
 {
 #ifdef CONFIG_SMP
-        if (c->x86_max_cores * smp_num_siblings > 1) {
+        seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);
-                seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);
+        seq_printf(m, "siblings\t: %d\n", cpumask_weight(cpu_core_mask(cpu)));
-                seq_printf(m, "siblings\t: %d\n",
+        seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);
-                           cpumask_weight(cpu_core_mask(cpu)));
+        seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);
-                seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);
+        seq_printf(m, "apicid\t\t: %d\n", c->apicid);
-                seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);
+        seq_printf(m, "initial apicid\t: %d\n", c->initial_apicid);
-                seq_printf(m, "apicid\t\t: %d\n", c->apicid);
-                seq_printf(m, "initial apicid\t: %d\n", c->initial_apicid);
-        }
 #endif
 }
diff --git a/arch/x86/kernel/cpu/umc.c b/arch/x86/kernel/cpu/umc.c
index 202759a14121..75c5ad5d35cc 100644
--- a/arch/x86/kernel/cpu/umc.c
+++ b/arch/x86/kernel/cpu/umc.c
@@ -11,8 +11,8 @@
 static const struct cpu_dev umc_cpu_dev = {
        .c_vendor       = "UMC",
        .c_ident        = { "UMC UMC UMC" },
-        .c_models = {
+        .legacy_models  = {
-                { .vendor = X86_VENDOR_UMC, .family = 4, .model_names =
+                { .family = 4, .model_names =
                  {
                          [1] = "U5D",
                          [2] = "U5S",
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index e0e0841eef45..18677a90d6a3 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -127,12 +127,12 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
        cpu_emergency_vmxoff();
        cpu_emergency_svm_disable();
-        lapic_shutdown();
 #ifdef CONFIG_X86_IO_APIC
        /* Prevent crash_kexec() from deadlocking on ioapic_lock. */
        ioapic_zap_locks();
        disable_IO_APIC();
 #endif
+        lapic_shutdown();
 #ifdef CONFIG_HPET_TIMER
        hpet_disable();
 #endif
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 376dc7873447..d35078ea1446 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -20,22 +20,13 @@
 #include <asm/hpet.h>
 #include <asm/apic.h>
 #include <asm/pci_x86.h>
+#include <asm/setup.h>
 __initdata u64 initial_dtb;
 char __initdata cmd_line[COMMAND_LINE_SIZE];
 int __initdata of_ioapic;
-unsigned long pci_address_to_pio(phys_addr_t address)
-{
-        /*
-         * The ioport address can be directly used by inX / outX
-         */
-        BUG_ON(address >= (1 << 16));
-        return (unsigned long)address;
-}
-EXPORT_SYMBOL_GPL(pci_address_to_pio);
 void __init early_init_dt_scan_chosen_arch(unsigned long node)
 {
        BUG();
@@ -51,15 +42,6 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
        return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
 }
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-        initrd_start = (unsigned long)__va(start);
-        initrd_end = (unsigned long)__va(end);
-        initrd_below_start_ok = 1;
-}
-#endif
 void __init add_dtb(u64 data)
 {
        initial_dtb = data + offsetof(struct setup_data, data);
@@ -105,7 +87,6 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)
 static int x86_of_pci_irq_enable(struct pci_dev *dev)
 {
-        struct of_irq oirq;
        u32 virq;
        int ret;
        u8 pin;
@@ -116,12 +97,7 @@ static int x86_of_pci_irq_enable(struct pci_dev *dev)
        if (!pin)
                return 0;
-        ret = of_irq_map_pci(dev, &oirq);
+        virq = of_irq_parse_and_map_pci(dev, 0, 0);
-        if (ret)
-                return ret;
-        virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                        oirq.size);
        if (virq == 0)
                return -EINVAL;
        dev->irq = virq;
@@ -230,7 +206,7 @@ static void __init dtb_apic_setup(void)
 static void __init x86_flattree_get_config(void)
 {
        u32 size, map_len;
-        void *new_dtb;
+        struct boot_param_header *dt;
        if (!initial_dtb)
                return;
@@ -238,24 +214,17 @@ static void __init x86_flattree_get_config(void)
        map_len = max(PAGE_SIZE - (initial_dtb & ~PAGE_MASK),
                        (u64)sizeof(struct boot_param_header));
-        initial_boot_params = early_memremap(initial_dtb, map_len);
+        dt = early_memremap(initial_dtb, map_len);
-        size = be32_to_cpu(initial_boot_params->totalsize);
+        size = be32_to_cpu(dt->totalsize);
        if (map_len < size) {
-                early_iounmap(initial_boot_params, map_len);
+                early_iounmap(dt, map_len);
-                initial_boot_params = early_memremap(initial_dtb, size);
+                dt = early_memremap(initial_dtb, size);
                map_len = size;
        }
-        new_dtb = alloc_bootmem(size);
+        initial_boot_params = dt;
-        memcpy(new_dtb, initial_boot_params, size);
+        unflatten_and_copy_device_tree();
-        early_iounmap(initial_boot_params, map_len);
+        early_iounmap(dt, map_len);
-        initial_boot_params = new_dtb;
-        /* root level address cells */
-        of_scan_flat_dt(early_init_dt_scan_root, NULL);
-        unflatten_device_tree();
 }
 #else
 static inline void x86_flattree_get_config(void) { }
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index deb6421c9e69..d9c12d3022a7 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -25,12 +25,17 @@ unsigned int code_bytes = 64;
 int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE;
 static int die_counter;
-void printk_address(unsigned long address, int reliable)
+static void printk_stack_address(unsigned long address, int reliable)
 {
        pr_cont(" [<%p>] %s%pB\n",
                (void *)address, reliable ? "" : "? ", (void *)address);
 }
+void printk_address(unsigned long address)
+{
+        pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
+}
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 static void
 print_ftrace_graph_addr(unsigned long addr, void *data,
@@ -151,7 +156,7 @@ static void print_trace_address(void *data, unsigned long addr, int reliable)
 {
        touch_nmi_watchdog();
        printk(data);
-        printk_address(addr, reliable);
+        printk_stack_address(addr, reliable);
 }
 static const struct stacktrace_ops print_trace_ops = {
@@ -281,7 +286,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
 #else
        /* Executive summary in case the oops scrolled away */
        printk(KERN_ALERT "RIP ");
-        printk_address(regs->ip, 1);
+        printk_address(regs->ip);
        printk(" RSP <%016lx>\n", regs->sp);
 #endif
        return 0;
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index d15f575a861b..01d1c187c9f9 100644
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -14,9 +14,11 @@
 #include <xen/hvc-console.h>
 #include <asm/pci-direct.h>
 #include <asm/fixmap.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/pgtable.h>
 #include <linux/usb/ehci_def.h>
+#include <linux/efi.h>
+#include <asm/efi.h>
 /* Simple VGA output */
 #define VGABASE         (__ISA_IO_base + 0xb8000)
@@ -234,6 +236,11 @@ static int __init setup_early_printk(char *buf)
                        early_console_register(&early_hsu_console, keep);
                }
 #endif
+#ifdef CONFIG_EARLY_PRINTK_EFI
+                if (!strncmp(buf, "efi", 3))
+                        early_console_register(&early_efi_console, keep);
+#endif
                buf++;
        }
        return 0;
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index f0dcb0ceb6a2..51e2988c5728 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -362,12 +362,9 @@ END(ret_from_exception)
 #ifdef CONFIG_PREEMPT
 ENTRY(resume_kernel)
        DISABLE_INTERRUPTS(CLBR_ANY)
-        cmpl $0,TI_preempt_count(%ebp)  # non-zero preempt_count ?
-        jnz restore_all
 need_resched:
-        movl TI_flags(%ebp), %ecx       # need_resched set ?
+        cmpl $0,PER_CPU_VAR(__preempt_count)
-        testb $_TIF_NEED_RESCHED, %cl
+        jnz restore_all
-        jz restore_all
        testl $X86_EFLAGS_IF,PT_EFLAGS(%esp)    # interrupts off (exception path) ?
        jz restore_all
        call preempt_schedule_irq
@@ -1247,6 +1244,16 @@ return_to_handler:
 */
        .pushsection .kprobes.text, "ax"
+#ifdef CONFIG_TRACING
+ENTRY(trace_page_fault)
+        RING0_EC_FRAME
+        ASM_CLAC
+        pushl_cfi $trace_do_page_fault
+        jmp error_code
+        CFI_ENDPROC
+END(trace_page_fault)
+#endif
 ENTRY(page_fault)
        RING0_EC_FRAME
        ASM_CLAC
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index b077f4cc225a..e21b0785a85b 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1103,10 +1103,8 @@ retint_signal:
        /* Returning to kernel space. Check if we need preemption */
        /* rcx:  threadinfo. interrupts off. */
 ENTRY(retint_kernel)
-        cmpl $0,TI_preempt_count(%rcx)
+        cmpl $0,PER_CPU_VAR(__preempt_count)
        jnz  retint_restore_args
-        bt  $TIF_NEED_RESCHED,TI_flags(%rcx)
-        jnc  retint_restore_args
        bt   $9,EFLAGS-ARGOFFSET(%rsp)  /* interrupts off? */
        jnc  retint_restore_args
        call preempt_schedule_irq
@@ -1280,6 +1278,17 @@ ENTRY(\sym)
 END(\sym)
 .endm
+#ifdef CONFIG_TRACING
+.macro trace_errorentry sym do_sym
+errorentry trace(\sym) trace(\do_sym)
+errorentry \sym \do_sym
+.endm
+#else
+.macro trace_errorentry sym do_sym
+errorentry \sym \do_sym
+.endm
+#endif
        /* error code is on the stack already */
 .macro paranoiderrorentry sym do_sym
 ENTRY(\sym)
@@ -1342,7 +1351,7 @@ bad_gs:
        .previous
 /* Call softirq on interrupt stack. Interrupts are off. */
-ENTRY(call_softirq)
+ENTRY(do_softirq_own_stack)
        CFI_STARTPROC
        pushq_cfi %rbp
        CFI_REL_OFFSET rbp,0
@@ -1359,7 +1368,7 @@ ENTRY(call_softirq)
        decl PER_CPU_VAR(irq_count)
        ret
        CFI_ENDPROC
-END(call_softirq)
+END(do_softirq_own_stack)
 #ifdef CONFIG_XEN
 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
@@ -1482,7 +1491,7 @@ zeroentry xen_int3 do_int3
 errorentry xen_stack_segment do_stack_segment
 #endif
 errorentry general_protection do_general_protection
-errorentry page_fault do_page_fault
+trace_errorentry page_fault do_page_fault
 #ifdef CONFIG_KVM_GUEST
 errorentry async_page_fault do_async_page_fault
 #endif
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index 06f87bece92a..c61a14a4a310 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -35,8 +35,8 @@ asmlinkage void __init i386_start_kernel(void)
        /* Call the subarch specific early setup function */
        switch (boot_params.hdr.hardware_subarch) {
-        case X86_SUBARCH_MRST:
+        case X86_SUBARCH_INTEL_MID:
-                x86_mrst_early_setup();
+                x86_intel_mid_early_setup();
                break;
        case X86_SUBARCH_CE4100:
                x86_ce4100_early_setup();
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 1be8e43b669e..85126ccbdf6b 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -162,7 +162,7 @@ asmlinkage void __init x86_64_start_kernel(char * real_mode_data)
        clear_bss();
        for (i = 0; i < NUM_EXCEPTION_VECTORS; i++)
-                set_intr_gate(i, &early_idt_handlers[i]);
+                set_intr_gate(i, early_idt_handlers[i]);
        load_idt((const struct desc_ptr *)&idt_descr);
        copy_bootdata(__va(real_mode_data));
diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
index 0fa69127209a..05fd74f537d6 100644
--- a/arch/x86/kernel/i386_ksyms_32.c
+++ b/arch/x86/kernel/i386_ksyms_32.c
@@ -37,3 +37,10 @@ EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(csum_partial);
 EXPORT_SYMBOL(empty_zero_page);
+#ifdef CONFIG_PREEMPT
+EXPORT_SYMBOL(___preempt_schedule);
+#ifdef CONFIG_CONTEXT_TRACKING
+EXPORT_SYMBOL(___preempt_schedule_context);
+#endif
+#endif
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
index 5d576ab34403..e8368c6dd2a2 100644
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@ -100,7 +100,7 @@ void unlazy_fpu(struct task_struct *tsk)
                __save_init_fpu(tsk);
                __thread_fpu_end(tsk);
        } else
-                tsk->fpu_counter = 0;
+                tsk->thread.fpu_counter = 0;
        preempt_enable();
 }
 EXPORT_SYMBOL(unlazy_fpu);
diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
index 9a5c460404dc..2e977b5d61dd 100644
--- a/arch/x86/kernel/i8259.c
+++ b/arch/x86/kernel/i8259.c
@@ -312,8 +312,7 @@ static void init_8259A(int auto_eoi)
         */
        outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */
-        /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 on x86-64,
+        /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */
-           to 0x20-0x27 on i386 */
        outb_pic(IRQ0_VECTOR, PIC_MASTER_IMR);
        /* 8259A-1 (the master) has a slave on IR2 */
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index 4186755f1d7c..d7fcbedc9c43 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -100,9 +100,6 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
        irqctx->tinfo.task = curctx->tinfo.task;
        irqctx->tinfo.previous_esp = current_stack_pointer;
-        /* Copy the preempt_count so that the [soft]irq checks work. */
-        irqctx->tinfo.preempt_count = curctx->tinfo.preempt_count;
        if (unlikely(overflow))
                call_on_stack(print_stack_overflow, isp);
@@ -131,7 +128,6 @@ void irq_ctx_init(int cpu)
                                               THREAD_SIZE_ORDER));
        memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
        irqctx->tinfo.cpu               = cpu;
-        irqctx->tinfo.preempt_count     = HARDIRQ_OFFSET;
        irqctx->tinfo.addr_limit        = MAKE_MM_SEG(0);
        per_cpu(hardirq_ctx, cpu) = irqctx;
@@ -149,35 +145,21 @@ void irq_ctx_init(int cpu)
               cpu, per_cpu(hardirq_ctx, cpu),  per_cpu(softirq_ctx, cpu));
 }
-asmlinkage void do_softirq(void)
+void do_softirq_own_stack(void)
 {
-        unsigned long flags;
        struct thread_info *curctx;
        union irq_ctx *irqctx;
        u32 *isp;
-        if (in_interrupt())
+        curctx = current_thread_info();
-                return;
+        irqctx = __this_cpu_read(softirq_ctx);
+        irqctx->tinfo.task = curctx->task;
-        local_irq_save(flags);
+        irqctx->tinfo.previous_esp = current_stack_pointer;
-        if (local_softirq_pending()) {
-                curctx = current_thread_info();
-                irqctx = __this_cpu_read(softirq_ctx);
-                irqctx->tinfo.task = curctx->task;
-                irqctx->tinfo.previous_esp = current_stack_pointer;
-                /* build the stack frame on the softirq stack */
-                isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
-                call_on_stack(__do_softirq, isp);
+        /* build the stack frame on the softirq stack */
-                /*
+        isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
-                 * Shouldn't happen, we returned above if in_interrupt():
-                 */
-                WARN_ON_ONCE(softirq_count());
-        }
-        local_irq_restore(flags);
+        call_on_stack(__do_softirq, isp);
 }
 bool handle_irq(unsigned irq, struct pt_regs *regs)
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
index d04d3ecded62..4d1c746892eb 100644
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
@@ -87,24 +87,3 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
        generic_handle_irq_desc(irq, desc);
        return true;
 }
-extern void call_softirq(void);
-asmlinkage void do_softirq(void)
-{
-        __u32 pending;
-        unsigned long flags;
-        if (in_interrupt())
-                return;
-        local_irq_save(flags);
-        pending = local_softirq_pending();
-        /* Switch to interrupt stack */
-        if (pending) {
-                call_softirq();
-                WARN_ON_ONCE(softirq_count());
-        }
-        local_irq_restore(flags);
-}
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index ee11b7dfbfbb..26d5a55a2736 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -42,15 +42,27 @@ static void __jump_label_transform(struct jump_entry *entry,
                                   int init)
 {
        union jump_code_union code;
+        const unsigned char default_nop[] = { STATIC_KEY_INIT_NOP };
        const unsigned char *ideal_nop = ideal_nops[NOP_ATOMIC5];
        if (type == JUMP_LABEL_ENABLE) {
-                /*
+                if (init) {
-                 * We are enabling this jump label. If it is not a nop
+                        /*
-                 * then something must have gone wrong.
+                         * Jump label is enabled for the first time.
-                 */
+                         * So we expect a default_nop...
-                if (unlikely(memcmp((void *)entry->code, ideal_nop, 5) != 0))
+                         */
-                        bug_at((void *)entry->code, __LINE__);
+                        if (unlikely(memcmp((void *)entry->code, default_nop, 5)
+                                     != 0))
+                                bug_at((void *)entry->code, __LINE__);
+                } else {
+                        /*
+                         * ...otherwise expect an ideal_nop. Otherwise
+                         * something went horribly wrong.
+                         */
+                        if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
+                                     != 0))
+                                bug_at((void *)entry->code, __LINE__);
+                }
                code.jump = 0xe9;
                code.offset = entry->target -
@@ -63,7 +75,6 @@ static void __jump_label_transform(struct jump_entry *entry,
                 * are converting the default nop to the ideal nop.
                 */
                if (init) {
-                        const unsigned char default_nop[] = { STATIC_KEY_INIT_NOP };
                        if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
                                bug_at((void *)entry->code, __LINE__);
                } else {
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 697b93af02dd..6dd802c6d780 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -464,7 +464,7 @@ static struct notifier_block kvm_cpu_notifier = {
 static void __init kvm_apf_trap_init(void)
 {
-        set_intr_gate(14, &async_page_fault);
+        set_intr_gate(14, async_page_fault);
 }
 void __init kvm_guest_init(void)
@@ -609,7 +609,7 @@ static struct dentry *d_kvm_debug;
 struct dentry *kvm_init_debugfs(void)
 {
-        d_kvm_debug = debugfs_create_dir("kvm", NULL);
+        d_kvm_debug = debugfs_create_dir("kvm-guest", NULL);
        if (!d_kvm_debug)
                printk(KERN_WARNING "Could not create 'kvm' debugfs directory\n");
@@ -775,11 +775,22 @@ void __init kvm_spinlock_init(void)
        if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
                return;
-        printk(KERN_INFO "KVM setup paravirtual spinlock\n");
+        pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning);
+        pv_lock_ops.unlock_kick = kvm_unlock_kick;
+}
+static __init int kvm_spinlock_init_jump(void)
+{
+        if (!kvm_para_available())
+                return 0;
+        if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
+                return 0;
        static_key_slow_inc(&paravirt_ticketlocks_enabled);
+        printk(KERN_INFO "KVM setup paravirtual spinlock\n");
-        pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning);
+        return 0;
-        pv_lock_ops.unlock_kick = kvm_unlock_kick;
 }
+early_initcall(kvm_spinlock_init_jump);
 #endif  /* CONFIG_PARAVIRT_SPINLOCKS */
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index af99f71aeb7f..c3d4cc972eca 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -431,7 +431,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device,
                snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);
        if (request_firmware(&fw, (const char *)fw_name, device)) {
-                pr_err("failed to load file %s\n", fw_name);
+                pr_debug("failed to load file %s\n", fw_name);
                goto out;
        }
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
index 216a4d754b0c..18be189368bb 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -49,7 +49,7 @@ void *module_alloc(unsigned long size)
                return NULL;
        return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
                                GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
-                                -1, __builtin_return_address(0));
+                                NUMA_NO_NODE, __builtin_return_address(0));
 }
 #ifdef CONFIG_X86_32
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 88458faea2f8..05266b5aae22 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -46,7 +46,7 @@ static struct class *msr_class;
 static loff_t msr_seek(struct file *file, loff_t offset, int orig)
 {
        loff_t ret;
-        struct inode *inode = file->f_mapping->host;
+        struct inode *inode = file_inode(file);
        mutex_lock(&inode->i_mutex);
        switch (orig) {
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index ba77ebc2c353..6fcb49ce50a1 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -113,10 +113,10 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
                u64 before, delta, whole_msecs;
                int remainder_ns, decimal_msecs, thishandled;
-                before = local_clock();
+                before = sched_clock();
                thishandled = a->handler(type, regs);
                handled += thishandled;
-                delta = local_clock() - before;
+                delta = sched_clock() - before;
                trace_nmi_handler(a->handler, (int)delta, thishandled);
                if (delta < nmi_longest_ns)
diff --git a/arch/x86/kernel/preempt.S b/arch/x86/kernel/preempt.S
new file mode 100644
index 000000000000..ca7f0d58a87d
--- /dev/null
+++ b/arch/x86/kernel/preempt.S
@@ -0,0 +1,25 @@
+#include <linux/linkage.h>
+#include <asm/dwarf2.h>
+#include <asm/asm.h>
+#include <asm/calling.h>
+ENTRY(___preempt_schedule)
+        CFI_STARTPROC
+        SAVE_ALL
+        call preempt_schedule
+        RESTORE_ALL
+        ret
+        CFI_ENDPROC
+#ifdef CONFIG_CONTEXT_TRACKING
+ENTRY(___preempt_schedule_context)
+        CFI_STARTPROC
+        SAVE_ALL
+        call preempt_schedule_context
+        RESTORE_ALL
+        ret
+        CFI_ENDPROC
+#endif
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index c83516be1052..3fb8d95ab8b5 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -391,9 +391,9 @@ static void amd_e400_idle(void)
                 * The switch back from broadcast mode needs to be
                 * called with interrupts disabled.
                 */
-                 local_irq_disable();
+                local_irq_disable();
-                 clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu);
+                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu);
-                 local_irq_enable();
+                local_irq_enable();
        } else
                default_idle();
 }
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 884f98f69354..6f1236c29c4b 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -153,7 +153,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
                childregs->orig_ax = -1;
                childregs->cs = __KERNEL_CS | get_kernel_rpl();
                childregs->flags = X86_EFLAGS_IF | X86_EFLAGS_FIXED;
-                p->fpu_counter = 0;
+                p->thread.fpu_counter = 0;
                p->thread.io_bitmap_ptr = NULL;
                memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
                return 0;
@@ -166,7 +166,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
        p->thread.ip = (unsigned long) ret_from_fork;
        task_user_gs(p) = get_user_gs(current_pt_regs());
-        p->fpu_counter = 0;
+        p->thread.fpu_counter = 0;
        p->thread.io_bitmap_ptr = NULL;
        tsk = current;
        err = -ENOMEM;
@@ -292,6 +292,14 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
                set_iopl_mask(next->iopl);
        /*
+         * If it were not for PREEMPT_ACTIVE we could guarantee that the
+         * preempt_count of all tasks was equal here and this would not be
+         * needed.
+         */
+        task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
+        this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
+        /*
         * Now maybe handle debug registers and/or IO bitmaps
         */
        if (unlikely(task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV ||
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index bb1dc51bab05..9c0280f93d05 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -63,7 +63,7 @@ void __show_regs(struct pt_regs *regs, int all)
        unsigned int ds, cs, es;
        printk(KERN_DEFAULT "RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip);
-        printk_address(regs->ip, 1);
+        printk_address(regs->ip);
        printk(KERN_DEFAULT "RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs->ss,
                        regs->sp, regs->flags);
        printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n",
@@ -163,7 +163,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
        p->thread.sp = (unsigned long) childregs;
        p->thread.usersp = me->thread.usersp;
        set_tsk_thread_flag(p, TIF_FORK);
-        p->fpu_counter = 0;
+        p->thread.fpu_counter = 0;
        p->thread.io_bitmap_ptr = NULL;
        savesegment(gs, p->thread.gsindex);
@@ -363,6 +363,14 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
        this_cpu_write(old_rsp, next->usersp);
        this_cpu_write(current_task, next_p);
+        /*
+         * If it were not for PREEMPT_ACTIVE we could guarantee that the
+         * preempt_count of all tasks was equal here and this would not be
+         * needed.
+         */
+        task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
+        this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
        this_cpu_write(kernel_stack,
                  (unsigned long)task_stack_page(next_p) +
                  THREAD_SIZE - KERNEL_STACK_OFFSET);
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 7e920bff99a3..da3c599584a3 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -61,7 +61,7 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
        if (reboot_type != BOOT_BIOS) {
                reboot_type = BOOT_BIOS;
                pr_info("%s series board detected. Selecting %s-method for reboots.\n",
-                        "BIOS", d->ident);
+                        d->ident, "BIOS");
        }
        return 0;
 }
@@ -117,7 +117,7 @@ static int __init set_pci_reboot(const struct dmi_system_id *d)
        if (reboot_type != BOOT_CF9) {
                reboot_type = BOOT_CF9;
                pr_info("%s series board detected. Selecting %s-method for reboots.\n",
-                        "PCI", d->ident);
+                        d->ident, "PCI");
        }
        return 0;
 }
@@ -127,7 +127,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
        if (reboot_type != BOOT_KBD) {
                reboot_type = BOOT_KBD;
                pr_info("%s series board detected. Selecting %s-method for reboot.\n",
-                        "KBD", d->ident);
+                        d->ident, "KBD");
        }
        return 0;
 }
@@ -136,252 +136,256 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
 * This is a single dmi_table handling all reboot quirks.
 */
 static struct dmi_system_id __initdata reboot_dmi_table[] = {
-        {       /* Handle problems with rebooting on Dell E520's */
-                .callback = set_bios_reboot,
+        /* Acer */
-                .ident = "Dell E520",
+        {       /* Handle reboot issue on Acer Aspire one */
+                .callback = set_kbd_reboot,
+                .ident = "Acer Aspire One A110",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Dell DM061"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),
                },
        },
-        {       /* Handle problems with rebooting on Dell 1300's */
-                .callback = set_bios_reboot,
+        /* Apple */
-                .ident = "Dell PowerEdge 1300",
+        {       /* Handle problems with rebooting on Apple MacBook5 */
+                .callback = set_pci_reboot,
+                .ident = "Apple MacBook5",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 1300/"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5"),
                },
        },
-        {       /* Handle problems with rebooting on Dell 300's */
+        {       /* Handle problems with rebooting on Apple MacBookPro5 */
-                .callback = set_bios_reboot,
+                .callback = set_pci_reboot,
-                .ident = "Dell PowerEdge 300",
+                .ident = "Apple MacBookPro5",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 300/"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5"),
                },
        },
-        {       /* Handle problems with rebooting on Dell Optiplex 745's SFF */
+        {       /* Handle problems with rebooting on Apple Macmini3,1 */
-                .callback = set_bios_reboot,
+                .callback = set_pci_reboot,
-                .ident = "Dell OptiPlex 745",
+                .ident = "Apple Macmini3,1",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Macmini3,1"),
                },
        },
-        {       /* Handle problems with rebooting on Dell Optiplex 745's DFF */
+        {       /* Handle problems with rebooting on the iMac9,1. */
-                .callback = set_bios_reboot,
+                .callback = set_pci_reboot,
-                .ident = "Dell OptiPlex 745",
+                .ident = "Apple iMac9,1",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"),
-                        DMI_MATCH(DMI_BOARD_NAME, "0MM599"),
                },
        },
-        {       /* Handle problems with rebooting on Dell Optiplex 745 with 0KW626 */
+        /* ASUS */
+        {       /* Handle problems with rebooting on ASUS P4S800 */
                .callback = set_bios_reboot,
-                .ident = "Dell OptiPlex 745",
+                .ident = "ASUS P4S800",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"),
+                        DMI_MATCH(DMI_BOARD_NAME, "P4S800"),
-                        DMI_MATCH(DMI_BOARD_NAME, "0KW626"),
                },
        },
-        {       /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */
+        /* Dell */
+        {       /* Handle problems with rebooting on Dell DXP061 */
                .callback = set_bios_reboot,
-                .ident = "Dell OptiPlex 330",
+                .ident = "Dell DXP061",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 330"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Dell DXP061"),
-                        DMI_MATCH(DMI_BOARD_NAME, "0KP561"),
                },
        },
-        {       /* Handle problems with rebooting on Dell Optiplex 360 with 0T656F */
+        {       /* Handle problems with rebooting on Dell E520's */
                .callback = set_bios_reboot,
-                .ident = "Dell OptiPlex 360",
+                .ident = "Dell E520",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 360"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Dell DM061"),
-                        DMI_MATCH(DMI_BOARD_NAME, "0T656F"),
                },
        },
-        {       /* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G */
+        {       /* Handle problems with rebooting on the Latitude E5410. */
-                .callback = set_bios_reboot,
+                .callback = set_pci_reboot,
-                .ident = "Dell OptiPlex 760",
+                .ident = "Dell Latitude E5410",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 760"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5410"),
-                        DMI_MATCH(DMI_BOARD_NAME, "0G919G"),
                },
        },
-        {       /* Handle problems with rebooting on Dell 2400's */
+        {       /* Handle problems with rebooting on the Latitude E5420. */
-                .callback = set_bios_reboot,
+                .callback = set_pci_reboot,
-                .ident = "Dell PowerEdge 2400",
+                .ident = "Dell Latitude E5420",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5420"),
                },
        },
-        {       /* Handle problems with rebooting on Dell T5400's */
+        {       /* Handle problems with rebooting on the Latitude E6320. */
-                .callback = set_bios_reboot,
+                .callback = set_pci_reboot,
-                .ident = "Dell Precision T5400",
+                .ident = "Dell Latitude E6320",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation T5400"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"),
                },
        },
-        {       /* Handle problems with rebooting on Dell T7400's */
+        {       /* Handle problems with rebooting on the Latitude E6420. */
-                .callback = set_bios_reboot,
+                .callback = set_pci_reboot,
-                .ident = "Dell Precision T7400",
+                .ident = "Dell Latitude E6420",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation T7400"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"),
                },
        },
-        {       /* Handle problems with rebooting on HP laptops */
+        {       /* Handle problems with rebooting on Dell Optiplex 330 with 0KP561 */
                .callback = set_bios_reboot,
-                .ident = "HP Compaq Laptop",
+                .ident = "Dell OptiPlex 330",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 330"),
+                        DMI_MATCH(DMI_BOARD_NAME, "0KP561"),
                },
        },
-        {       /* Handle problems with rebooting on Dell XPS710 */
+        {       /* Handle problems with rebooting on Dell Optiplex 360 with 0T656F */
                .callback = set_bios_reboot,
-                .ident = "Dell XPS710",
+                .ident = "Dell OptiPlex 360",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Dell XPS710"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 360"),
+                        DMI_MATCH(DMI_BOARD_NAME, "0T656F"),
                },
        },
-        {       /* Handle problems with rebooting on Dell DXP061 */
+        {       /* Handle problems with rebooting on Dell Optiplex 745's SFF */
                .callback = set_bios_reboot,
-                .ident = "Dell DXP061",
+                .ident = "Dell OptiPlex 745",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Dell DXP061"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"),
                },
        },
-        {       /* Handle problems with rebooting on Sony VGN-Z540N */
+        {       /* Handle problems with rebooting on Dell Optiplex 745's DFF */
                .callback = set_bios_reboot,
-                .ident = "Sony VGN-Z540N",
+                .ident = "Dell OptiPlex 745",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "VGN-Z540N"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"),
+                        DMI_MATCH(DMI_BOARD_NAME, "0MM599"),
                },
        },
-        {       /* Handle problems with rebooting on ASUS P4S800 */
+        {       /* Handle problems with rebooting on Dell Optiplex 745 with 0KW626 */
                .callback = set_bios_reboot,
-                .ident = "ASUS P4S800",
+                .ident = "Dell OptiPlex 745",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-                        DMI_MATCH(DMI_BOARD_NAME, "P4S800"),
-                },
-        },
-        {       /* Handle reboot issue on Acer Aspire one */
-                .callback = set_kbd_reboot,
-                .ident = "Acer Aspire One A110",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"),
+                        DMI_MATCH(DMI_BOARD_NAME, "0KW626"),
                },
        },
-        {       /* Handle problems with rebooting on Apple MacBook5 */
+        {       /* Handle problems with rebooting on Dell OptiPlex 760 with 0G919G */
-                .callback = set_pci_reboot,
+                .callback = set_bios_reboot,
-                .ident = "Apple MacBook5",
+                .ident = "Dell OptiPlex 760",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 760"),
+                        DMI_MATCH(DMI_BOARD_NAME, "0G919G"),
                },
        },
-        {       /* Handle problems with rebooting on Apple MacBookPro5 */
+        {       /* Handle problems with rebooting on the OptiPlex 990. */
                .callback = set_pci_reboot,
-                .ident = "Apple MacBookPro5",
+                .ident = "Dell OptiPlex 990",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),
                },
        },
-        {       /* Handle problems with rebooting on Apple Macmini3,1 */
+        {       /* Handle problems with rebooting on Dell 300's */
-                .callback = set_pci_reboot,
+                .callback = set_bios_reboot,
-                .ident = "Apple Macmini3,1",
+                .ident = "Dell PowerEdge 300",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Macmini3,1"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 300/"),
                },
        },
-        {       /* Handle problems with rebooting on the iMac9,1. */
+        {       /* Handle problems with rebooting on Dell 1300's */
-                .callback = set_pci_reboot,
+                .callback = set_bios_reboot,
-                .ident = "Apple iMac9,1",
+                .ident = "Dell PowerEdge 1300",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 1300/"),
                },
        },
-        {       /* Handle problems with rebooting on the Latitude E6320. */
+        {       /* Handle problems with rebooting on Dell 2400's */
-                .callback = set_pci_reboot,
+                .callback = set_bios_reboot,
-                .ident = "Dell Latitude E6320",
+                .ident = "Dell PowerEdge 2400",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"),
                },
        },
-        {       /* Handle problems with rebooting on the Latitude E5410. */
+        {       /* Handle problems with rebooting on the Dell PowerEdge C6100. */
                .callback = set_pci_reboot,
-                .ident = "Dell Latitude E5410",
+                .ident = "Dell PowerEdge C6100",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5410"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
                },
        },
-        {       /* Handle problems with rebooting on the Latitude E5420. */
+        {       /* Handle problems with rebooting on the Precision M6600. */
                .callback = set_pci_reboot,
-                .ident = "Dell Latitude E5420",
+                .ident = "Dell Precision M6600",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5420"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
                },
        },
-        {       /* Handle problems with rebooting on the Latitude E6420. */
+        {       /* Handle problems with rebooting on Dell T5400's */
-                .callback = set_pci_reboot,
+                .callback = set_bios_reboot,
-                .ident = "Dell Latitude E6420",
+                .ident = "Dell Precision T5400",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation T5400"),
                },
        },
-        {       /* Handle problems with rebooting on the OptiPlex 990. */
+        {       /* Handle problems with rebooting on Dell T7400's */
-                .callback = set_pci_reboot,
+                .callback = set_bios_reboot,
-                .ident = "Dell OptiPlex 990",
+                .ident = "Dell Precision T7400",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation T7400"),
                },
        },
-        {       /* Handle problems with rebooting on the Precision M6600. */
+        {       /* Handle problems with rebooting on Dell XPS710 */
-                .callback = set_pci_reboot,
+                .callback = set_bios_reboot,
-                .ident = "Dell Precision M6600",
+                .ident = "Dell XPS710",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Dell XPS710"),
                },
        },
-        {       /* Handle problems with rebooting on the Dell PowerEdge C6100. */
-                .callback = set_pci_reboot,
+        /* Hewlett-Packard */
-                .ident = "Dell PowerEdge C6100",
+        {       /* Handle problems with rebooting on HP laptops */
+                .callback = set_bios_reboot,
+                .ident = "HP Compaq Laptop",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"),
                },
        },
-        {       /* Some C6100 machines were shipped with vendor being 'Dell'. */
-                .callback = set_pci_reboot,
+        /* Sony */
-                .ident = "Dell PowerEdge C6100",
+        {       /* Handle problems with rebooting on Sony VGN-Z540N */
+                .callback = set_bios_reboot,
+                .ident = "Sony VGN-Z540N",
                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
+                        DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "VGN-Z540N"),
                },
        },
        { }
 };
@@ -535,10 +539,13 @@ static void native_machine_emergency_restart(void)
                case BOOT_CF9_COND:
                        if (port_cf9_safe) {
-                                u8 cf9 = inb(0xcf9) & ~6;
+                                u8 reboot_code = reboot_mode == REBOOT_WARM ?
+                                        0x06 : 0x0E;
+                                u8 cf9 = inb(0xcf9) & ~reboot_code;
                                outb(cf9|2, 0xcf9); /* Request hard reset */
                                udelay(50);
-                                outb(cf9|6, 0xcf9); /* Actually do the reset */
+                                /* Actually do the reset */
+                                outb(cf9|reboot_code, 0xcf9);
                                udelay(50);
                        }
                        reboot_type = BOOT_KBD;
@@ -550,6 +557,10 @@ static void native_machine_emergency_restart(void)
 void native_machine_shutdown(void)
 {
        /* Stop the cpus and apics */
+#ifdef CONFIG_X86_IO_APIC
+        disable_IO_APIC();
+#endif
 #ifdef CONFIG_SMP
        /*
         * Stop all of the others. Also disable the local irq to
@@ -562,10 +573,6 @@ void native_machine_shutdown(void)
        lapic_shutdown();
-#ifdef CONFIG_X86_IO_APIC
-        disable_IO_APIC();
-#endif
 #ifdef CONFIG_HPET_TIMER
        hpet_disable();
 #endif
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index 0aa29394ed6f..ca9622a25e95 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -12,7 +12,7 @@
 #include <asm/vsyscall.h>
 #include <asm/x86_init.h>
 #include <asm/time.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/rtc.h>
 #ifdef CONFIG_X86_32
@@ -189,9 +189,17 @@ static __init int add_rtc_cmos(void)
                return 0;
        /* Intel MID platforms don't have ioport rtc */
-        if (mrst_identify_cpu())
+        if (intel_mid_identify_cpu())
                return -ENODEV;
+#ifdef CONFIG_ACPI
+        if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC) {
+                /* This warning can likely go away again in a year or two. */
+                pr_info("ACPI: not registering RTC platform device\n");
+                return -ENODEV;
+        }
+#endif
        platform_device_register(&rtc_device);
        dev_info(&rtc_device.dev,
                 "registered platform RTC device (no PNP device found)\n");
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f0de6294b955..cb233bc9dee3 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -993,6 +993,7 @@ void __init setup_arch(char **cmdline_p)
                efi_init();
        dmi_scan_machine();
+        dmi_memdev_walk();
        dmi_set_dump_stack_arch_desc();
        /*
@@ -1120,8 +1121,6 @@ void __init setup_arch(char **cmdline_p)
        acpi_initrd_override((void *)initrd_start, initrd_end - initrd_start);
 #endif
-        reserve_crashkernel();
        vsmp_init();
        io_delay_init();
@@ -1134,6 +1133,13 @@ void __init setup_arch(char **cmdline_p)
        early_acpi_boot_init();
        initmem_init();
+        /*
+         * Reserve memory for crash kernel after SRAT is parsed so that it
+         * won't consume hotpluggable memory.
+         */
+        reserve_crashkernel();
        memblock_find_dma_reserve();
 #ifdef CONFIG_KVM_GUEST
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 6cacab671f9b..85dc05a3aa02 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -73,36 +73,14 @@
 #include <asm/setup.h>
 #include <asm/uv/uv.h>
 #include <linux/mc146818rtc.h>
 #include <asm/smpboot_hooks.h>
 #include <asm/i8259.h>
 #include <asm/realmode.h>
+#include <asm/misc.h>
 /* State of each CPU */
 DEFINE_PER_CPU(int, cpu_state) = { 0 };
-#ifdef CONFIG_HOTPLUG_CPU
-/*
- * We need this for trampoline_base protection from concurrent accesses when
- * off- and onlining cores wildly.
- */
-static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
-void cpu_hotplug_driver_lock(void)
-{
-        mutex_lock(&x86_cpu_hotplug_driver_mutex);
-}
-void cpu_hotplug_driver_unlock(void)
-{
-        mutex_unlock(&x86_cpu_hotplug_driver_mutex);
-}
-ssize_t arch_cpu_probe(const char *buf, size_t count) { return -1; }
-ssize_t arch_cpu_release(const char *buf, size_t count) { return -1; }
-#endif
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
 EXPORT_SYMBOL(smp_num_siblings);
@@ -648,22 +626,46 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
        return (send_status | accept_status);
 }
+void smp_announce(void)
+{
+        int num_nodes = num_online_nodes();
+        printk(KERN_INFO "x86: Booted up %d node%s, %d CPUs\n",
+               num_nodes, (num_nodes > 1 ? "s" : ""), num_online_cpus());
+}
 /* reduce the number of lines printed when booting a large cpu count system */
 static void announce_cpu(int cpu, int apicid)
 {
        static int current_node = -1;
        int node = early_cpu_to_node(cpu);
-        int max_cpu_present = find_last_bit(cpumask_bits(cpu_present_mask), NR_CPUS);
+        static int width, node_width;
+        if (!width)
+                width = num_digits(num_possible_cpus()) + 1; /* + '#' sign */
+        if (!node_width)
+                node_width = num_digits(num_possible_nodes()) + 1; /* + '#' */
+        if (cpu == 1)
+                printk(KERN_INFO "x86: Booting SMP configuration:\n");
        if (system_state == SYSTEM_BOOTING) {
                if (node != current_node) {
                        if (current_node > (-1))
-                                pr_cont(" OK\n");
+                                pr_cont("\n");
                        current_node = node;
-                        pr_info("Booting Node %3d, Processors ", node);
+                        printk(KERN_INFO ".... node %*s#%d, CPUs:  ",
+                               node_width - num_digits(node), " ", node);
                }
-                pr_cont(" #%4d%s", cpu, cpu == max_cpu_present ? " OK\n" : "");
-                return;
+                /* Add padding for the BSP */
+                if (cpu == 1)
+                        pr_cont("%*s", width + 1, " ");
+                pr_cont("%*s#%d", width - num_digits(cpu), " ", cpu);
        } else
                pr_info("Booting Node %d Processor %d APIC 0x%x\n",
                        node, cpu, apicid);
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
index 6e60b5fe2244..649b010da00b 100644
--- a/arch/x86/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
@@ -65,29 +65,32 @@ int __ref _debug_hotplug_cpu(int cpu, int action)
        if (!cpu_is_hotpluggable(cpu))
                return -EINVAL;
-        cpu_hotplug_driver_lock();
+        lock_device_hotplug();
        switch (action) {
        case 0:
                ret = cpu_down(cpu);
                if (!ret) {
                        pr_info("CPU %u is now offline\n", cpu);
+                        dev->offline = true;
                        kobject_uevent(&dev->kobj, KOBJ_OFFLINE);
                } else
                        pr_debug("Can't offline CPU%d.\n", cpu);
                break;
        case 1:
                ret = cpu_up(cpu);
-                if (!ret)
+                if (!ret) {
+                        dev->offline = false;
                        kobject_uevent(&dev->kobj, KOBJ_ONLINE);
-                else
+                } else {
                        pr_debug("Can't online CPU%d.\n", cpu);
+                }
                break;
        default:
                ret = -EINVAL;
        }
-        cpu_hotplug_driver_unlock();
+        unlock_device_hotplug();
        return ret;
 }
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 8c8093b146ca..b857ed890b4c 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -88,7 +88,7 @@ static inline void conditional_sti(struct pt_regs *regs)
 static inline void preempt_conditional_sti(struct pt_regs *regs)
 {
-        inc_preempt_count();
+        preempt_count_inc();
        if (regs->flags & X86_EFLAGS_IF)
                local_irq_enable();
 }
@@ -103,7 +103,7 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
 {
        if (regs->flags & X86_EFLAGS_IF)
                local_irq_disable();
-        dec_preempt_count();
+        preempt_count_dec();
 }
 static int __kprobes
@@ -653,7 +653,7 @@ void math_state_restore(void)
                return;
        }
-        tsk->fpu_counter++;
+        tsk->thread.fpu_counter++;
 }
 EXPORT_SYMBOL_GPL(math_state_restore);
@@ -713,7 +713,7 @@ void __init early_trap_init(void)
        /* int3 can be called from all */
        set_system_intr_gate_ist(X86_TRAP_BP, &int3, DEBUG_STACK);
 #ifdef CONFIG_X86_32
-        set_intr_gate(X86_TRAP_PF, &page_fault);
+        set_intr_gate(X86_TRAP_PF, page_fault);
 #endif
        load_idt(&idt_descr);
 }
@@ -721,7 +721,7 @@ void __init early_trap_init(void)
 void __init early_trap_pf_init(void)
 {
 #ifdef CONFIG_X86_64
-        set_intr_gate(X86_TRAP_PF, &page_fault);
+        set_intr_gate(X86_TRAP_PF, page_fault);
 #endif
 }
@@ -737,30 +737,30 @@ void __init trap_init(void)
        early_iounmap(p, 4);
 #endif
-        set_intr_gate(X86_TRAP_DE, &divide_error);
+        set_intr_gate(X86_TRAP_DE, divide_error);
        set_intr_gate_ist(X86_TRAP_NMI, &nmi, NMI_STACK);
        /* int4 can be called from all */
        set_system_intr_gate(X86_TRAP_OF, &overflow);
-        set_intr_gate(X86_TRAP_BR, &bounds);
+        set_intr_gate(X86_TRAP_BR, bounds);
-        set_intr_gate(X86_TRAP_UD, &invalid_op);
+        set_intr_gate(X86_TRAP_UD, invalid_op);
-        set_intr_gate(X86_TRAP_NM, &device_not_available);
+        set_intr_gate(X86_TRAP_NM, device_not_available);
 #ifdef CONFIG_X86_32
        set_task_gate(X86_TRAP_DF, GDT_ENTRY_DOUBLEFAULT_TSS);
 #else
        set_intr_gate_ist(X86_TRAP_DF, &double_fault, DOUBLEFAULT_STACK);
 #endif
-        set_intr_gate(X86_TRAP_OLD_MF, &coprocessor_segment_overrun);
+        set_intr_gate(X86_TRAP_OLD_MF, coprocessor_segment_overrun);
-        set_intr_gate(X86_TRAP_TS, &invalid_TSS);
+        set_intr_gate(X86_TRAP_TS, invalid_TSS);
-        set_intr_gate(X86_TRAP_NP, &segment_not_present);
+        set_intr_gate(X86_TRAP_NP, segment_not_present);
        set_intr_gate_ist(X86_TRAP_SS, &stack_segment, STACKFAULT_STACK);
-        set_intr_gate(X86_TRAP_GP, &general_protection);
+        set_intr_gate(X86_TRAP_GP, general_protection);
-        set_intr_gate(X86_TRAP_SPURIOUS, &spurious_interrupt_bug);
+        set_intr_gate(X86_TRAP_SPURIOUS, spurious_interrupt_bug);
-        set_intr_gate(X86_TRAP_MF, &coprocessor_error);
+        set_intr_gate(X86_TRAP_MF, coprocessor_error);
-        set_intr_gate(X86_TRAP_AC, &alignment_check);
+        set_intr_gate(X86_TRAP_AC, alignment_check);
 #ifdef CONFIG_X86_MCE
        set_intr_gate_ist(X86_TRAP_MC, &machine_check, MCE_STACK);
 #endif
-        set_intr_gate(X86_TRAP_XF, &simd_coprocessor_error);
+        set_intr_gate(X86_TRAP_XF, simd_coprocessor_error);
        /* Reserve all the builtin and the syscall vector: */
        for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 10c4f3006afd..da6b35a98260 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -199,6 +199,15 @@ SECTIONS
                __x86_cpu_dev_end = .;
        }
+#ifdef CONFIG_X86_INTEL_MID
+        .x86_intel_mid_dev.init : AT(ADDR(.x86_intel_mid_dev.init) - \
+                                                                LOAD_OFFSET) {
+                __x86_intel_mid_dev_start = .;
+                *(.x86_intel_mid_dev.init)
+                __x86_intel_mid_dev_end = .;
+        }
+#endif
        /*
         * start address and size of operations which during runtime
         * can be patched with virtualization friendly instructions or
diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
index b014d9414d08..040681928e9d 100644
--- a/arch/x86/kernel/x8664_ksyms_64.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
@@ -66,3 +66,10 @@ EXPORT_SYMBOL(empty_zero_page);
 #ifndef CONFIG_PARAVIRT
 EXPORT_SYMBOL(native_load_gs_index);
 #endif
+#ifdef CONFIG_PREEMPT
+EXPORT_SYMBOL(___preempt_schedule);
+#ifdef CONFIG_CONTEXT_TRACKING
+EXPORT_SYMBOL(___preempt_schedule_context);
+#endif
+#endif
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 8ce0072cd700..021783b1f46a 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -116,6 +116,8 @@ struct x86_msi_ops x86_msi = {
        .teardown_msi_irqs      = default_teardown_msi_irqs,
        .restore_msi_irqs       = default_restore_msi_irqs,
        .setup_hpet_msi         = default_setup_hpet_msi,
+        .msi_mask_irq           = default_msi_mask_irq,
+        .msix_mask_irq          = default_msix_mask_irq,
 };
 /* MSI arch specific hooks */
@@ -138,6 +140,14 @@ void arch_restore_msi_irqs(struct pci_dev *dev, int irq)
 {
        x86_msi.restore_msi_irqs(dev, irq);
 }
+u32 arch_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
+{
+        return x86_msi.msi_mask_irq(desc, mask, flag);
+}
+u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
+{
+        return x86_msi.msix_mask_irq(desc, flag);
+}
 #endif
 struct x86_io_apic_ops x86_io_apic_ops = {
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 96b2c6697c9d..992d63bb154f 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -16,7 +16,7 @@ clean-files := inat-tables.c
 obj-$(CONFIG_SMP) += msr-smp.o cache-smp.o
-lib-y := delay.o
+lib-y := delay.o misc.o
 lib-y += thunk_$(BITS).o
 lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o
 lib-y += memcpy_$(BITS).o
diff --git a/arch/x86/lib/misc.c b/arch/x86/lib/misc.c
new file mode 100644
index 000000000000..76b373af03f0
--- /dev/null
+++ b/arch/x86/lib/misc.c
@@ -0,0 +1,21 @@
+/*
+ * Count the digits of @val including a possible sign.
+ *
+ * (Typed on and submitted from hpa's mobile phone.)
+ */
+int num_digits(int val)
+{
+        int m = 10;
+        int d = 1;
+        if (val < 0) {
+                d++;
+                val = -val;
+        }
+        while (val >= m) {
+                m *= 10;
+                d++;
+        }
+        return d;
+}
diff --git a/arch/x86/lib/msr-smp.c b/arch/x86/lib/msr-smp.c
index a6b1b86d2253..518532e6a3fa 100644
--- a/arch/x86/lib/msr-smp.c
+++ b/arch/x86/lib/msr-smp.c
@@ -47,6 +47,21 @@ int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)
 }
 EXPORT_SYMBOL(rdmsr_on_cpu);
+int rdmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 *q)
+{
+        int err;
+        struct msr_info rv;
+        memset(&rv, 0, sizeof(rv));
+        rv.msr_no = msr_no;
+        err = smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 1);
+        *q = rv.reg.q;
+        return err;
+}
+EXPORT_SYMBOL(rdmsrl_on_cpu);
 int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
 {
        int err;
@@ -63,6 +78,22 @@ int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
 }
 EXPORT_SYMBOL(wrmsr_on_cpu);
+int wrmsrl_on_cpu(unsigned int cpu, u32 msr_no, u64 q)
+{
+        int err;
+        struct msr_info rv;
+        memset(&rv, 0, sizeof(rv));
+        rv.msr_no = msr_no;
+        rv.reg.q = q;
+        err = smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 1);
+        return err;
+}
+EXPORT_SYMBOL(wrmsrl_on_cpu);
 static void __rwmsr_on_cpus(const struct cpumask *mask, u32 msr_no,
                            struct msr *msrs,
                            void (*msr_func) (void *info))
@@ -159,6 +190,37 @@ int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
 }
 EXPORT_SYMBOL(wrmsr_safe_on_cpu);
+int wrmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q)
+{
+        int err;
+        struct msr_info rv;
+        memset(&rv, 0, sizeof(rv));
+        rv.msr_no = msr_no;
+        rv.reg.q = q;
+        err = smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &rv, 1);
+        return err ? err : rv.err;
+}
+EXPORT_SYMBOL(wrmsrl_safe_on_cpu);
+int rdmsrl_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 *q)
+{
+        int err;
+        struct msr_info rv;
+        memset(&rv, 0, sizeof(rv));
+        rv.msr_no = msr_no;
+        err = smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &rv, 1);
+        *q = rv.reg.q;
+        return err ? err : rv.err;
+}
+EXPORT_SYMBOL(rdmsrl_safe_on_cpu);
 /*
 * These variants are significantly slower, but allows control over
 * the entire 32-bit GPR set.
diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c
index 4f74d94c8d97..ddf9ecb53cc3 100644
--- a/arch/x86/lib/usercopy.c
+++ b/arch/x86/lib/usercopy.c
@@ -11,39 +11,26 @@
 #include <linux/sched.h>
 /*
- * best effort, GUP based copy_from_user() that is NMI-safe
+ * We rely on the nested NMI work to allow atomic faults from the NMI path; the
+ * nested NMI paths are careful to preserve CR2.
 */
 unsigned long
 copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
 {
-        unsigned long offset, addr = (unsigned long)from;
+        unsigned long ret;
-        unsigned long size, len = 0;
-        struct page *page;
-        void *map;
-        int ret;
        if (__range_not_ok(from, n, TASK_SIZE))
-                return len;
+                return 0;
-        do {
+        /*
-                ret = __get_user_pages_fast(addr, 1, 0, &page);
+         * Even though this function is typically called from NMI/IRQ context
-                if (!ret)
+         * disable pagefaults so that its behaviour is consistent even when
-                        break;
+         * called form other contexts.
+         */
-                offset = addr & (PAGE_SIZE - 1);
+        pagefault_disable();
-                size = min(PAGE_SIZE - offset, n - len);
+        ret = __copy_from_user_inatomic(to, from, n);
+        pagefault_enable();
-                map = kmap_atomic(page);
-                memcpy(to, map+offset, size);
+        return ret;
-                kunmap_atomic(map);
-                put_page(page);
-                len  += size;
-                to   += size;
-                addr += size;
-        } while (len < n);
-        return len;
 }
 EXPORT_SYMBOL_GPL(copy_from_user_nmi);
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
index 3eb18acd0e40..e2f5e21c03b3 100644
--- a/arch/x86/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
@@ -654,14 +654,13 @@ EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
 * Returns number of bytes that could not be copied.
 * On success, this will be zero.
 */
-unsigned long
+unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
-copy_to_user(void __user *to, const void *from, unsigned long n)
 {
        if (access_ok(VERIFY_WRITE, to, n))
                n = __copy_to_user(to, from, n);
        return n;
 }
-EXPORT_SYMBOL(copy_to_user);
+EXPORT_SYMBOL(_copy_to_user);
 /**
 * copy_from_user: - Copy a block of data from user space.
@@ -679,8 +678,7 @@ EXPORT_SYMBOL(copy_to_user);
 * If some data could not be copied, this function will pad the copied
 * data to the requested size using zero bytes.
 */
-unsigned long
+unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
-_copy_from_user(void *to, const void __user *from, unsigned long n)
 {
        if (access_ok(VERIFY_READ, from, n))
                n = __copy_from_user(to, from, n);
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 23d8e5fecf76..6a19ad9f370d 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -6,6 +6,8 @@ nostackp := $(call cc-option, -fno-stack-protector)
 CFLAGS_physaddr.o               := $(nostackp)
 CFLAGS_setup_nx.o               := $(nostackp)
+CFLAGS_fault.o := -I$(src)/../include/asm/trace
 obj-$(CONFIG_X86_PAT)           += pat_rbtree.o
 obj-$(CONFIG_SMP)               += tlb.o
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 3aaeffcfd67a..9ff85bb8dd69 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -20,6 +20,9 @@
 #include <asm/kmemcheck.h>              /* kmemcheck_*(), ...           */
 #include <asm/fixmap.h>                 /* VSYSCALL_START               */
+#define CREATE_TRACE_POINTS
+#include <asm/trace/exceptions.h>
 /*
 * Page fault error code bits:
 *
@@ -51,7 +54,7 @@ kmmio_fault(struct pt_regs *regs, unsigned long addr)
        return 0;
 }
-static inline int __kprobes notify_page_fault(struct pt_regs *regs)
+static inline int __kprobes kprobes_fault(struct pt_regs *regs)
 {
        int ret = 0;
@@ -596,7 +599,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
        printk(KERN_CONT " at %p\n", (void *) address);
        printk(KERN_ALERT "IP:");
-        printk_address(regs->ip, 1);
+        printk_address(regs->ip);
        dump_pagetable(address);
 }
@@ -1048,7 +1051,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
                        return;
                /* kprobes don't want to hook the spurious faults: */
-                if (notify_page_fault(regs))
+                if (kprobes_fault(regs))
                        return;
                /*
                 * Don't take the mm semaphore here. If we fixup a prefetch
@@ -1060,23 +1063,8 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
        }
        /* kprobes don't want to hook the spurious faults: */
-        if (unlikely(notify_page_fault(regs)))
+        if (unlikely(kprobes_fault(regs)))
                return;
-        /*
-         * It's safe to allow irq's after cr2 has been saved and the
-         * vmalloc fault has been handled.
-         *
-         * User-mode registers count as a user access even for any
-         * potential system fault or CPU buglet:
-         */
-        if (user_mode_vm(regs)) {
-                local_irq_enable();
-                error_code |= PF_USER;
-                flags |= FAULT_FLAG_USER;
-        } else {
-                if (regs->flags & X86_EFLAGS_IF)
-                        local_irq_enable();
-        }
        if (unlikely(error_code & PF_RSVD))
                pgtable_bad(regs, error_code, address);
@@ -1088,8 +1076,6 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
                }
        }
-        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
        /*
         * If we're in an interrupt, have no user context or are running
         * in an atomic region then we must not take the fault:
@@ -1099,6 +1085,24 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
                return;
        }
+        /*
+         * It's safe to allow irq's after cr2 has been saved and the
+         * vmalloc fault has been handled.
+         *
+         * User-mode registers count as a user access even for any
+         * potential system fault or CPU buglet:
+         */
+        if (user_mode_vm(regs)) {
+                local_irq_enable();
+                error_code |= PF_USER;
+                flags |= FAULT_FLAG_USER;
+        } else {
+                if (regs->flags & X86_EFLAGS_IF)
+                        local_irq_enable();
+        }
+        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
        if (error_code & PF_WRITE)
                flags |= FAULT_FLAG_WRITE;
@@ -1231,3 +1235,23 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
        __do_page_fault(regs, error_code);
        exception_exit(prev_state);
 }
+static void trace_page_fault_entries(struct pt_regs *regs,
+                                     unsigned long error_code)
+{
+        if (user_mode(regs))
+                trace_page_fault_user(read_cr2(), regs, error_code);
+        else
+                trace_page_fault_kernel(read_cr2(), regs, error_code);
+}
+dotraplinkage void __kprobes
+trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
+{
+        enum ctx_state prev_state;
+        prev_state = exception_enter();
+        trace_page_fault_entries(regs, error_code);
+        __do_page_fault(regs, error_code);
+        exception_exit(prev_state);
+}
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 04664cdb7fda..f97130618113 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -53,12 +53,12 @@ __ref void *alloc_low_pages(unsigned int num)
        if ((pgt_buf_end + num) > pgt_buf_top || !can_use_brk_pgt) {
                unsigned long ret;
                if (min_pfn_mapped >= max_pfn_mapped)
-                        panic("alloc_low_page: ran out of memory");
+                        panic("alloc_low_pages: ran out of memory");
                ret = memblock_find_in_range(min_pfn_mapped << PAGE_SHIFT,
                                        max_pfn_mapped << PAGE_SHIFT,
                                        PAGE_SIZE * num , PAGE_SIZE);
                if (!ret)
-                        panic("alloc_low_page: can not alloc memory");
+                        panic("alloc_low_pages: can not alloc memory");
                memblock_reserve(ret, PAGE_SIZE * num);
                pfn = ret >> PAGE_SHIFT;
        } else {
@@ -399,29 +399,46 @@ static unsigned long __init init_range_memory_mapping(
        return mapped_ram_size;
 }
-/* (PUD_SHIFT-PMD_SHIFT)/2 */
+static unsigned long __init get_new_step_size(unsigned long step_size)
-#define STEP_SIZE_SHIFT 5
+{
-void __init init_mem_mapping(void)
+        /*
+         * Explain why we shift by 5 and why we don't have to worry about
+         * 'step_size << 5' overflowing:
+         *
+         * initial mapped size is PMD_SIZE (2M).
+         * We can not set step_size to be PUD_SIZE (1G) yet.
+         * In worse case, when we cross the 1G boundary, and
+         * PG_LEVEL_2M is not set, we will need 1+1+512 pages (2M + 8k)
+         * to map 1G range with PTE. Use 5 as shift for now.
+         *
+         * Don't need to worry about overflow, on 32bit, when step_size
+         * is 0, round_down() returns 0 for start, and that turns it
+         * into 0x100000000ULL.
+         */
+        return step_size << 5;
+}
+/**
+ * memory_map_top_down - Map [map_start, map_end) top down
+ * @map_start: start address of the target memory range
+ * @map_end: end address of the target memory range
+ *
+ * This function will setup direct mapping for memory range
+ * [map_start, map_end) in top-down. That said, the page tables
+ * will be allocated at the end of the memory, and we map the
+ * memory in top-down.
+ */
+static void __init memory_map_top_down(unsigned long map_start,
+                                       unsigned long map_end)
 {
-        unsigned long end, real_end, start, last_start;
+        unsigned long real_end, start, last_start;
        unsigned long step_size;
        unsigned long addr;
        unsigned long mapped_ram_size = 0;
        unsigned long new_mapped_ram_size;
-        probe_page_size_mask();
-#ifdef CONFIG_X86_64
-        end = max_pfn << PAGE_SHIFT;
-#else
-        end = max_low_pfn << PAGE_SHIFT;
-#endif
-        /* the ISA range is always mapped regardless of memory holes */
-        init_memory_mapping(0, ISA_END_ADDRESS);
        /* xen has big range in reserved near end of ram, skip it at first.*/
-        addr = memblock_find_in_range(ISA_END_ADDRESS, end, PMD_SIZE, PMD_SIZE);
+        addr = memblock_find_in_range(map_start, map_end, PMD_SIZE, PMD_SIZE);
        real_end = addr + PMD_SIZE;
        /* step_size need to be small so pgt_buf from BRK could cover it */
@@ -436,25 +453,106 @@ void __init init_mem_mapping(void)
         * end of RAM in [min_pfn_mapped, max_pfn_mapped) used as new pages
         * for page table.
         */
-        while (last_start > ISA_END_ADDRESS) {
+        while (last_start > map_start) {
                if (last_start > step_size) {
                        start = round_down(last_start - 1, step_size);
-                        if (start < ISA_END_ADDRESS)
+                        if (start < map_start)
-                                start = ISA_END_ADDRESS;
+                                start = map_start;
                } else
-                        start = ISA_END_ADDRESS;
+                        start = map_start;
                new_mapped_ram_size = init_range_memory_mapping(start,
                                                        last_start);
                last_start = start;
                min_pfn_mapped = last_start >> PAGE_SHIFT;
                /* only increase step_size after big range get mapped */
                if (new_mapped_ram_size > mapped_ram_size)
-                        step_size <<= STEP_SIZE_SHIFT;
+                        step_size = get_new_step_size(step_size);
                mapped_ram_size += new_mapped_ram_size;
        }
-        if (real_end < end)
+        if (real_end < map_end)
-                init_range_memory_mapping(real_end, end);
+                init_range_memory_mapping(real_end, map_end);
+}
+/**
+ * memory_map_bottom_up - Map [map_start, map_end) bottom up
+ * @map_start: start address of the target memory range
+ * @map_end: end address of the target memory range
+ *
+ * This function will setup direct mapping for memory range
+ * [map_start, map_end) in bottom-up. Since we have limited the
+ * bottom-up allocation above the kernel, the page tables will
+ * be allocated just above the kernel and we map the memory
+ * in [map_start, map_end) in bottom-up.
+ */
+static void __init memory_map_bottom_up(unsigned long map_start,
+                                        unsigned long map_end)
+{
+        unsigned long next, new_mapped_ram_size, start;
+        unsigned long mapped_ram_size = 0;
+        /* step_size need to be small so pgt_buf from BRK could cover it */
+        unsigned long step_size = PMD_SIZE;
+        start = map_start;
+        min_pfn_mapped = start >> PAGE_SHIFT;
+        /*
+         * We start from the bottom (@map_start) and go to the top (@map_end).
+         * The memblock_find_in_range() gets us a block of RAM from the
+         * end of RAM in [min_pfn_mapped, max_pfn_mapped) used as new pages
+         * for page table.
+         */
+        while (start < map_end) {
+                if (map_end - start > step_size) {
+                        next = round_up(start + 1, step_size);
+                        if (next > map_end)
+                                next = map_end;
+                } else
+                        next = map_end;
+                new_mapped_ram_size = init_range_memory_mapping(start, next);
+                start = next;
+                if (new_mapped_ram_size > mapped_ram_size)
+                        step_size = get_new_step_size(step_size);
+                mapped_ram_size += new_mapped_ram_size;
+        }
+}
+void __init init_mem_mapping(void)
+{
+        unsigned long end;
+        probe_page_size_mask();
+#ifdef CONFIG_X86_64
+        end = max_pfn << PAGE_SHIFT;
+#else
+        end = max_low_pfn << PAGE_SHIFT;
+#endif
+        /* the ISA range is always mapped regardless of memory holes */
+        init_memory_mapping(0, ISA_END_ADDRESS);
+        /*
+         * If the allocation is in bottom-up direction, we setup direct mapping
+         * in bottom-up, otherwise we setup direct mapping in top-down.
+         */
+        if (memblock_bottom_up()) {
+                unsigned long kernel_end = __pa_symbol(_end);
+                /*
+                 * we need two separate calls here. This is because we want to
+                 * allocate page tables above the kernel. So we first map
+                 * [kernel_end, end) to make memory above the kernel be mapped
+                 * as soon as possible. And then use page tables allocated above
+                 * the kernel to map [ISA_END_ADDRESS, kernel_end).
+                 */
+                memory_map_bottom_up(kernel_end, end);
+                memory_map_bottom_up(ISA_END_ADDRESS, kernel_end);
+        } else {
+                memory_map_top_down(ISA_END_ADDRESS, end);
+        }
 #ifdef CONFIG_X86_64
        if (max_pfn > max_low_pfn) {
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 8bf93bae1f13..24aec58d6afd 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -567,6 +567,17 @@ static int __init numa_init(int (*init_func)(void))
        ret = init_func();
        if (ret < 0)
                return ret;
+        /*
+         * We reset memblock back to the top-down direction
+         * here because if we configured ACPI_NUMA, we have
+         * parsed SRAT in init_func(). It is ok to have the
+         * reset here even if we did't configure ACPI_NUMA
+         * or acpi numa init fails and fallbacks to dummy
+         * numa init.
+         */
+        memblock_set_bottom_up(false);
        ret = numa_cleanup_meminfo(&numa_meminfo);
        if (ret < 0)
                return ret;
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
index dfa537a03be1..a7cccb6d7fec 100644
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@ -25,8 +25,12 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
        struct page *pte;
        pte = alloc_pages(__userpte_alloc_gfp, 0);
-        if (pte)
+        if (!pte)
-                pgtable_page_ctor(pte);
+                return NULL;
+        if (!pgtable_page_ctor(pte)) {
+                __free_page(pte);
+                return NULL;
+        }
        return pte;
 }
@@ -189,8 +193,10 @@ static void free_pmds(pmd_t *pmds[])
        int i;
        for(i = 0; i < PREALLOCATED_PMDS; i++)
-                if (pmds[i])
+                if (pmds[i]) {
+                        pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
                        free_page((unsigned long)pmds[i]);
+                }
 }
 static int preallocate_pmds(pmd_t *pmds[])
@@ -200,8 +206,13 @@ static int preallocate_pmds(pmd_t *pmds[])
        for(i = 0; i < PREALLOCATED_PMDS; i++) {
                pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
-                if (pmd == NULL)
+                if (!pmd)
                        failed = true;
+                if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
+                        free_page((unsigned long)pmds[i]);
+                        pmd = NULL;
+                        failed = true;
+                }
                pmds[i] = pmd;
        }
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 79c216aa0e2b..26328e800869 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -772,13 +772,23 @@ out:
        return;
 }
+static void bpf_jit_free_deferred(struct work_struct *work)
+{
+        struct sk_filter *fp = container_of(work, struct sk_filter, work);
+        unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
+        struct bpf_binary_header *header = (void *)addr;
+        set_memory_rw(addr, header->pages);
+        module_free(NULL, header);
+        kfree(fp);
+}
 void bpf_jit_free(struct sk_filter *fp)
 {
        if (fp->bpf_func != sk_run_filter) {
-                unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
+                INIT_WORK(&fp->work, bpf_jit_free_deferred);
-                struct bpf_binary_header *header = (void *)addr;
+                schedule_work(&fp->work);
+        } else {
-                set_memory_rw(addr, header->pages);
+                kfree(fp);
-                module_free(NULL, header);
        }
 }
diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
index d6aa6e8315d1..5d04be5efb64 100644
--- a/arch/x86/oprofile/backtrace.c
+++ b/arch/x86/oprofile/backtrace.c
@@ -47,7 +47,7 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
        unsigned long bytes;
        bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
-        if (bytes != sizeof(bufhead))
+        if (bytes != 0)
                return NULL;
        fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
@@ -93,7 +93,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
        unsigned long bytes;
        bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
-        if (bytes != sizeof(bufhead))
+        if (bytes != 0)
                return NULL;
        oprofile_add_trace(bufhead[0].return_address);
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index ee0af58ca5bd..e063eed0f912 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -18,7 +18,7 @@ obj-$(CONFIG_X86_VISWS)		+= visws.o
 obj-$(CONFIG_X86_NUMAQ)         += numaq_32.o
 obj-$(CONFIG_X86_NUMACHIP)      += numachip.o
-obj-$(CONFIG_X86_INTEL_MID)     += mrst.o
+obj-$(CONFIG_X86_INTEL_MID)     += intel_mid_pci.o
 obj-y                           += common.o early.o
 obj-y                           += bus_numa.o
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index b30e937689d6..7fb24e53d4c8 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -354,12 +354,12 @@ static void coalesce_windows(struct pci_root_info *info, unsigned long type)
                         * the kernel resource tree doesn't allow overlaps.
                         */
                        if (resource_overlaps(res1, res2)) {
-                                res1->start = min(res1->start, res2->start);
+                                res2->start = min(res1->start, res2->start);
-                                res1->end = max(res1->end, res2->end);
+                                res2->end = max(res1->end, res2->end);
                                dev_info(&info->bridge->dev,
                                         "host bridge window expanded to %pR; %pR ignored\n",
-                                         res1, res2);
+                                         res2, res1);
-                                res2->flags = 0;
+                                res1->flags = 0;
                        }
                }
        }
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index f5809fa2753e..b046e070e088 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -231,7 +231,7 @@ static int quirk_pcie_aspm_write(struct pci_bus *bus, unsigned int devfn, int wh
        offset = quirk_aspm_offset[GET_INDEX(bus->self->device, devfn)];
        if ((offset) && (where == offset))
-                value = value & 0xfffffffc;
+                value = value & ~PCI_EXP_LNKCTL_ASPMC;
        return raw_pci_write(pci_domain_nr(bus), bus->number,
                                                devfn, where, size, value);
@@ -252,7 +252,7 @@ static struct pci_ops quirk_pcie_aspm_ops = {
 */
 static void pcie_rootport_aspm_quirk(struct pci_dev *pdev)
 {
-        int cap_base, i;
+        int i;
        struct pci_bus  *pbus;
        struct pci_dev *dev;
@@ -278,7 +278,7 @@ static void pcie_rootport_aspm_quirk(struct pci_dev *pdev)
                for (i = GET_INDEX(pdev->device, 0); i <= GET_INDEX(pdev->device, 7); ++i)
                        quirk_aspm_offset[i] = 0;
-                pbus->ops = pbus->parent->ops;
+                pci_bus_set_ops(pbus, pbus->parent->ops);
        } else {
                /*
                 * If devices are attached to the root port at power-up or
@@ -286,13 +286,15 @@ static void pcie_rootport_aspm_quirk(struct pci_dev *pdev)
                 * each root port to save the register offsets and replace the
                 * bus ops.
                 */
-                list_for_each_entry(dev, &pbus->devices, bus_list) {
+                list_for_each_entry(dev, &pbus->devices, bus_list)
                        /* There are 0 to 8 devices attached to this bus */
-                        cap_base = pci_find_capability(dev, PCI_CAP_ID_EXP);
+                        quirk_aspm_offset[GET_INDEX(pdev->device, dev->devfn)] =
-                        quirk_aspm_offset[GET_INDEX(pdev->device, dev->devfn)] = cap_base + 0x10;
+                                dev->pcie_cap + PCI_EXP_LNKCTL;
-                }
-                pbus->ops = &quirk_pcie_aspm_ops;
+                pci_bus_set_ops(pbus, &quirk_pcie_aspm_ops);
+                dev_info(&pbus->dev, "writes to ASPM control bits will be ignored\n");
        }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_MCH_PA,     pcie_rootport_aspm_quirk);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_MCH_PA1,    pcie_rootport_aspm_quirk);
diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/intel_mid_pci.c
index 903fded50786..51384ca727ad 100644
--- a/arch/x86/pci/mrst.c
+++ b/arch/x86/pci/intel_mid_pci.c
@@ -1,5 +1,5 @@
 /*
- * Moorestown PCI support
+ * Intel MID PCI support
 *   Copyright (c) 2008 Intel Corporation
 *     Jesse Barnes <jesse.barnes@intel.com>
 *
@@ -150,12 +150,12 @@ static bool type1_access_ok(unsigned int bus, unsigned int devfn, int reg)
         * shim. Therefore, use the header type in shim instead.
         */
        if (reg >= 0x100 || reg == PCI_STATUS || reg == PCI_HEADER_TYPE)
-                return 0;
+                return false;
        if (bus == 0 && (devfn == PCI_DEVFN(2, 0)
                                || devfn == PCI_DEVFN(0, 0)
                                || devfn == PCI_DEVFN(3, 0)))
-                return 1;
+                return true;
-        return 0; /* Langwell on others */
+        return false; /* Langwell on others */
 }
 static int pci_read(struct pci_bus *bus, unsigned int devfn, int where,
@@ -205,7 +205,7 @@ static int pci_write(struct pci_bus *bus, unsigned int devfn, int where,
                               where, size, value);
 }
-static int mrst_pci_irq_enable(struct pci_dev *dev)
+static int intel_mid_pci_irq_enable(struct pci_dev *dev)
 {
        u8 pin;
        struct io_apic_irq_attr irq_attr;
@@ -225,23 +225,23 @@ static int mrst_pci_irq_enable(struct pci_dev *dev)
        return 0;
 }
-struct pci_ops pci_mrst_ops = {
+struct pci_ops intel_mid_pci_ops = {
        .read = pci_read,
        .write = pci_write,
 };
 /**
- * pci_mrst_init - installs pci_mrst_ops
+ * intel_mid_pci_init - installs intel_mid_pci_ops
 *
 * Moorestown has an interesting PCI implementation (see above).
 * Called when the early platform detection installs it.
 */
-int __init pci_mrst_init(void)
+int __init intel_mid_pci_init(void)
 {
        pr_info("Intel MID platform detected, using MID PCI ops\n");
        pci_mmcfg_late_init();
-        pcibios_enable_irq = mrst_pci_irq_enable;
+        pcibios_enable_irq = intel_mid_pci_irq_enable;
-        pci_root_ops = pci_mrst_ops;
+        pci_root_ops = intel_mid_pci_ops;
        pci_soc_mode = 1;
        /* Continue with standard init */
        return 1;
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 48e8461057ba..5eee4959785d 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -382,7 +382,14 @@ static void xen_teardown_msi_irq(unsigned int irq)
 {
        xen_destroy_irq(irq);
 }
+static u32 xen_nop_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag)
+{
+        return 0;
+}
+static u32 xen_nop_msix_mask_irq(struct msi_desc *desc, u32 flag)
+{
+        return 0;
+}
 #endif
 int __init pci_xen_init(void)
@@ -406,6 +413,8 @@ int __init pci_xen_init(void)
        x86_msi.setup_msi_irqs = xen_setup_msi_irqs;
        x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
        x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs;
+        x86_msi.msi_mask_irq = xen_nop_msi_mask_irq;
+        x86_msi.msix_mask_irq = xen_nop_msix_mask_irq;
 #endif
        return 0;
 }
@@ -485,6 +494,8 @@ int __init pci_xen_initial_domain(void)
        x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
        x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
        x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs;
+        x86_msi.msi_mask_irq = xen_nop_msi_mask_irq;
+        x86_msi.msix_mask_irq = xen_nop_msix_mask_irq;
 #endif
        xen_setup_acpi_sci();
        __acpi_register_gsi = acpi_register_gsi_xen;
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
index 01e0231a113e..20342d4c82ce 100644
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
@@ -4,7 +4,7 @@ obj-y	+= efi/
 obj-y   += geode/
 obj-y   += goldfish/
 obj-y   += iris/
-obj-y   += mrst/
+obj-y   += intel-mid/
 obj-y   += olpc/
 obj-y   += scx200/
 obj-y   += sfi/
diff --git a/arch/x86/platform/efi/Makefile b/arch/x86/platform/efi/Makefile
index 6db1cc4c7534..b7b0b35c1981 100644
--- a/arch/x86/platform/efi/Makefile
+++ b/arch/x86/platform/efi/Makefile
@@ -1,2 +1,3 @@
 obj-$(CONFIG_EFI)               += efi.o efi_$(BITS).o efi_stub_$(BITS).o
 obj-$(CONFIG_ACPI_BGRT) += efi-bgrt.o
+obj-$(CONFIG_EARLY_PRINTK_EFI)  += early_printk.o
diff --git a/arch/x86/platform/efi/early_printk.c b/arch/x86/platform/efi/early_printk.c
new file mode 100644
index 000000000000..6599a0027b76
--- /dev/null
+++ b/arch/x86/platform/efi/early_printk.c
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2013 Intel Corporation; author Matt Fleming
+ *
+ *  This file is part of the Linux kernel, and is made available under
+ *  the terms of the GNU General Public License version 2.
+ */
+#include <linux/console.h>
+#include <linux/efi.h>
+#include <linux/font.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <asm/setup.h>
+static const struct font_desc *font;
+static u32 efi_x, efi_y;
+static __init void early_efi_clear_scanline(unsigned int y)
+{
+        unsigned long base, *dst;
+        u16 len;
+        base = boot_params.screen_info.lfb_base;
+        len = boot_params.screen_info.lfb_linelength;
+        dst = early_ioremap(base + y*len, len);
+        if (!dst)
+                return;
+        memset(dst, 0, len);
+        early_iounmap(dst, len);
+}
+static __init void early_efi_scroll_up(void)
+{
+        unsigned long base, *dst, *src;
+        u16 len;
+        u32 i, height;
+        base = boot_params.screen_info.lfb_base;
+        len = boot_params.screen_info.lfb_linelength;
+        height = boot_params.screen_info.lfb_height;
+        for (i = 0; i < height - font->height; i++) {
+                dst = early_ioremap(base + i*len, len);
+                if (!dst)
+                        return;
+                src = early_ioremap(base + (i + font->height) * len, len);
+                if (!src) {
+                        early_iounmap(dst, len);
+                        return;
+                }
+                memmove(dst, src, len);
+                early_iounmap(src, len);
+                early_iounmap(dst, len);
+        }
+}
+static void early_efi_write_char(u32 *dst, unsigned char c, unsigned int h)
+{
+        const u32 color_black = 0x00000000;
+        const u32 color_white = 0x00ffffff;
+        const u8 *src;
+        u8 s8;
+        int m;
+        src = font->data + c * font->height;
+        s8 = *(src + h);
+        for (m = 0; m < 8; m++) {
+                if ((s8 >> (7 - m)) & 1)
+                        *dst = color_white;
+                else
+                        *dst = color_black;
+                dst++;
+        }
+}
+static __init void
+early_efi_write(struct console *con, const char *str, unsigned int num)
+{
+        struct screen_info *si;
+        unsigned long base;
+        unsigned int len;
+        const char *s;
+        void *dst;
+        base = boot_params.screen_info.lfb_base;
+        si = &boot_params.screen_info;
+        len = si->lfb_linelength;
+        while (num) {
+                unsigned int linemax;
+                unsigned int h, count = 0;
+                for (s = str; *s && *s != '\n'; s++) {
+                        if (count == num)
+                                break;
+                        count++;
+                }
+                linemax = (si->lfb_width - efi_x) / font->width;
+                if (count > linemax)
+                        count = linemax;
+                for (h = 0; h < font->height; h++) {
+                        unsigned int n, x;
+                        dst = early_ioremap(base + (efi_y + h) * len, len);
+                        if (!dst)
+                                return;
+                        s = str;
+                        n = count;
+                        x = efi_x;
+                        while (n-- > 0) {
+                                early_efi_write_char(dst + x*4, *s, h);
+                                x += font->width;
+                                s++;
+                        }
+                        early_iounmap(dst, len);
+                }
+                num -= count;
+                efi_x += count * font->width;
+                str += count;
+                if (num > 0 && *s == '\n') {
+                        efi_x = 0;
+                        efi_y += font->height;
+                        str++;
+                        num--;
+                }
+                if (efi_x >= si->lfb_width) {
+                        efi_x = 0;
+                        efi_y += font->height;
+                }
+                if (efi_y + font->height >= si->lfb_height) {
+                        u32 i;
+                        efi_y -= font->height;
+                        early_efi_scroll_up();
+                        for (i = 0; i < font->height; i++)
+                                early_efi_clear_scanline(efi_y + i);
+                }
+        }
+}
+static __init int early_efi_setup(struct console *con, char *options)
+{
+        struct screen_info *si;
+        u16 xres, yres;
+        u32 i;
+        si = &boot_params.screen_info;
+        xres = si->lfb_width;
+        yres = si->lfb_height;
+        /*
+         * early_efi_write_char() implicitly assumes a framebuffer with
+         * 32-bits per pixel.
+         */
+        if (si->lfb_depth != 32)
+                return -ENODEV;
+        font = get_default_font(xres, yres, -1, -1);
+        if (!font)
+                return -ENODEV;
+        efi_y = rounddown(yres, font->height) - font->height;
+        for (i = 0; i < (yres - efi_y) / font->height; i++)
+                early_efi_scroll_up();
+        return 0;
+}
+struct console early_efi_console = {
+        .name =         "earlyefi",
+        .write =        early_efi_write,
+        .setup =        early_efi_setup,
+        .flags =        CON_PRINTBUFFER,
+        .index =        -1,
+};
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index c7e22ab29a5a..92c02344a060 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -60,19 +60,6 @@
 static efi_char16_t efi_dummy_name[6] = { 'D', 'U', 'M', 'M', 'Y', 0 };
-struct efi __read_mostly efi = {
-        .mps        = EFI_INVALID_TABLE_ADDR,
-        .acpi       = EFI_INVALID_TABLE_ADDR,
-        .acpi20     = EFI_INVALID_TABLE_ADDR,
-        .smbios     = EFI_INVALID_TABLE_ADDR,
-        .sal_systab = EFI_INVALID_TABLE_ADDR,
-        .boot_info  = EFI_INVALID_TABLE_ADDR,
-        .hcdp       = EFI_INVALID_TABLE_ADDR,
-        .uga        = EFI_INVALID_TABLE_ADDR,
-        .uv_systab  = EFI_INVALID_TABLE_ADDR,
-};
-EXPORT_SYMBOL(efi);
 struct efi_memory_map memmap;
 static struct efi efi_phys __initdata;
@@ -80,6 +67,13 @@ static efi_system_table_t efi_systab __initdata;
 unsigned long x86_efi_facility;
+static __initdata efi_config_table_type_t arch_tables[] = {
+#ifdef CONFIG_X86_UV
+        {UV_SYSTEM_TABLE_GUID, "UVsystab", &efi.uv_systab},
+#endif
+        {NULL_GUID, NULL, NULL},
+};
 /*
 * Returns 1 if 'facility' is enabled, 0 otherwise.
 */
@@ -399,6 +393,8 @@ int __init efi_memblock_x86_reserve_range(void)
        memblock_reserve(pmap, memmap.nr_map * memmap.desc_size);
+        efi.memmap = &memmap;
        return 0;
 }
@@ -578,80 +574,6 @@ static int __init efi_systab_init(void *phys)
        return 0;
 }
-static int __init efi_config_init(u64 tables, int nr_tables)
-{
-        void *config_tables, *tablep;
-        int i, sz;
-        if (efi_enabled(EFI_64BIT))
-                sz = sizeof(efi_config_table_64_t);
-        else
-                sz = sizeof(efi_config_table_32_t);
-        /*
-         * Let's see what config tables the firmware passed to us.
-         */
-        config_tables = early_ioremap(tables, nr_tables * sz);
-        if (config_tables == NULL) {
-                pr_err("Could not map Configuration table!\n");
-                return -ENOMEM;
-        }
-        tablep = config_tables;
-        pr_info("");
-        for (i = 0; i < efi.systab->nr_tables; i++) {
-                efi_guid_t guid;
-                unsigned long table;
-                if (efi_enabled(EFI_64BIT)) {
-                        u64 table64;
-                        guid = ((efi_config_table_64_t *)tablep)->guid;
-                        table64 = ((efi_config_table_64_t *)tablep)->table;
-                        table = table64;
-#ifdef CONFIG_X86_32
-                        if (table64 >> 32) {
-                                pr_cont("\n");
-                                pr_err("Table located above 4GB, disabling EFI.\n");
-                                early_iounmap(config_tables,
-                                              efi.systab->nr_tables * sz);
-                                return -EINVAL;
-                        }
-#endif
-                } else {
-                        guid = ((efi_config_table_32_t *)tablep)->guid;
-                        table = ((efi_config_table_32_t *)tablep)->table;
-                }
-                if (!efi_guidcmp(guid, MPS_TABLE_GUID)) {
-                        efi.mps = table;
-                        pr_cont(" MPS=0x%lx ", table);
-                } else if (!efi_guidcmp(guid, ACPI_20_TABLE_GUID)) {
-                        efi.acpi20 = table;
-                        pr_cont(" ACPI 2.0=0x%lx ", table);
-                } else if (!efi_guidcmp(guid, ACPI_TABLE_GUID)) {
-                        efi.acpi = table;
-                        pr_cont(" ACPI=0x%lx ", table);
-                } else if (!efi_guidcmp(guid, SMBIOS_TABLE_GUID)) {
-                        efi.smbios = table;
-                        pr_cont(" SMBIOS=0x%lx ", table);
-#ifdef CONFIG_X86_UV
-                } else if (!efi_guidcmp(guid, UV_SYSTEM_TABLE_GUID)) {
-                        efi.uv_systab = table;
-                        pr_cont(" UVsystab=0x%lx ", table);
-#endif
-                } else if (!efi_guidcmp(guid, HCDP_TABLE_GUID)) {
-                        efi.hcdp = table;
-                        pr_cont(" HCDP=0x%lx ", table);
-                } else if (!efi_guidcmp(guid, UGA_IO_PROTOCOL_GUID)) {
-                        efi.uga = table;
-                        pr_cont(" UGA=0x%lx ", table);
-                }
-                tablep += sz;
-        }
-        pr_cont("\n");
-        early_iounmap(config_tables, efi.systab->nr_tables * sz);
-        return 0;
-}
 static int __init efi_runtime_init(void)
 {
        efi_runtime_services_t *runtime;
@@ -745,7 +667,7 @@ void __init efi_init(void)
                efi.systab->hdr.revision >> 16,
                efi.systab->hdr.revision & 0xffff, vendor);
-        if (efi_config_init(efi.systab->tables, efi.systab->nr_tables))
+        if (efi_config_init(arch_tables))
                return;
        set_bit(EFI_CONFIG_TABLES, &x86_efi_facility);
@@ -816,34 +738,6 @@ static void __init runtime_code_page_mkexec(void)
        }
 }
-/*
- * We can't ioremap data in EFI boot services RAM, because we've already mapped
- * it as RAM.  So, look it up in the existing EFI memory map instead.  Only
- * callable after efi_enter_virtual_mode and before efi_free_boot_services.
- */
-void __iomem *efi_lookup_mapped_addr(u64 phys_addr)
-{
-        void *p;
-        if (WARN_ON(!memmap.map))
-                return NULL;
-        for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
-                efi_memory_desc_t *md = p;
-                u64 size = md->num_pages << EFI_PAGE_SHIFT;
-                u64 end = md->phys_addr + size;
-                if (!(md->attribute & EFI_MEMORY_RUNTIME) &&
-                    md->type != EFI_BOOT_SERVICES_CODE &&
-                    md->type != EFI_BOOT_SERVICES_DATA)
-                        continue;
-                if (!md->virt_addr)
-                        continue;
-                if (phys_addr >= md->phys_addr && phys_addr < end) {
-                        phys_addr += md->virt_addr - md->phys_addr;
-                        return (__force void __iomem *)(unsigned long)phys_addr;
-                }
-        }
-        return NULL;
-}
 void efi_memory_uc(u64 addr, unsigned long size)
 {
        unsigned long page_shift = 1UL << EFI_PAGE_SHIFT;
diff --git a/arch/x86/platform/geode/alix.c b/arch/x86/platform/geode/alix.c
index 90e23e7679a5..76b6632d3143 100644
--- a/arch/x86/platform/geode/alix.c
+++ b/arch/x86/platform/geode/alix.c
@@ -98,7 +98,7 @@ static struct platform_device alix_leds_dev = {
        .dev.platform_data = &alix_leds_data,
 };
-static struct __initdata platform_device *alix_devs[] = {
+static struct platform_device *alix_devs[] __initdata = {
        &alix_buttons_dev,
        &alix_leds_dev,
 };
diff --git a/arch/x86/platform/geode/geos.c b/arch/x86/platform/geode/geos.c
index c2e6d53558be..aa733fba2471 100644
--- a/arch/x86/platform/geode/geos.c
+++ b/arch/x86/platform/geode/geos.c
@@ -87,7 +87,7 @@ static struct platform_device geos_leds_dev = {
        .dev.platform_data = &geos_leds_data,
 };
-static struct __initdata platform_device *geos_devs[] = {
+static struct platform_device *geos_devs[] __initdata = {
        &geos_buttons_dev,
        &geos_leds_dev,
 };
diff --git a/arch/x86/platform/geode/net5501.c b/arch/x86/platform/geode/net5501.c
index 646e3b5b4bb6..927e38c0089f 100644
--- a/arch/x86/platform/geode/net5501.c
+++ b/arch/x86/platform/geode/net5501.c
@@ -78,7 +78,7 @@ static struct platform_device net5501_leds_dev = {
        .dev.platform_data = &net5501_leds_data,
 };
-static struct __initdata platform_device *net5501_devs[] = {
+static struct platform_device *net5501_devs[] __initdata = {
        &net5501_buttons_dev,
        &net5501_leds_dev,
 };
diff --git a/arch/x86/platform/intel-mid/Makefile b/arch/x86/platform/intel-mid/Makefile
new file mode 100644
index 000000000000..01cc29ea5ff7
--- /dev/null
+++ b/arch/x86/platform/intel-mid/Makefile
@@ -0,0 +1,7 @@
+obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o
+obj-$(CONFIG_X86_INTEL_MID) += intel_mid_vrtc.o
+obj-$(CONFIG_EARLY_PRINTK_INTEL_MID) += early_printk_intel_mid.o
+# SFI specific code
+ifdef CONFIG_X86_INTEL_MID
+obj-$(CONFIG_SFI) += sfi.o device_libs/
+endif
diff --git a/arch/x86/platform/intel-mid/device_libs/Makefile b/arch/x86/platform/intel-mid/device_libs/Makefile
new file mode 100644
index 000000000000..097e7a7940d8
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/Makefile
@@ -0,0 +1,22 @@
+# IPC Devices
+obj-y += platform_ipc.o
+obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o
+obj-$(subst m,y,$(CONFIG_SND_MFLD_MACHINE)) += platform_msic_audio.o
+obj-$(subst m,y,$(CONFIG_GPIO_MSIC)) += platform_msic_gpio.o
+obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic_ocd.o
+obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic_battery.o
+obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o
+obj-$(subst m,y,$(CONFIG_GPIO_INTEL_PMIC)) += platform_pmic_gpio.o
+obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o
+# I2C Devices
+obj-$(subst m,y,$(CONFIG_SENSORS_EMC1403)) += platform_emc1403.o
+obj-$(subst m,y,$(CONFIG_SENSORS_LIS3LV02D)) += platform_lis331.o
+obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_max7315.o
+obj-$(subst m,y,$(CONFIG_INPUT_MPU3050)) += platform_mpu3050.o
+obj-$(subst m,y,$(CONFIG_INPUT_BMA150)) += platform_bma023.o
+obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o
+obj-$(subst m,y,$(CONFIG_DRM_MEDFIELD)) += platform_tc35876x.o
+# SPI Devices
+obj-$(subst m,y,$(CONFIG_SERIAL_MRST_MAX3110)) += platform_max3111.o
+# MISC Devices
+obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_bma023.c b/arch/x86/platform/intel-mid/device_libs/platform_bma023.c
new file mode 100644
index 000000000000..0ae7f2ae2296
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_bma023.c
@@ -0,0 +1,20 @@
+/*
+ * platform_bma023.c: bma023 platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <asm/intel-mid.h>
+static const struct devs_id bma023_dev_id __initconst = {
+        .name = "bma023",
+        .type = SFI_DEV_TYPE_I2C,
+        .delay = 1,
+};
+sfi_device(bma023_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_emc1403.c b/arch/x86/platform/intel-mid/device_libs/platform_emc1403.c
new file mode 100644
index 000000000000..0d942c1d26d5
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_emc1403.c
@@ -0,0 +1,41 @@
+/*
+ * platform_emc1403.c: emc1403 platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/init.h>
+#include <linux/gpio.h>
+#include <linux/i2c.h>
+#include <asm/intel-mid.h>
+static void __init *emc1403_platform_data(void *info)
+{
+        static short intr2nd_pdata;
+        struct i2c_board_info *i2c_info = info;
+        int intr = get_gpio_by_name("thermal_int");
+        int intr2nd = get_gpio_by_name("thermal_alert");
+        if (intr == -1 || intr2nd == -1)
+                return NULL;
+        i2c_info->irq = intr + INTEL_MID_IRQ_OFFSET;
+        intr2nd_pdata = intr2nd + INTEL_MID_IRQ_OFFSET;
+        return &intr2nd_pdata;
+}
+static const struct devs_id emc1403_dev_id __initconst = {
+        .name = "emc1403",
+        .type = SFI_DEV_TYPE_I2C,
+        .delay = 1,
+        .get_platform_data = &emc1403_platform_data,
+};
+sfi_device(emc1403_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c b/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c
new file mode 100644
index 000000000000..a013a4834bbe
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c
@@ -0,0 +1,83 @@
+/*
+ * platform_gpio_keys.c: gpio_keys platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/input.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/gpio.h>
+#include <linux/gpio_keys.h>
+#include <linux/platform_device.h>
+#include <asm/intel-mid.h>
+#define DEVICE_NAME "gpio-keys"
+/*
+ * we will search these buttons in SFI GPIO table (by name)
+ * and register them dynamically. Please add all possible
+ * buttons here, we will shrink them if no GPIO found.
+ */
+static struct gpio_keys_button gpio_button[] = {
+        {KEY_POWER,             -1, 1, "power_btn",     EV_KEY, 0, 3000},
+        {KEY_PROG1,             -1, 1, "prog_btn1",     EV_KEY, 0, 20},
+        {KEY_PROG2,             -1, 1, "prog_btn2",     EV_KEY, 0, 20},
+        {SW_LID,                -1, 1, "lid_switch",    EV_SW,  0, 20},
+        {KEY_VOLUMEUP,          -1, 1, "vol_up",        EV_KEY, 0, 20},
+        {KEY_VOLUMEDOWN,        -1, 1, "vol_down",      EV_KEY, 0, 20},
+        {KEY_CAMERA,            -1, 1, "camera_full",   EV_KEY, 0, 20},
+        {KEY_CAMERA_FOCUS,      -1, 1, "camera_half",   EV_KEY, 0, 20},
+        {SW_KEYPAD_SLIDE,       -1, 1, "MagSw1",        EV_SW,  0, 20},
+        {SW_KEYPAD_SLIDE,       -1, 1, "MagSw2",        EV_SW,  0, 20},
+};
+static struct gpio_keys_platform_data gpio_keys = {
+        .buttons        = gpio_button,
+        .rep            = 1,
+        .nbuttons       = -1, /* will fill it after search */
+};
+static struct platform_device pb_device = {
+        .name           = DEVICE_NAME,
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &gpio_keys,
+        },
+};
+/*
+ * Shrink the non-existent buttons, register the gpio button
+ * device if there is some
+ */
+static int __init pb_keys_init(void)
+{
+        struct gpio_keys_button *gb = gpio_button;
+        int i, num, good = 0;
+        num = sizeof(gpio_button) / sizeof(struct gpio_keys_button);
+        for (i = 0; i < num; i++) {
+                gb[i].gpio = get_gpio_by_name(gb[i].desc);
+                pr_debug("info[%2d]: name = %s, gpio = %d\n", i, gb[i].desc,
+                                        gb[i].gpio);
+                if (gb[i].gpio == -1)
+                        continue;
+                if (i != good)
+                        gb[good] = gb[i];
+                good++;
+        }
+        if (good) {
+                gpio_keys.nbuttons = good;
+                return platform_device_register(&pb_device);
+        }
+        return 0;
+}
+late_initcall(pb_keys_init);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_ipc.c b/arch/x86/platform/intel-mid/device_libs/platform_ipc.c
new file mode 100644
index 000000000000..a84b73d6c4a0
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_ipc.c
@@ -0,0 +1,68 @@
+/*
+ * platform_ipc.c: IPC platform library file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/sfi.h>
+#include <linux/gpio.h>
+#include <asm/intel-mid.h>
+#include "platform_ipc.h"
+void __init ipc_device_handler(struct sfi_device_table_entry *pentry,
+                                struct devs_id *dev)
+{
+        struct platform_device *pdev;
+        void *pdata = NULL;
+        static struct resource res __initdata = {
+                .name = "IRQ",
+                .flags = IORESOURCE_IRQ,
+        };
+        pr_debug("IPC bus, name = %16.16s, irq = 0x%2x\n",
+                pentry->name, pentry->irq);
+        /*
+         * We need to call platform init of IPC devices to fill misc_pdata
+         * structure. It will be used in msic_init for initialization.
+         */
+        if (dev != NULL)
+                pdata = dev->get_platform_data(pentry);
+        /*
+         * On Medfield the platform device creation is handled by the MSIC
+         * MFD driver so we don't need to do it here.
+         */
+        if (intel_mid_has_msic())
+                return;
+        pdev = platform_device_alloc(pentry->name, 0);
+        if (pdev == NULL) {
+                pr_err("out of memory for SFI platform device '%s'.\n",
+                        pentry->name);
+                return;
+        }
+        res.start = pentry->irq;
+        platform_device_add_resources(pdev, &res, 1);
+        pdev->dev.platform_data = pdata;
+        intel_scu_device_register(pdev);
+}
+static const struct devs_id pmic_audio_dev_id __initconst = {
+        .name = "pmic_audio",
+        .type = SFI_DEV_TYPE_IPC,
+        .delay = 1,
+        .device_handler = &ipc_device_handler,
+};
+sfi_device(pmic_audio_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_ipc.h b/arch/x86/platform/intel-mid/device_libs/platform_ipc.h
new file mode 100644
index 000000000000..8f568dd79605
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_ipc.h
@@ -0,0 +1,17 @@
+/*
+ * platform_ipc.h: IPC platform library header file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#ifndef _PLATFORM_IPC_H_
+#define _PLATFORM_IPC_H_
+extern void __init ipc_device_handler(struct sfi_device_table_entry *pentry,
+                        struct devs_id *dev) __attribute__((weak));
+#endif
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_lis331.c b/arch/x86/platform/intel-mid/device_libs/platform_lis331.c
new file mode 100644
index 000000000000..15278c11f714
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_lis331.c
@@ -0,0 +1,39 @@
+/*
+ * platform_lis331.c:  lis331 platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <asm/intel-mid.h>
+static void __init *lis331dl_platform_data(void *info)
+{
+        static short intr2nd_pdata;
+        struct i2c_board_info *i2c_info = info;
+        int intr = get_gpio_by_name("accel_int");
+        int intr2nd = get_gpio_by_name("accel_2");
+        if (intr == -1 || intr2nd == -1)
+                return NULL;
+        i2c_info->irq = intr + INTEL_MID_IRQ_OFFSET;
+        intr2nd_pdata = intr2nd + INTEL_MID_IRQ_OFFSET;
+        return &intr2nd_pdata;
+}
+static const struct devs_id lis331dl_dev_id __initconst = {
+        .name = "i2c_accel",
+        .type = SFI_DEV_TYPE_I2C,
+        .get_platform_data = &lis331dl_platform_data,
+};
+sfi_device(lis331dl_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_max3111.c b/arch/x86/platform/intel-mid/device_libs/platform_max3111.c
new file mode 100644
index 000000000000..afd1df94e0e5
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_max3111.c
@@ -0,0 +1,35 @@
+/*
+ * platform_max3111.c: max3111 platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/gpio.h>
+#include <linux/spi/spi.h>
+#include <asm/intel-mid.h>
+static void __init *max3111_platform_data(void *info)
+{
+        struct spi_board_info *spi_info = info;
+        int intr = get_gpio_by_name("max3111_int");
+        spi_info->mode = SPI_MODE_0;
+        if (intr == -1)
+                return NULL;
+        spi_info->irq = intr + INTEL_MID_IRQ_OFFSET;
+        return NULL;
+}
+static const struct devs_id max3111_dev_id __initconst = {
+        .name = "spi_max3111",
+        .type = SFI_DEV_TYPE_SPI,
+        .get_platform_data = &max3111_platform_data,
+};
+sfi_device(max3111_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_max7315.c b/arch/x86/platform/intel-mid/device_libs/platform_max7315.c
new file mode 100644
index 000000000000..94ade10024ae
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_max7315.c
@@ -0,0 +1,79 @@
+/*
+ * platform_max7315.c: max7315 platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/init.h>
+#include <linux/gpio.h>
+#include <linux/i2c.h>
+#include <linux/platform_data/pca953x.h>
+#include <asm/intel-mid.h>
+#define MAX7315_NUM 2
+static void __init *max7315_platform_data(void *info)
+{
+        static struct pca953x_platform_data max7315_pdata[MAX7315_NUM];
+        static int nr;
+        struct pca953x_platform_data *max7315 = &max7315_pdata[nr];
+        struct i2c_board_info *i2c_info = info;
+        int gpio_base, intr;
+        char base_pin_name[SFI_NAME_LEN + 1];
+        char intr_pin_name[SFI_NAME_LEN + 1];
+        if (nr == MAX7315_NUM) {
+                pr_err("too many max7315s, we only support %d\n",
+                                MAX7315_NUM);
+                return NULL;
+        }
+        /* we have several max7315 on the board, we only need load several
+         * instances of the same pca953x driver to cover them
+         */
+        strcpy(i2c_info->type, "max7315");
+        if (nr++) {
+                sprintf(base_pin_name, "max7315_%d_base", nr);
+                sprintf(intr_pin_name, "max7315_%d_int", nr);
+        } else {
+                strcpy(base_pin_name, "max7315_base");
+                strcpy(intr_pin_name, "max7315_int");
+        }
+        gpio_base = get_gpio_by_name(base_pin_name);
+        intr = get_gpio_by_name(intr_pin_name);
+        if (gpio_base == -1)
+                return NULL;
+        max7315->gpio_base = gpio_base;
+        if (intr != -1) {
+                i2c_info->irq = intr + INTEL_MID_IRQ_OFFSET;
+                max7315->irq_base = gpio_base + INTEL_MID_IRQ_OFFSET;
+        } else {
+                i2c_info->irq = -1;
+                max7315->irq_base = -1;
+        }
+        return max7315;
+}
+static const struct devs_id max7315_dev_id __initconst = {
+        .name = "i2c_max7315",
+        .type = SFI_DEV_TYPE_I2C,
+        .delay = 1,
+        .get_platform_data = &max7315_platform_data,
+};
+static const struct devs_id max7315_2_dev_id __initconst = {
+        .name = "i2c_max7315_2",
+        .type = SFI_DEV_TYPE_I2C,
+        .delay = 1,
+        .get_platform_data = &max7315_platform_data,
+};
+sfi_device(max7315_dev_id);
+sfi_device(max7315_2_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c b/arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c
new file mode 100644
index 000000000000..dd28d63c84fb
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c
@@ -0,0 +1,36 @@
+/*
+ * platform_mpu3050.c: mpu3050 platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/gpio.h>
+#include <linux/i2c.h>
+#include <asm/intel-mid.h>
+static void *mpu3050_platform_data(void *info)
+{
+        struct i2c_board_info *i2c_info = info;
+        int intr = get_gpio_by_name("mpu3050_int");
+        if (intr == -1)
+                return NULL;
+        i2c_info->irq = intr + INTEL_MID_IRQ_OFFSET;
+        return NULL;
+}
+static const struct devs_id mpu3050_dev_id __initconst = {
+        .name = "mpu3050",
+        .type = SFI_DEV_TYPE_I2C,
+        .delay = 1,
+        .get_platform_data = &mpu3050_platform_data,
+};
+sfi_device(mpu3050_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic.c b/arch/x86/platform/intel-mid/device_libs/platform_msic.c
new file mode 100644
index 000000000000..9f4a775a69d6
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic.c
@@ -0,0 +1,87 @@
+/*
+ * platform_msic.c: MSIC platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/scatterlist.h>
+#include <linux/init.h>
+#include <linux/sfi.h>
+#include <linux/mfd/intel_msic.h>
+#include <asm/intel_scu_ipc.h>
+#include <asm/intel-mid.h>
+#include "platform_msic.h"
+struct intel_msic_platform_data msic_pdata;
+static struct resource msic_resources[] = {
+        {
+                .start  = INTEL_MSIC_IRQ_PHYS_BASE,
+                .end    = INTEL_MSIC_IRQ_PHYS_BASE + 64 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+static struct platform_device msic_device = {
+        .name           = "intel_msic",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &msic_pdata,
+        },
+        .num_resources  = ARRAY_SIZE(msic_resources),
+        .resource       = msic_resources,
+};
+static int msic_scu_status_change(struct notifier_block *nb,
+                                  unsigned long code, void *data)
+{
+        if (code == SCU_DOWN) {
+                platform_device_unregister(&msic_device);
+                return 0;
+        }
+        return platform_device_register(&msic_device);
+}
+static int __init msic_init(void)
+{
+        static struct notifier_block msic_scu_notifier = {
+                .notifier_call  = msic_scu_status_change,
+        };
+        /*
+         * We need to be sure that the SCU IPC is ready before MSIC device
+         * can be registered.
+         */
+        if (intel_mid_has_msic())
+                intel_scu_notifier_add(&msic_scu_notifier);
+        return 0;
+}
+arch_initcall(msic_init);
+/*
+ * msic_generic_platform_data - sets generic platform data for the block
+ * @info: pointer to the SFI device table entry for this block
+ * @block: MSIC block
+ *
+ * Function sets IRQ number from the SFI table entry for given device to
+ * the MSIC platform data.
+ */
+void *msic_generic_platform_data(void *info, enum intel_msic_block block)
+{
+        struct sfi_device_table_entry *entry = info;
+        BUG_ON(block < 0 || block >= INTEL_MSIC_BLOCK_LAST);
+        msic_pdata.irq[block] = entry->irq;
+        return NULL;
+}
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic.h b/arch/x86/platform/intel-mid/device_libs/platform_msic.h
new file mode 100644
index 000000000000..917eb56d77da
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic.h
@@ -0,0 +1,19 @@
+/*
+ * platform_msic.h: MSIC platform data header file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#ifndef _PLATFORM_MSIC_H_
+#define _PLATFORM_MSIC_H_
+extern struct intel_msic_platform_data msic_pdata;
+extern void *msic_generic_platform_data(void *info,
+                        enum intel_msic_block block) __attribute__((weak));
+#endif
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c
new file mode 100644
index 000000000000..29629397d2b3
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c
@@ -0,0 +1,47 @@
+/*
+ * platform_msic_audio.c: MSIC audio platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/scatterlist.h>
+#include <linux/init.h>
+#include <linux/sfi.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/intel_msic.h>
+#include <asm/intel-mid.h>
+#include "platform_msic.h"
+#include "platform_ipc.h"
+static void *msic_audio_platform_data(void *info)
+{
+        struct platform_device *pdev;
+        pdev = platform_device_register_simple("sst-platform", -1, NULL, 0);
+        if (IS_ERR(pdev)) {
+                pr_err("failed to create audio platform device\n");
+                return NULL;
+        }
+        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_AUDIO);
+}
+static const struct devs_id msic_audio_dev_id __initconst = {
+        .name = "msic_audio",
+        .type = SFI_DEV_TYPE_IPC,
+        .delay = 1,
+        .get_platform_data = &msic_audio_platform_data,
+        .device_handler = &ipc_device_handler,
+};
+sfi_device(msic_audio_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c
new file mode 100644
index 000000000000..f446c33df1a8
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c
@@ -0,0 +1,37 @@
+/*
+ * platform_msic_battery.c: MSIC battery platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/scatterlist.h>
+#include <linux/init.h>
+#include <linux/sfi.h>
+#include <linux/mfd/intel_msic.h>
+#include <asm/intel-mid.h>
+#include "platform_msic.h"
+#include "platform_ipc.h"
+static void __init *msic_battery_platform_data(void *info)
+{
+        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_BATTERY);
+}
+static const struct devs_id msic_battery_dev_id __initconst = {
+        .name = "msic_battery",
+        .type = SFI_DEV_TYPE_IPC,
+        .delay = 1,
+        .get_platform_data = &msic_battery_platform_data,
+        .device_handler = &ipc_device_handler,
+};
+sfi_device(msic_battery_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c
new file mode 100644
index 000000000000..2a4f7b1dd917
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c
@@ -0,0 +1,48 @@
+/*
+ * platform_msic_gpio.c: MSIC GPIO platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/scatterlist.h>
+#include <linux/sfi.h>
+#include <linux/init.h>
+#include <linux/gpio.h>
+#include <linux/mfd/intel_msic.h>
+#include <asm/intel-mid.h>
+#include "platform_msic.h"
+#include "platform_ipc.h"
+static void __init *msic_gpio_platform_data(void *info)
+{
+        static struct intel_msic_gpio_pdata msic_gpio_pdata;
+        int gpio = get_gpio_by_name("msic_gpio_base");
+        if (gpio < 0)
+                return NULL;
+        msic_gpio_pdata.gpio_base = gpio;
+        msic_pdata.gpio = &msic_gpio_pdata;
+        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_GPIO);
+}
+static const struct devs_id msic_gpio_dev_id __initconst = {
+        .name = "msic_gpio",
+        .type = SFI_DEV_TYPE_IPC,
+        .delay = 1,
+        .get_platform_data = &msic_gpio_platform_data,
+        .device_handler = &ipc_device_handler,
+};
+sfi_device(msic_gpio_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c
new file mode 100644
index 000000000000..6497111ddb54
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c
@@ -0,0 +1,49 @@
+/*
+ * platform_msic_ocd.c: MSIC OCD platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/scatterlist.h>
+#include <linux/sfi.h>
+#include <linux/init.h>
+#include <linux/gpio.h>
+#include <linux/mfd/intel_msic.h>
+#include <asm/intel-mid.h>
+#include "platform_msic.h"
+#include "platform_ipc.h"
+static void __init *msic_ocd_platform_data(void *info)
+{
+        static struct intel_msic_ocd_pdata msic_ocd_pdata;
+        int gpio;
+        gpio = get_gpio_by_name("ocd_gpio");
+        if (gpio < 0)
+                return NULL;
+        msic_ocd_pdata.gpio = gpio;
+        msic_pdata.ocd = &msic_ocd_pdata;
+        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_OCD);
+}
+static const struct devs_id msic_ocd_dev_id __initconst = {
+        .name = "msic_ocd",
+        .type = SFI_DEV_TYPE_IPC,
+        .delay = 1,
+        .get_platform_data = &msic_ocd_platform_data,
+        .device_handler = &ipc_device_handler,
+};
+sfi_device(msic_ocd_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c
new file mode 100644
index 000000000000..83a3459bc337
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c
@@ -0,0 +1,36 @@
+/*
+ * platform_msic_power_btn.c: MSIC power btn platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/scatterlist.h>
+#include <linux/sfi.h>
+#include <linux/init.h>
+#include <linux/mfd/intel_msic.h>
+#include <asm/intel-mid.h>
+#include "platform_msic.h"
+#include "platform_ipc.h"
+static void __init *msic_power_btn_platform_data(void *info)
+{
+        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_POWER_BTN);
+}
+static const struct devs_id msic_power_btn_dev_id __initconst = {
+        .name = "msic_power_btn",
+        .type = SFI_DEV_TYPE_IPC,
+        .delay = 1,
+        .get_platform_data = &msic_power_btn_platform_data,
+        .device_handler = &ipc_device_handler,
+};
+sfi_device(msic_power_btn_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c b/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c
new file mode 100644
index 000000000000..a351878b96bc
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c
@@ -0,0 +1,37 @@
+/*
+ * platform_msic_thermal.c: msic_thermal platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/input.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/intel_msic.h>
+#include <asm/intel-mid.h>
+#include "platform_msic.h"
+#include "platform_ipc.h"
+static void __init *msic_thermal_platform_data(void *info)
+{
+        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_THERMAL);
+}
+static const struct devs_id msic_thermal_dev_id __initconst = {
+        .name = "msic_thermal",
+        .type = SFI_DEV_TYPE_IPC,
+        .delay = 1,
+        .get_platform_data = &msic_thermal_platform_data,
+        .device_handler = &ipc_device_handler,
+};
+sfi_device(msic_thermal_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c b/arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c
new file mode 100644
index 000000000000..d87182a09263
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c
@@ -0,0 +1,54 @@
+/*
+ * platform_pmic_gpio.c: PMIC GPIO platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/scatterlist.h>
+#include <linux/gpio.h>
+#include <linux/init.h>
+#include <linux/sfi.h>
+#include <linux/intel_pmic_gpio.h>
+#include <asm/intel-mid.h>
+#include "platform_ipc.h"
+static void __init *pmic_gpio_platform_data(void *info)
+{
+        static struct intel_pmic_gpio_platform_data pmic_gpio_pdata;
+        int gpio_base = get_gpio_by_name("pmic_gpio_base");
+        if (gpio_base == -1)
+                gpio_base = 64;
+        pmic_gpio_pdata.gpio_base = gpio_base;
+        pmic_gpio_pdata.irq_base = gpio_base + INTEL_MID_IRQ_OFFSET;
+        pmic_gpio_pdata.gpiointr = 0xffffeff8;
+        return &pmic_gpio_pdata;
+}
+static const struct devs_id pmic_gpio_spi_dev_id __initconst = {
+        .name = "pmic_gpio",
+        .type = SFI_DEV_TYPE_SPI,
+        .delay = 1,
+        .get_platform_data = &pmic_gpio_platform_data,
+};
+static const struct devs_id pmic_gpio_ipc_dev_id __initconst = {
+        .name = "pmic_gpio",
+        .type = SFI_DEV_TYPE_IPC,
+        .delay = 1,
+        .get_platform_data = &pmic_gpio_platform_data,
+        .device_handler = &ipc_device_handler
+};
+sfi_device(pmic_gpio_spi_dev_id);
+sfi_device(pmic_gpio_ipc_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_tc35876x.c b/arch/x86/platform/intel-mid/device_libs/platform_tc35876x.c
new file mode 100644
index 000000000000..740fc757050c
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_tc35876x.c
@@ -0,0 +1,36 @@
+/*
+ * platform_tc35876x.c: tc35876x platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/gpio.h>
+#include <linux/i2c/tc35876x.h>
+#include <asm/intel-mid.h>
+/*tc35876x DSI_LVDS bridge chip and panel platform data*/
+static void *tc35876x_platform_data(void *data)
+{
+        static struct tc35876x_platform_data pdata;
+        /* gpio pins set to -1 will not be used by the driver */
+        pdata.gpio_bridge_reset = get_gpio_by_name("LCMB_RXEN");
+        pdata.gpio_panel_bl_en = get_gpio_by_name("6S6P_BL_EN");
+        pdata.gpio_panel_vadd = get_gpio_by_name("EN_VREG_LCD_V3P3");
+        return &pdata;
+}
+static const struct devs_id tc35876x_dev_id __initconst = {
+        .name = "i2c_disp_brig",
+        .type = SFI_DEV_TYPE_I2C,
+        .get_platform_data = &tc35876x_platform_data,
+};
+sfi_device(tc35876x_dev_id);
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_tca6416.c b/arch/x86/platform/intel-mid/device_libs/platform_tca6416.c
new file mode 100644
index 000000000000..22881c9a6737
--- /dev/null
+++ b/arch/x86/platform/intel-mid/device_libs/platform_tca6416.c
@@ -0,0 +1,57 @@
+/*
+ * platform_tca6416.c: tca6416 platform data initilization file
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/platform_data/pca953x.h>
+#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <asm/intel-mid.h>
+#define TCA6416_NAME    "tca6416"
+#define TCA6416_BASE    "tca6416_base"
+#define TCA6416_INTR    "tca6416_int"
+static void *tca6416_platform_data(void *info)
+{
+        static struct pca953x_platform_data tca6416;
+        struct i2c_board_info *i2c_info = info;
+        int gpio_base, intr;
+        char base_pin_name[SFI_NAME_LEN + 1];
+        char intr_pin_name[SFI_NAME_LEN + 1];
+        strcpy(i2c_info->type, TCA6416_NAME);
+        strcpy(base_pin_name, TCA6416_BASE);
+        strcpy(intr_pin_name, TCA6416_INTR);
+        gpio_base = get_gpio_by_name(base_pin_name);
+        intr = get_gpio_by_name(intr_pin_name);
+        if (gpio_base == -1)
+                return NULL;
+        tca6416.gpio_base = gpio_base;
+        if (intr != -1) {
+                i2c_info->irq = intr + INTEL_MID_IRQ_OFFSET;
+                tca6416.irq_base = gpio_base + INTEL_MID_IRQ_OFFSET;
+        } else {
+                i2c_info->irq = -1;
+                tca6416.irq_base = -1;
+        }
+        return &tca6416;
+}
+static const struct devs_id tca6416_dev_id __initconst = {
+        .name = "tca6416",
+        .type = SFI_DEV_TYPE_I2C,
+        .delay = 1,
+        .get_platform_data = &tca6416_platform_data,
+};
+sfi_device(tca6416_dev_id);
diff --git a/arch/x86/platform/mrst/early_printk_mrst.c b/arch/x86/platform/intel-mid/early_printk_intel_mid.c
index 028454f0c3a5..4f702f554f6e 100644
--- a/arch/x86/platform/mrst/early_printk_mrst.c
+++ b/arch/x86/platform/intel-mid/early_printk_intel_mid.c
@@ -1,5 +1,5 @@
 /*
- * early_printk_mrst.c - early consoles for Intel MID platforms
+ * early_printk_intel_mid.c - early consoles for Intel MID platforms
 *
 * Copyright (c) 2008-2010, Intel Corporation
 *
@@ -27,7 +27,7 @@
 #include <asm/fixmap.h>
 #include <asm/pgtable.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #define MRST_SPI_TIMEOUT                0x200000
 #define MRST_REGBASE_SPI0               0xff128000
@@ -152,7 +152,7 @@ void mrst_early_console_init(void)
        spi0_cdiv = ((*pclk_spi0) & 0xe00) >> 9;
        freq = 100000000 / (spi0_cdiv + 1);
-        if (mrst_identify_cpu() == MRST_CPU_CHIP_PENWELL)
+        if (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_PENWELL)
                mrst_spi_paddr = MRST_REGBASE_SPI1;
        pspi = (void *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE,
@@ -213,13 +213,14 @@ static void early_mrst_spi_putc(char c)
        }
        if (!timeout)
-                pr_warning("MRST earlycon: timed out\n");
+                pr_warn("MRST earlycon: timed out\n");
        else
                max3110_write_data(c);
 }
 /* Early SPI only uses polling mode */
-static void early_mrst_spi_write(struct console *con, const char *str, unsigned n)
+static void early_mrst_spi_write(struct console *con, const char *str,
+                                        unsigned n)
 {
        int i;
diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
new file mode 100644
index 000000000000..f90e290f689f
--- /dev/null
+++ b/arch/x86/platform/intel-mid/intel-mid.c
@@ -0,0 +1,213 @@
+/*
+ * intel-mid.c: Intel MID platform setup code
+ *
+ * (C) Copyright 2008, 2012 Intel Corporation
+ * Author: Jacob Pan (jacob.jun.pan@intel.com)
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#define pr_fmt(fmt) "intel_mid: " fmt
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/scatterlist.h>
+#include <linux/sfi.h>
+#include <linux/irq.h>
+#include <linux/module.h>
+#include <linux/notifier.h>
+#include <asm/setup.h>
+#include <asm/mpspec_def.h>
+#include <asm/hw_irq.h>
+#include <asm/apic.h>
+#include <asm/io_apic.h>
+#include <asm/intel-mid.h>
+#include <asm/intel_mid_vrtc.h>
+#include <asm/io.h>
+#include <asm/i8259.h>
+#include <asm/intel_scu_ipc.h>
+#include <asm/apb_timer.h>
+#include <asm/reboot.h>
+/*
+ * the clockevent devices on Moorestown/Medfield can be APBT or LAPIC clock,
+ * cmdline option x86_intel_mid_timer can be used to override the configuration
+ * to prefer one or the other.
+ * at runtime, there are basically three timer configurations:
+ * 1. per cpu apbt clock only
+ * 2. per cpu always-on lapic clocks only, this is Penwell/Medfield only
+ * 3. per cpu lapic clock (C3STOP) and one apbt clock, with broadcast.
+ *
+ * by default (without cmdline option), platform code first detects cpu type
+ * to see if we are on lincroft or penwell, then set up both lapic or apbt
+ * clocks accordingly.
+ * i.e. by default, medfield uses configuration #2, moorestown uses #1.
+ * config #3 is supported but not recommended on medfield.
+ *
+ * rating and feature summary:
+ * lapic (with C3STOP) --------- 100
+ * apbt (always-on) ------------ 110
+ * lapic (always-on,ARAT) ------ 150
+ */
+enum intel_mid_timer_options intel_mid_timer_options;
+enum intel_mid_cpu_type __intel_mid_cpu_chip;
+EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
+static void intel_mid_power_off(void)
+{
+}
+static void intel_mid_reboot(void)
+{
+        intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
+}
+static unsigned long __init intel_mid_calibrate_tsc(void)
+{
+        unsigned long fast_calibrate;
+        u32 lo, hi, ratio, fsb;
+        rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
+        pr_debug("IA32 perf status is 0x%x, 0x%0x\n", lo, hi);
+        ratio = (hi >> 8) & 0x1f;
+        pr_debug("ratio is %d\n", ratio);
+        if (!ratio) {
+                pr_err("read a zero ratio, should be incorrect!\n");
+                pr_err("force tsc ratio to 16 ...\n");
+                ratio = 16;
+        }
+        rdmsr(MSR_FSB_FREQ, lo, hi);
+        if ((lo & 0x7) == 0x7)
+                fsb = PENWELL_FSB_FREQ_83SKU;
+        else
+                fsb = PENWELL_FSB_FREQ_100SKU;
+        fast_calibrate = ratio * fsb;
+        pr_debug("read penwell tsc %lu khz\n", fast_calibrate);
+        lapic_timer_frequency = fsb * 1000 / HZ;
+        /* mark tsc clocksource as reliable */
+        set_cpu_cap(&boot_cpu_data, X86_FEATURE_TSC_RELIABLE);
+        if (fast_calibrate)
+                return fast_calibrate;
+        return 0;
+}
+static void __init intel_mid_time_init(void)
+{
+        sfi_table_parse(SFI_SIG_MTMR, NULL, NULL, sfi_parse_mtmr);
+        switch (intel_mid_timer_options) {
+        case INTEL_MID_TIMER_APBT_ONLY:
+                break;
+        case INTEL_MID_TIMER_LAPIC_APBT:
+                x86_init.timers.setup_percpu_clockev = setup_boot_APIC_clock;
+                x86_cpuinit.setup_percpu_clockev = setup_secondary_APIC_clock;
+                break;
+        default:
+                if (!boot_cpu_has(X86_FEATURE_ARAT))
+                        break;
+                x86_init.timers.setup_percpu_clockev = setup_boot_APIC_clock;
+                x86_cpuinit.setup_percpu_clockev = setup_secondary_APIC_clock;
+                return;
+        }
+        /* we need at least one APB timer */
+        pre_init_apic_IRQ0();
+        apbt_time_init();
+}
+static void intel_mid_arch_setup(void)
+{
+        if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x27)
+                __intel_mid_cpu_chip = INTEL_MID_CPU_CHIP_PENWELL;
+        else {
+                pr_err("Unknown Intel MID CPU (%d:%d), default to Penwell\n",
+                        boot_cpu_data.x86, boot_cpu_data.x86_model);
+                __intel_mid_cpu_chip = INTEL_MID_CPU_CHIP_PENWELL;
+        }
+}
+/* MID systems don't have i8042 controller */
+static int intel_mid_i8042_detect(void)
+{
+        return 0;
+}
+/*
+ * Moorestown does not have external NMI source nor port 0x61 to report
+ * NMI status. The possible NMI sources are from pmu as a result of NMI
+ * watchdog or lock debug. Reading io port 0x61 results in 0xff which
+ * misled NMI handler.
+ */
+static unsigned char intel_mid_get_nmi_reason(void)
+{
+        return 0;
+}
+/*
+ * Moorestown specific x86_init function overrides and early setup
+ * calls.
+ */
+void __init x86_intel_mid_early_setup(void)
+{
+        x86_init.resources.probe_roms = x86_init_noop;
+        x86_init.resources.reserve_resources = x86_init_noop;
+        x86_init.timers.timer_init = intel_mid_time_init;
+        x86_init.timers.setup_percpu_clockev = x86_init_noop;
+        x86_init.irqs.pre_vector_init = x86_init_noop;
+        x86_init.oem.arch_setup = intel_mid_arch_setup;
+        x86_cpuinit.setup_percpu_clockev = apbt_setup_secondary_clock;
+        x86_platform.calibrate_tsc = intel_mid_calibrate_tsc;
+        x86_platform.i8042_detect = intel_mid_i8042_detect;
+        x86_init.timers.wallclock_init = intel_mid_rtc_init;
+        x86_platform.get_nmi_reason = intel_mid_get_nmi_reason;
+        x86_init.pci.init = intel_mid_pci_init;
+        x86_init.pci.fixup_irqs = x86_init_noop;
+        legacy_pic = &null_legacy_pic;
+        pm_power_off = intel_mid_power_off;
+        machine_ops.emergency_restart  = intel_mid_reboot;
+        /* Avoid searching for BIOS MP tables */
+        x86_init.mpparse.find_smp_config = x86_init_noop;
+        x86_init.mpparse.get_smp_config = x86_init_uint_noop;
+        set_bit(MP_BUS_ISA, mp_bus_not_pci);
+}
+/*
+ * if user does not want to use per CPU apb timer, just give it a lower rating
+ * than local apic timer and skip the late per cpu timer init.
+ */
+static inline int __init setup_x86_intel_mid_timer(char *arg)
+{
+        if (!arg)
+                return -EINVAL;
+        if (strcmp("apbt_only", arg) == 0)
+                intel_mid_timer_options = INTEL_MID_TIMER_APBT_ONLY;
+        else if (strcmp("lapic_and_apbt", arg) == 0)
+                intel_mid_timer_options = INTEL_MID_TIMER_LAPIC_APBT;
+        else {
+                pr_warn("X86 INTEL_MID timer option %s not recognised"
+                           " use x86_intel_mid_timer=apbt_only or lapic_and_apbt\n",
+                           arg);
+                return -EINVAL;
+        }
+        return 0;
+}
+__setup("x86_intel_mid_timer=", setup_x86_intel_mid_timer);
diff --git a/arch/x86/platform/mrst/vrtc.c b/arch/x86/platform/intel-mid/intel_mid_vrtc.c
index 5e355b134ba4..4762cff7facd 100644
--- a/arch/x86/platform/mrst/vrtc.c
+++ b/arch/x86/platform/intel-mid/intel_mid_vrtc.c
@@ -1,5 +1,5 @@
 /*
- * vrtc.c: Driver for virtual RTC device on Intel MID platform
+ * intel_mid_vrtc.c: Driver for virtual RTC device on Intel MID platform
 *
 * (C) Copyright 2009 Intel Corporation
 *
@@ -23,8 +23,8 @@
 #include <linux/sfi.h>
 #include <linux/platform_device.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
-#include <asm/mrst-vrtc.h>
+#include <asm/intel_mid_vrtc.h>
 #include <asm/time.h>
 #include <asm/fixmap.h>
@@ -79,7 +79,7 @@ void vrtc_get_time(struct timespec *now)
        /* vRTC YEAR reg contains the offset to 1972 */
        year += 1972;
-        printk(KERN_INFO "vRTC: sec: %d min: %d hour: %d day: %d "
+        pr_info("vRTC: sec: %d min: %d hour: %d day: %d "
                "mon: %d year: %d\n", sec, min, hour, mday, mon, year);
        now->tv_sec = mktime(year, mon, mday, hour, min, sec);
@@ -109,15 +109,14 @@ int vrtc_set_mmss(const struct timespec *now)
                vrtc_cmos_write(tm.tm_sec, RTC_SECONDS);
                spin_unlock_irqrestore(&rtc_lock, flags);
        } else {
-                printk(KERN_ERR
+                pr_err("%s: Invalid vRTC value: write of %lx to vRTC failed\n",
-                       "%s: Invalid vRTC value: write of %lx to vRTC failed\n",
                        __FUNCTION__, now->tv_sec);
                retval = -EINVAL;
        }
        return retval;
 }
-void __init mrst_rtc_init(void)
+void __init intel_mid_rtc_init(void)
 {
        unsigned long vrtc_paddr;
@@ -155,10 +154,10 @@ static struct platform_device vrtc_device = {
 };
 /* Register the RTC device if appropriate */
-static int __init mrst_device_create(void)
+static int __init intel_mid_device_create(void)
 {
        /* No Moorestown, no device */
-        if (!mrst_identify_cpu())
+        if (!intel_mid_identify_cpu())
                return -ENODEV;
        /* No timer, no device */
        if (!sfi_mrtc_num)
@@ -175,4 +174,4 @@ static int __init mrst_device_create(void)
        return platform_device_register(&vrtc_device);
 }
-module_init(mrst_device_create);
+module_init(intel_mid_device_create);
diff --git a/arch/x86/platform/intel-mid/sfi.c b/arch/x86/platform/intel-mid/sfi.c
new file mode 100644
index 000000000000..c84c1ca396bf
--- /dev/null
+++ b/arch/x86/platform/intel-mid/sfi.c
@@ -0,0 +1,488 @@
+/*
+ * intel_mid_sfi.c: Intel MID SFI initialization code
+ *
+ * (C) Copyright 2013 Intel Corporation
+ * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/scatterlist.h>
+#include <linux/sfi.h>
+#include <linux/intel_pmic_gpio.h>
+#include <linux/spi/spi.h>
+#include <linux/i2c.h>
+#include <linux/skbuff.h>
+#include <linux/gpio.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
+#include <linux/platform_device.h>
+#include <linux/irq.h>
+#include <linux/module.h>
+#include <linux/notifier.h>
+#include <linux/mmc/core.h>
+#include <linux/mmc/card.h>
+#include <linux/blkdev.h>
+#include <asm/setup.h>
+#include <asm/mpspec_def.h>
+#include <asm/hw_irq.h>
+#include <asm/apic.h>
+#include <asm/io_apic.h>
+#include <asm/intel-mid.h>
+#include <asm/intel_mid_vrtc.h>
+#include <asm/io.h>
+#include <asm/i8259.h>
+#include <asm/intel_scu_ipc.h>
+#include <asm/apb_timer.h>
+#include <asm/reboot.h>
+#define SFI_SIG_OEM0    "OEM0"
+#define MAX_IPCDEVS     24
+#define MAX_SCU_SPI     24
+#define MAX_SCU_I2C     24
+static struct platform_device *ipc_devs[MAX_IPCDEVS];
+static struct spi_board_info *spi_devs[MAX_SCU_SPI];
+static struct i2c_board_info *i2c_devs[MAX_SCU_I2C];
+static struct sfi_gpio_table_entry *gpio_table;
+static struct sfi_timer_table_entry sfi_mtimer_array[SFI_MTMR_MAX_NUM];
+static int ipc_next_dev;
+static int spi_next_dev;
+static int i2c_next_dev;
+static int i2c_bus[MAX_SCU_I2C];
+static int gpio_num_entry;
+static u32 sfi_mtimer_usage[SFI_MTMR_MAX_NUM];
+int sfi_mrtc_num;
+int sfi_mtimer_num;
+struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
+EXPORT_SYMBOL_GPL(sfi_mrtc_array);
+struct blocking_notifier_head intel_scu_notifier =
+                        BLOCKING_NOTIFIER_INIT(intel_scu_notifier);
+EXPORT_SYMBOL_GPL(intel_scu_notifier);
+#define intel_mid_sfi_get_pdata(dev, priv)      \
+        ((dev)->get_platform_data ? (dev)->get_platform_data(priv) : NULL)
+/* parse all the mtimer info to a static mtimer array */
+int __init sfi_parse_mtmr(struct sfi_table_header *table)
+{
+        struct sfi_table_simple *sb;
+        struct sfi_timer_table_entry *pentry;
+        struct mpc_intsrc mp_irq;
+        int totallen;
+        sb = (struct sfi_table_simple *)table;
+        if (!sfi_mtimer_num) {
+                sfi_mtimer_num = SFI_GET_NUM_ENTRIES(sb,
+                                        struct sfi_timer_table_entry);
+                pentry = (struct sfi_timer_table_entry *) sb->pentry;
+                totallen = sfi_mtimer_num * sizeof(*pentry);
+                memcpy(sfi_mtimer_array, pentry, totallen);
+        }
+        pr_debug("SFI MTIMER info (num = %d):\n", sfi_mtimer_num);
+        pentry = sfi_mtimer_array;
+        for (totallen = 0; totallen < sfi_mtimer_num; totallen++, pentry++) {
+                pr_debug("timer[%d]: paddr = 0x%08x, freq = %dHz, irq = %d\n",
+                        totallen, (u32)pentry->phys_addr,
+                        pentry->freq_hz, pentry->irq);
+                        if (!pentry->irq)
+                                continue;
+                        mp_irq.type = MP_INTSRC;
+                        mp_irq.irqtype = mp_INT;
+/* triggering mode edge bit 2-3, active high polarity bit 0-1 */
+                        mp_irq.irqflag = 5;
+                        mp_irq.srcbus = MP_BUS_ISA;
+                        mp_irq.srcbusirq = pentry->irq; /* IRQ */
+                        mp_irq.dstapic = MP_APIC_ALL;
+                        mp_irq.dstirq = pentry->irq;
+                        mp_save_irq(&mp_irq);
+        }
+        return 0;
+}
+struct sfi_timer_table_entry *sfi_get_mtmr(int hint)
+{
+        int i;
+        if (hint < sfi_mtimer_num) {
+                if (!sfi_mtimer_usage[hint]) {
+                        pr_debug("hint taken for timer %d irq %d\n",
+                                hint, sfi_mtimer_array[hint].irq);
+                        sfi_mtimer_usage[hint] = 1;
+                        return &sfi_mtimer_array[hint];
+                }
+        }
+        /* take the first timer available */
+        for (i = 0; i < sfi_mtimer_num;) {
+                if (!sfi_mtimer_usage[i]) {
+                        sfi_mtimer_usage[i] = 1;
+                        return &sfi_mtimer_array[i];
+                }
+                i++;
+        }
+        return NULL;
+}
+void sfi_free_mtmr(struct sfi_timer_table_entry *mtmr)
+{
+        int i;
+        for (i = 0; i < sfi_mtimer_num;) {
+                if (mtmr->irq == sfi_mtimer_array[i].irq) {
+                        sfi_mtimer_usage[i] = 0;
+                        return;
+                }
+                i++;
+        }
+}
+/* parse all the mrtc info to a global mrtc array */
+int __init sfi_parse_mrtc(struct sfi_table_header *table)
+{
+        struct sfi_table_simple *sb;
+        struct sfi_rtc_table_entry *pentry;
+        struct mpc_intsrc mp_irq;
+        int totallen;
+        sb = (struct sfi_table_simple *)table;
+        if (!sfi_mrtc_num) {
+                sfi_mrtc_num = SFI_GET_NUM_ENTRIES(sb,
+                                                struct sfi_rtc_table_entry);
+                pentry = (struct sfi_rtc_table_entry *)sb->pentry;
+                totallen = sfi_mrtc_num * sizeof(*pentry);
+                memcpy(sfi_mrtc_array, pentry, totallen);
+        }
+        pr_debug("SFI RTC info (num = %d):\n", sfi_mrtc_num);
+        pentry = sfi_mrtc_array;
+        for (totallen = 0; totallen < sfi_mrtc_num; totallen++, pentry++) {
+                pr_debug("RTC[%d]: paddr = 0x%08x, irq = %d\n",
+                        totallen, (u32)pentry->phys_addr, pentry->irq);
+                mp_irq.type = MP_INTSRC;
+                mp_irq.irqtype = mp_INT;
+                mp_irq.irqflag = 0xf;   /* level trigger and active low */
+                mp_irq.srcbus = MP_BUS_ISA;
+                mp_irq.srcbusirq = pentry->irq; /* IRQ */
+                mp_irq.dstapic = MP_APIC_ALL;
+                mp_irq.dstirq = pentry->irq;
+                mp_save_irq(&mp_irq);
+        }
+        return 0;
+}
+/*
+ * Parsing GPIO table first, since the DEVS table will need this table
+ * to map the pin name to the actual pin.
+ */
+static int __init sfi_parse_gpio(struct sfi_table_header *table)
+{
+        struct sfi_table_simple *sb;
+        struct sfi_gpio_table_entry *pentry;
+        int num, i;
+        if (gpio_table)
+                return 0;
+        sb = (struct sfi_table_simple *)table;
+        num = SFI_GET_NUM_ENTRIES(sb, struct sfi_gpio_table_entry);
+        pentry = (struct sfi_gpio_table_entry *)sb->pentry;
+        gpio_table = kmalloc(num * sizeof(*pentry), GFP_KERNEL);
+        if (!gpio_table)
+                return -1;
+        memcpy(gpio_table, pentry, num * sizeof(*pentry));
+        gpio_num_entry = num;
+        pr_debug("GPIO pin info:\n");
+        for (i = 0; i < num; i++, pentry++)
+                pr_debug("info[%2d]: controller = %16.16s, pin_name = %16.16s,"
+                " pin = %d\n", i,
+                        pentry->controller_name,
+                        pentry->pin_name,
+                        pentry->pin_no);
+        return 0;
+}
+int get_gpio_by_name(const char *name)
+{
+        struct sfi_gpio_table_entry *pentry = gpio_table;
+        int i;
+        if (!pentry)
+                return -1;
+        for (i = 0; i < gpio_num_entry; i++, pentry++) {
+                if (!strncmp(name, pentry->pin_name, SFI_NAME_LEN))
+                        return pentry->pin_no;
+        }
+        return -1;
+}
+void __init intel_scu_device_register(struct platform_device *pdev)
+{
+        if (ipc_next_dev == MAX_IPCDEVS)
+                pr_err("too many SCU IPC devices");
+        else
+                ipc_devs[ipc_next_dev++] = pdev;
+}
+static void __init intel_scu_spi_device_register(struct spi_board_info *sdev)
+{
+        struct spi_board_info *new_dev;
+        if (spi_next_dev == MAX_SCU_SPI) {
+                pr_err("too many SCU SPI devices");
+                return;
+        }
+        new_dev = kzalloc(sizeof(*sdev), GFP_KERNEL);
+        if (!new_dev) {
+                pr_err("failed to alloc mem for delayed spi dev %s\n",
+                        sdev->modalias);
+                return;
+        }
+        memcpy(new_dev, sdev, sizeof(*sdev));
+        spi_devs[spi_next_dev++] = new_dev;
+}
+static void __init intel_scu_i2c_device_register(int bus,
+                                                struct i2c_board_info *idev)
+{
+        struct i2c_board_info *new_dev;
+        if (i2c_next_dev == MAX_SCU_I2C) {
+                pr_err("too many SCU I2C devices");
+                return;
+        }
+        new_dev = kzalloc(sizeof(*idev), GFP_KERNEL);
+        if (!new_dev) {
+                pr_err("failed to alloc mem for delayed i2c dev %s\n",
+                        idev->type);
+                return;
+        }
+        memcpy(new_dev, idev, sizeof(*idev));
+        i2c_bus[i2c_next_dev] = bus;
+        i2c_devs[i2c_next_dev++] = new_dev;
+}
+/* Called by IPC driver */
+void intel_scu_devices_create(void)
+{
+        int i;
+        for (i = 0; i < ipc_next_dev; i++)
+                platform_device_add(ipc_devs[i]);
+        for (i = 0; i < spi_next_dev; i++)
+                spi_register_board_info(spi_devs[i], 1);
+        for (i = 0; i < i2c_next_dev; i++) {
+                struct i2c_adapter *adapter;
+                struct i2c_client *client;
+                adapter = i2c_get_adapter(i2c_bus[i]);
+                if (adapter) {
+                        client = i2c_new_device(adapter, i2c_devs[i]);
+                        if (!client)
+                                pr_err("can't create i2c device %s\n",
+                                        i2c_devs[i]->type);
+                } else
+                        i2c_register_board_info(i2c_bus[i], i2c_devs[i], 1);
+        }
+        intel_scu_notifier_post(SCU_AVAILABLE, NULL);
+}
+EXPORT_SYMBOL_GPL(intel_scu_devices_create);
+/* Called by IPC driver */
+void intel_scu_devices_destroy(void)
+{
+        int i;
+        intel_scu_notifier_post(SCU_DOWN, NULL);
+        for (i = 0; i < ipc_next_dev; i++)
+                platform_device_del(ipc_devs[i]);
+}
+EXPORT_SYMBOL_GPL(intel_scu_devices_destroy);
+static void __init install_irq_resource(struct platform_device *pdev, int irq)
+{
+        /* Single threaded */
+        static struct resource res __initdata = {
+                .name = "IRQ",
+                .flags = IORESOURCE_IRQ,
+        };
+        res.start = irq;
+        platform_device_add_resources(pdev, &res, 1);
+}
+static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,
+                                        struct devs_id *dev)
+{
+        struct platform_device *pdev;
+        void *pdata = NULL;
+        pr_debug("IPC bus, name = %16.16s, irq = 0x%2x\n",
+                pentry->name, pentry->irq);
+        pdata = intel_mid_sfi_get_pdata(dev, pentry);
+        pdev = platform_device_alloc(pentry->name, 0);
+        if (pdev == NULL) {
+                pr_err("out of memory for SFI platform device '%s'.\n",
+                        pentry->name);
+                return;
+        }
+        install_irq_resource(pdev, pentry->irq);
+        pdev->dev.platform_data = pdata;
+        platform_device_add(pdev);
+}
+static void __init sfi_handle_spi_dev(struct sfi_device_table_entry *pentry,
+                                        struct devs_id *dev)
+{
+        struct spi_board_info spi_info;
+        void *pdata = NULL;
+        memset(&spi_info, 0, sizeof(spi_info));
+        strncpy(spi_info.modalias, pentry->name, SFI_NAME_LEN);
+        spi_info.irq = ((pentry->irq == (u8)0xff) ? 0 : pentry->irq);
+        spi_info.bus_num = pentry->host_num;
+        spi_info.chip_select = pentry->addr;
+        spi_info.max_speed_hz = pentry->max_freq;
+        pr_debug("SPI bus=%d, name=%16.16s, irq=0x%2x, max_freq=%d, cs=%d\n",
+                spi_info.bus_num,
+                spi_info.modalias,
+                spi_info.irq,
+                spi_info.max_speed_hz,
+                spi_info.chip_select);
+        pdata = intel_mid_sfi_get_pdata(dev, &spi_info);
+        spi_info.platform_data = pdata;
+        if (dev->delay)
+                intel_scu_spi_device_register(&spi_info);
+        else
+                spi_register_board_info(&spi_info, 1);
+}
+static void __init sfi_handle_i2c_dev(struct sfi_device_table_entry *pentry,
+                                        struct devs_id *dev)
+{
+        struct i2c_board_info i2c_info;
+        void *pdata = NULL;
+        memset(&i2c_info, 0, sizeof(i2c_info));
+        strncpy(i2c_info.type, pentry->name, SFI_NAME_LEN);
+        i2c_info.irq = ((pentry->irq == (u8)0xff) ? 0 : pentry->irq);
+        i2c_info.addr = pentry->addr;
+        pr_debug("I2C bus = %d, name = %16.16s, irq = 0x%2x, addr = 0x%x\n",
+                pentry->host_num,
+                i2c_info.type,
+                i2c_info.irq,
+                i2c_info.addr);
+        pdata = intel_mid_sfi_get_pdata(dev, &i2c_info);
+        i2c_info.platform_data = pdata;
+        if (dev->delay)
+                intel_scu_i2c_device_register(pentry->host_num, &i2c_info);
+        else
+                i2c_register_board_info(pentry->host_num, &i2c_info, 1);
+}
+extern struct devs_id *const __x86_intel_mid_dev_start[],
+                      *const __x86_intel_mid_dev_end[];
+static struct devs_id __init *get_device_id(u8 type, char *name)
+{
+        struct devs_id *const *dev_table;
+        for (dev_table = __x86_intel_mid_dev_start;
+                        dev_table < __x86_intel_mid_dev_end; dev_table++) {
+                struct devs_id *dev = *dev_table;
+                if (dev->type == type &&
+                        !strncmp(dev->name, name, SFI_NAME_LEN)) {
+                        return dev;
+                }
+        }
+        return NULL;
+}
+static int __init sfi_parse_devs(struct sfi_table_header *table)
+{
+        struct sfi_table_simple *sb;
+        struct sfi_device_table_entry *pentry;
+        struct devs_id *dev = NULL;
+        int num, i;
+        int ioapic;
+        struct io_apic_irq_attr irq_attr;
+        sb = (struct sfi_table_simple *)table;
+        num = SFI_GET_NUM_ENTRIES(sb, struct sfi_device_table_entry);
+        pentry = (struct sfi_device_table_entry *)sb->pentry;
+        for (i = 0; i < num; i++, pentry++) {
+                int irq = pentry->irq;
+                if (irq != (u8)0xff) { /* native RTE case */
+                        /* these SPI2 devices are not exposed to system as PCI
+                         * devices, but they have separate RTE entry in IOAPIC
+                         * so we have to enable them one by one here
+                         */
+                        ioapic = mp_find_ioapic(irq);
+                        irq_attr.ioapic = ioapic;
+                        irq_attr.ioapic_pin = irq;
+                        irq_attr.trigger = 1;
+                        irq_attr.polarity = 1;
+                        io_apic_set_pci_routing(NULL, irq, &irq_attr);
+                } else
+                        irq = 0; /* No irq */
+                dev = get_device_id(pentry->type, pentry->name);
+                if (!dev)
+                        continue;
+                if (dev->device_handler) {
+                        dev->device_handler(pentry, dev);
+                } else {
+                        switch (pentry->type) {
+                        case SFI_DEV_TYPE_IPC:
+                                sfi_handle_ipc_dev(pentry, dev);
+                                break;
+                        case SFI_DEV_TYPE_SPI:
+                                sfi_handle_spi_dev(pentry, dev);
+                                break;
+                        case SFI_DEV_TYPE_I2C:
+                                sfi_handle_i2c_dev(pentry, dev);
+                                break;
+                        case SFI_DEV_TYPE_UART:
+                        case SFI_DEV_TYPE_HSI:
+                        default:
+                                break;
+                        }
+                }
+        }
+        return 0;
+}
+static int __init intel_mid_platform_init(void)
+{
+        sfi_table_parse(SFI_SIG_GPIO, NULL, NULL, sfi_parse_gpio);
+        sfi_table_parse(SFI_SIG_DEVS, NULL, NULL, sfi_parse_devs);
+        return 0;
+}
+arch_initcall(intel_mid_platform_init);
diff --git a/arch/x86/platform/mrst/Makefile b/arch/x86/platform/mrst/Makefile
deleted file mode 100644
index af1da7e623f9..000000000000
--- a/arch/x86/platform/mrst/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_X86_INTEL_MID)     += mrst.o
-obj-$(CONFIG_X86_INTEL_MID)     += vrtc.o
-obj-$(CONFIG_EARLY_PRINTK_INTEL_MID)    += early_printk_mrst.o
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
deleted file mode 100644
index 3ca5957b7a34..000000000000
--- a/arch/x86/platform/mrst/mrst.c
+++ /dev/null
@@ -1,1052 +0,0 @@
-/*
- * mrst.c: Intel Moorestown platform specific setup code
- *
- * (C) Copyright 2008 Intel Corporation
- * Author: Jacob Pan (jacob.jun.pan@intel.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
- * of the License.
- */
-#define pr_fmt(fmt) "mrst: " fmt
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/interrupt.h>
-#include <linux/scatterlist.h>
-#include <linux/sfi.h>
-#include <linux/intel_pmic_gpio.h>
-#include <linux/spi/spi.h>
-#include <linux/i2c.h>
-#include <linux/platform_data/pca953x.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <linux/platform_device.h>
-#include <linux/irq.h>
-#include <linux/module.h>
-#include <linux/notifier.h>
-#include <linux/mfd/intel_msic.h>
-#include <linux/gpio.h>
-#include <linux/i2c/tc35876x.h>
-#include <asm/setup.h>
-#include <asm/mpspec_def.h>
-#include <asm/hw_irq.h>
-#include <asm/apic.h>
-#include <asm/io_apic.h>
-#include <asm/mrst.h>
-#include <asm/mrst-vrtc.h>
-#include <asm/io.h>
-#include <asm/i8259.h>
-#include <asm/intel_scu_ipc.h>
-#include <asm/apb_timer.h>
-#include <asm/reboot.h>
-/*
- * the clockevent devices on Moorestown/Medfield can be APBT or LAPIC clock,
- * cmdline option x86_mrst_timer can be used to override the configuration
- * to prefer one or the other.
- * at runtime, there are basically three timer configurations:
- * 1. per cpu apbt clock only
- * 2. per cpu always-on lapic clocks only, this is Penwell/Medfield only
- * 3. per cpu lapic clock (C3STOP) and one apbt clock, with broadcast.
- *
- * by default (without cmdline option), platform code first detects cpu type
- * to see if we are on lincroft or penwell, then set up both lapic or apbt
- * clocks accordingly.
- * i.e. by default, medfield uses configuration #2, moorestown uses #1.
- * config #3 is supported but not recommended on medfield.
- *
- * rating and feature summary:
- * lapic (with C3STOP) --------- 100
- * apbt (always-on) ------------ 110
- * lapic (always-on,ARAT) ------ 150
- */
-enum mrst_timer_options mrst_timer_options;
-static u32 sfi_mtimer_usage[SFI_MTMR_MAX_NUM];
-static struct sfi_timer_table_entry sfi_mtimer_array[SFI_MTMR_MAX_NUM];
-enum mrst_cpu_type __mrst_cpu_chip;
-EXPORT_SYMBOL_GPL(__mrst_cpu_chip);
-int sfi_mtimer_num;
-struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
-EXPORT_SYMBOL_GPL(sfi_mrtc_array);
-int sfi_mrtc_num;
-static void mrst_power_off(void)
-{
-}
-static void mrst_reboot(void)
-{
-        intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
-}
-/* parse all the mtimer info to a static mtimer array */
-static int __init sfi_parse_mtmr(struct sfi_table_header *table)
-{
-        struct sfi_table_simple *sb;
-        struct sfi_timer_table_entry *pentry;
-        struct mpc_intsrc mp_irq;
-        int totallen;
-        sb = (struct sfi_table_simple *)table;
-        if (!sfi_mtimer_num) {
-                sfi_mtimer_num = SFI_GET_NUM_ENTRIES(sb,
-                                        struct sfi_timer_table_entry);
-                pentry = (struct sfi_timer_table_entry *) sb->pentry;
-                totallen = sfi_mtimer_num * sizeof(*pentry);
-                memcpy(sfi_mtimer_array, pentry, totallen);
-        }
-        pr_debug("SFI MTIMER info (num = %d):\n", sfi_mtimer_num);
-        pentry = sfi_mtimer_array;
-        for (totallen = 0; totallen < sfi_mtimer_num; totallen++, pentry++) {
-                pr_debug("timer[%d]: paddr = 0x%08x, freq = %dHz,"
-                        " irq = %d\n", totallen, (u32)pentry->phys_addr,
-                        pentry->freq_hz, pentry->irq);
-                        if (!pentry->irq)
-                                continue;
-                        mp_irq.type = MP_INTSRC;
-                        mp_irq.irqtype = mp_INT;
-/* triggering mode edge bit 2-3, active high polarity bit 0-1 */
-                        mp_irq.irqflag = 5;
-                        mp_irq.srcbus = MP_BUS_ISA;
-                        mp_irq.srcbusirq = pentry->irq; /* IRQ */
-                        mp_irq.dstapic = MP_APIC_ALL;
-                        mp_irq.dstirq = pentry->irq;
-                        mp_save_irq(&mp_irq);
-        }
-        return 0;
-}
-struct sfi_timer_table_entry *sfi_get_mtmr(int hint)
-{
-        int i;
-        if (hint < sfi_mtimer_num) {
-                if (!sfi_mtimer_usage[hint]) {
-                        pr_debug("hint taken for timer %d irq %d\n",\
-                                hint, sfi_mtimer_array[hint].irq);
-                        sfi_mtimer_usage[hint] = 1;
-                        return &sfi_mtimer_array[hint];
-                }
-        }
-        /* take the first timer available */
-        for (i = 0; i < sfi_mtimer_num;) {
-                if (!sfi_mtimer_usage[i]) {
-                        sfi_mtimer_usage[i] = 1;
-                        return &sfi_mtimer_array[i];
-                }
-                i++;
-        }
-        return NULL;
-}
-void sfi_free_mtmr(struct sfi_timer_table_entry *mtmr)
-{
-        int i;
-        for (i = 0; i < sfi_mtimer_num;) {
-                if (mtmr->irq == sfi_mtimer_array[i].irq) {
-                        sfi_mtimer_usage[i] = 0;
-                        return;
-                }
-                i++;
-        }
-}
-/* parse all the mrtc info to a global mrtc array */
-int __init sfi_parse_mrtc(struct sfi_table_header *table)
-{
-        struct sfi_table_simple *sb;
-        struct sfi_rtc_table_entry *pentry;
-        struct mpc_intsrc mp_irq;
-        int totallen;
-        sb = (struct sfi_table_simple *)table;
-        if (!sfi_mrtc_num) {
-                sfi_mrtc_num = SFI_GET_NUM_ENTRIES(sb,
-                                                struct sfi_rtc_table_entry);
-                pentry = (struct sfi_rtc_table_entry *)sb->pentry;
-                totallen = sfi_mrtc_num * sizeof(*pentry);
-                memcpy(sfi_mrtc_array, pentry, totallen);
-        }
-        pr_debug("SFI RTC info (num = %d):\n", sfi_mrtc_num);
-        pentry = sfi_mrtc_array;
-        for (totallen = 0; totallen < sfi_mrtc_num; totallen++, pentry++) {
-                pr_debug("RTC[%d]: paddr = 0x%08x, irq = %d\n",
-                        totallen, (u32)pentry->phys_addr, pentry->irq);
-                mp_irq.type = MP_INTSRC;
-                mp_irq.irqtype = mp_INT;
-                mp_irq.irqflag = 0xf;   /* level trigger and active low */
-                mp_irq.srcbus = MP_BUS_ISA;
-                mp_irq.srcbusirq = pentry->irq; /* IRQ */
-                mp_irq.dstapic = MP_APIC_ALL;
-                mp_irq.dstirq = pentry->irq;
-                mp_save_irq(&mp_irq);
-        }
-        return 0;
-}
-static unsigned long __init mrst_calibrate_tsc(void)
-{
-        unsigned long fast_calibrate;
-        u32 lo, hi, ratio, fsb;
-        rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
-        pr_debug("IA32 perf status is 0x%x, 0x%0x\n", lo, hi);
-        ratio = (hi >> 8) & 0x1f;
-        pr_debug("ratio is %d\n", ratio);
-        if (!ratio) {
-                pr_err("read a zero ratio, should be incorrect!\n");
-                pr_err("force tsc ratio to 16 ...\n");
-                ratio = 16;
-        }
-        rdmsr(MSR_FSB_FREQ, lo, hi);
-        if ((lo & 0x7) == 0x7)
-                fsb = PENWELL_FSB_FREQ_83SKU;
-        else
-                fsb = PENWELL_FSB_FREQ_100SKU;
-        fast_calibrate = ratio * fsb;
-        pr_debug("read penwell tsc %lu khz\n", fast_calibrate);
-        lapic_timer_frequency = fsb * 1000 / HZ;
-        /* mark tsc clocksource as reliable */
-        set_cpu_cap(&boot_cpu_data, X86_FEATURE_TSC_RELIABLE);
-        
-        if (fast_calibrate)
-                return fast_calibrate;
-        return 0;
-}
-static void __init mrst_time_init(void)
-{
-        sfi_table_parse(SFI_SIG_MTMR, NULL, NULL, sfi_parse_mtmr);
-        switch (mrst_timer_options) {
-        case MRST_TIMER_APBT_ONLY:
-                break;
-        case MRST_TIMER_LAPIC_APBT:
-                x86_init.timers.setup_percpu_clockev = setup_boot_APIC_clock;
-                x86_cpuinit.setup_percpu_clockev = setup_secondary_APIC_clock;
-                break;
-        default:
-                if (!boot_cpu_has(X86_FEATURE_ARAT))
-                        break;
-                x86_init.timers.setup_percpu_clockev = setup_boot_APIC_clock;
-                x86_cpuinit.setup_percpu_clockev = setup_secondary_APIC_clock;
-                return;
-        }
-        /* we need at least one APB timer */
-        pre_init_apic_IRQ0();
-        apbt_time_init();
-}
-static void mrst_arch_setup(void)
-{
-        if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x27)
-                __mrst_cpu_chip = MRST_CPU_CHIP_PENWELL;
-        else {
-                pr_err("Unknown Intel MID CPU (%d:%d), default to Penwell\n",
-                        boot_cpu_data.x86, boot_cpu_data.x86_model);
-                __mrst_cpu_chip = MRST_CPU_CHIP_PENWELL;
-        }
-}
-/* MID systems don't have i8042 controller */
-static int mrst_i8042_detect(void)
-{
-        return 0;
-}
-/*
- * Moorestown does not have external NMI source nor port 0x61 to report
- * NMI status. The possible NMI sources are from pmu as a result of NMI
- * watchdog or lock debug. Reading io port 0x61 results in 0xff which
- * misled NMI handler.
- */
-static unsigned char mrst_get_nmi_reason(void)
-{
-        return 0;
-}
-/*
- * Moorestown specific x86_init function overrides and early setup
- * calls.
- */
-void __init x86_mrst_early_setup(void)
-{
-        x86_init.resources.probe_roms = x86_init_noop;
-        x86_init.resources.reserve_resources = x86_init_noop;
-        x86_init.timers.timer_init = mrst_time_init;
-        x86_init.timers.setup_percpu_clockev = x86_init_noop;
-        x86_init.irqs.pre_vector_init = x86_init_noop;
-        x86_init.oem.arch_setup = mrst_arch_setup;
-        x86_cpuinit.setup_percpu_clockev = apbt_setup_secondary_clock;
-        x86_platform.calibrate_tsc = mrst_calibrate_tsc;
-        x86_platform.i8042_detect = mrst_i8042_detect;
-        x86_init.timers.wallclock_init = mrst_rtc_init;
-        x86_platform.get_nmi_reason = mrst_get_nmi_reason;
-        x86_init.pci.init = pci_mrst_init;
-        x86_init.pci.fixup_irqs = x86_init_noop;
-        legacy_pic = &null_legacy_pic;
-        /* Moorestown specific power_off/restart method */
-        pm_power_off = mrst_power_off;
-        machine_ops.emergency_restart  = mrst_reboot;
-        /* Avoid searching for BIOS MP tables */
-        x86_init.mpparse.find_smp_config = x86_init_noop;
-        x86_init.mpparse.get_smp_config = x86_init_uint_noop;
-        set_bit(MP_BUS_ISA, mp_bus_not_pci);
-}
-/*
- * if user does not want to use per CPU apb timer, just give it a lower rating
- * than local apic timer and skip the late per cpu timer init.
- */
-static inline int __init setup_x86_mrst_timer(char *arg)
-{
-        if (!arg)
-                return -EINVAL;
-        if (strcmp("apbt_only", arg) == 0)
-                mrst_timer_options = MRST_TIMER_APBT_ONLY;
-        else if (strcmp("lapic_and_apbt", arg) == 0)
-                mrst_timer_options = MRST_TIMER_LAPIC_APBT;
-        else {
-                pr_warning("X86 MRST timer option %s not recognised"
-                           " use x86_mrst_timer=apbt_only or lapic_and_apbt\n",
-                           arg);
-                return -EINVAL;
-        }
-        return 0;
-}
-__setup("x86_mrst_timer=", setup_x86_mrst_timer);
-/*
- * Parsing GPIO table first, since the DEVS table will need this table
- * to map the pin name to the actual pin.
- */
-static struct sfi_gpio_table_entry *gpio_table;
-static int gpio_num_entry;
-static int __init sfi_parse_gpio(struct sfi_table_header *table)
-{
-        struct sfi_table_simple *sb;
-        struct sfi_gpio_table_entry *pentry;
-        int num, i;
-        if (gpio_table)
-                return 0;
-        sb = (struct sfi_table_simple *)table;
-        num = SFI_GET_NUM_ENTRIES(sb, struct sfi_gpio_table_entry);
-        pentry = (struct sfi_gpio_table_entry *)sb->pentry;
-        gpio_table = kmalloc(num * sizeof(*pentry), GFP_KERNEL);
-        if (!gpio_table)
-                return -1;
-        memcpy(gpio_table, pentry, num * sizeof(*pentry));
-        gpio_num_entry = num;
-        pr_debug("GPIO pin info:\n");
-        for (i = 0; i < num; i++, pentry++)
-                pr_debug("info[%2d]: controller = %16.16s, pin_name = %16.16s,"
-                " pin = %d\n", i,
-                        pentry->controller_name,
-                        pentry->pin_name,
-                        pentry->pin_no);
-        return 0;
-}
-static int get_gpio_by_name(const char *name)
-{
-        struct sfi_gpio_table_entry *pentry = gpio_table;
-        int i;
-        if (!pentry)
-                return -1;
-        for (i = 0; i < gpio_num_entry; i++, pentry++) {
-                if (!strncmp(name, pentry->pin_name, SFI_NAME_LEN))
-                        return pentry->pin_no;
-        }
-        return -1;
-}
-/*
- * Here defines the array of devices platform data that IAFW would export
- * through SFI "DEVS" table, we use name and type to match the device and
- * its platform data.
- */
-struct devs_id {
-        char name[SFI_NAME_LEN + 1];
-        u8 type;
-        u8 delay;
-        void *(*get_platform_data)(void *info);
-};
-/* the offset for the mapping of global gpio pin to irq */
-#define MRST_IRQ_OFFSET 0x100
-static void __init *pmic_gpio_platform_data(void *info)
-{
-        static struct intel_pmic_gpio_platform_data pmic_gpio_pdata;
-        int gpio_base = get_gpio_by_name("pmic_gpio_base");
-        if (gpio_base == -1)
-                gpio_base = 64;
-        pmic_gpio_pdata.gpio_base = gpio_base;
-        pmic_gpio_pdata.irq_base = gpio_base + MRST_IRQ_OFFSET;
-        pmic_gpio_pdata.gpiointr = 0xffffeff8;
-        return &pmic_gpio_pdata;
-}
-static void __init *max3111_platform_data(void *info)
-{
-        struct spi_board_info *spi_info = info;
-        int intr = get_gpio_by_name("max3111_int");
-        spi_info->mode = SPI_MODE_0;
-        if (intr == -1)
-                return NULL;
-        spi_info->irq = intr + MRST_IRQ_OFFSET;
-        return NULL;
-}
-/* we have multiple max7315 on the board ... */
-#define MAX7315_NUM 2
-static void __init *max7315_platform_data(void *info)
-{
-        static struct pca953x_platform_data max7315_pdata[MAX7315_NUM];
-        static int nr;
-        struct pca953x_platform_data *max7315 = &max7315_pdata[nr];
-        struct i2c_board_info *i2c_info = info;
-        int gpio_base, intr;
-        char base_pin_name[SFI_NAME_LEN + 1];
-        char intr_pin_name[SFI_NAME_LEN + 1];
-        if (nr == MAX7315_NUM) {
-                pr_err("too many max7315s, we only support %d\n",
-                                MAX7315_NUM);
-                return NULL;
-        }
-        /* we have several max7315 on the board, we only need load several
-         * instances of the same pca953x driver to cover them
-         */
-        strcpy(i2c_info->type, "max7315");
-        if (nr++) {
-                sprintf(base_pin_name, "max7315_%d_base", nr);
-                sprintf(intr_pin_name, "max7315_%d_int", nr);
-        } else {
-                strcpy(base_pin_name, "max7315_base");
-                strcpy(intr_pin_name, "max7315_int");
-        }
-        gpio_base = get_gpio_by_name(base_pin_name);
-        intr = get_gpio_by_name(intr_pin_name);
-        if (gpio_base == -1)
-                return NULL;
-        max7315->gpio_base = gpio_base;
-        if (intr != -1) {
-                i2c_info->irq = intr + MRST_IRQ_OFFSET;
-                max7315->irq_base = gpio_base + MRST_IRQ_OFFSET;
-        } else {
-                i2c_info->irq = -1;
-                max7315->irq_base = -1;
-        }
-        return max7315;
-}
-static void *tca6416_platform_data(void *info)
-{
-        static struct pca953x_platform_data tca6416;
-        struct i2c_board_info *i2c_info = info;
-        int gpio_base, intr;
-        char base_pin_name[SFI_NAME_LEN + 1];
-        char intr_pin_name[SFI_NAME_LEN + 1];
-        strcpy(i2c_info->type, "tca6416");
-        strcpy(base_pin_name, "tca6416_base");
-        strcpy(intr_pin_name, "tca6416_int");
-        gpio_base = get_gpio_by_name(base_pin_name);
-        intr = get_gpio_by_name(intr_pin_name);
-        if (gpio_base == -1)
-                return NULL;
-        tca6416.gpio_base = gpio_base;
-        if (intr != -1) {
-                i2c_info->irq = intr + MRST_IRQ_OFFSET;
-                tca6416.irq_base = gpio_base + MRST_IRQ_OFFSET;
-        } else {
-                i2c_info->irq = -1;
-                tca6416.irq_base = -1;
-        }
-        return &tca6416;
-}
-static void *mpu3050_platform_data(void *info)
-{
-        struct i2c_board_info *i2c_info = info;
-        int intr = get_gpio_by_name("mpu3050_int");
-        if (intr == -1)
-                return NULL;
-        i2c_info->irq = intr + MRST_IRQ_OFFSET;
-        return NULL;
-}
-static void __init *emc1403_platform_data(void *info)
-{
-        static short intr2nd_pdata;
-        struct i2c_board_info *i2c_info = info;
-        int intr = get_gpio_by_name("thermal_int");
-        int intr2nd = get_gpio_by_name("thermal_alert");
-        if (intr == -1 || intr2nd == -1)
-                return NULL;
-        i2c_info->irq = intr + MRST_IRQ_OFFSET;
-        intr2nd_pdata = intr2nd + MRST_IRQ_OFFSET;
-        return &intr2nd_pdata;
-}
-static void __init *lis331dl_platform_data(void *info)
-{
-        static short intr2nd_pdata;
-        struct i2c_board_info *i2c_info = info;
-        int intr = get_gpio_by_name("accel_int");
-        int intr2nd = get_gpio_by_name("accel_2");
-        if (intr == -1 || intr2nd == -1)
-                return NULL;
-        i2c_info->irq = intr + MRST_IRQ_OFFSET;
-        intr2nd_pdata = intr2nd + MRST_IRQ_OFFSET;
-        return &intr2nd_pdata;
-}
-static void __init *no_platform_data(void *info)
-{
-        return NULL;
-}
-static struct resource msic_resources[] = {
-        {
-                .start  = INTEL_MSIC_IRQ_PHYS_BASE,
-                .end    = INTEL_MSIC_IRQ_PHYS_BASE + 64 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-static struct intel_msic_platform_data msic_pdata;
-static struct platform_device msic_device = {
-        .name           = "intel_msic",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &msic_pdata,
-        },
-        .num_resources  = ARRAY_SIZE(msic_resources),
-        .resource       = msic_resources,
-};
-static inline bool mrst_has_msic(void)
-{
-        return mrst_identify_cpu() == MRST_CPU_CHIP_PENWELL;
-}
-static int msic_scu_status_change(struct notifier_block *nb,
-                                  unsigned long code, void *data)
-{
-        if (code == SCU_DOWN) {
-                platform_device_unregister(&msic_device);
-                return 0;
-        }
-        return platform_device_register(&msic_device);
-}
-static int __init msic_init(void)
-{
-        static struct notifier_block msic_scu_notifier = {
-                .notifier_call  = msic_scu_status_change,
-        };
-        /*
-         * We need to be sure that the SCU IPC is ready before MSIC device
-         * can be registered.
-         */
-        if (mrst_has_msic())
-                intel_scu_notifier_add(&msic_scu_notifier);
-        return 0;
-}
-arch_initcall(msic_init);
-/*
- * msic_generic_platform_data - sets generic platform data for the block
- * @info: pointer to the SFI device table entry for this block
- * @block: MSIC block
- *
- * Function sets IRQ number from the SFI table entry for given device to
- * the MSIC platform data.
- */
-static void *msic_generic_platform_data(void *info, enum intel_msic_block block)
-{
-        struct sfi_device_table_entry *entry = info;
-        BUG_ON(block < 0 || block >= INTEL_MSIC_BLOCK_LAST);
-        msic_pdata.irq[block] = entry->irq;
-        return no_platform_data(info);
-}
-static void *msic_battery_platform_data(void *info)
-{
-        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_BATTERY);
-}
-static void *msic_gpio_platform_data(void *info)
-{
-        static struct intel_msic_gpio_pdata pdata;
-        int gpio = get_gpio_by_name("msic_gpio_base");
-        if (gpio < 0)
-                return NULL;
-        pdata.gpio_base = gpio;
-        msic_pdata.gpio = &pdata;
-        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_GPIO);
-}
-static void *msic_audio_platform_data(void *info)
-{
-        struct platform_device *pdev;
-        pdev = platform_device_register_simple("sst-platform", -1, NULL, 0);
-        if (IS_ERR(pdev)) {
-                pr_err("failed to create audio platform device\n");
-                return NULL;
-        }
-        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_AUDIO);
-}
-static void *msic_power_btn_platform_data(void *info)
-{
-        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_POWER_BTN);
-}
-static void *msic_ocd_platform_data(void *info)
-{
-        static struct intel_msic_ocd_pdata pdata;
-        int gpio = get_gpio_by_name("ocd_gpio");
-        if (gpio < 0)
-                return NULL;
-        pdata.gpio = gpio;
-        msic_pdata.ocd = &pdata;
-        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_OCD);
-}
-static void *msic_thermal_platform_data(void *info)
-{
-        return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_THERMAL);
-}
-/* tc35876x DSI-LVDS bridge chip and panel platform data */
-static void *tc35876x_platform_data(void *data)
-{
-       static struct tc35876x_platform_data pdata;
-       /* gpio pins set to -1 will not be used by the driver */
-       pdata.gpio_bridge_reset = get_gpio_by_name("LCMB_RXEN");
-       pdata.gpio_panel_bl_en = get_gpio_by_name("6S6P_BL_EN");
-       pdata.gpio_panel_vadd = get_gpio_by_name("EN_VREG_LCD_V3P3");
-       return &pdata;
-}
-static const struct devs_id __initconst device_ids[] = {
-        {"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data},
-        {"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data},
-        {"pmic_gpio", SFI_DEV_TYPE_IPC, 1, &pmic_gpio_platform_data},
-        {"spi_max3111", SFI_DEV_TYPE_SPI, 0, &max3111_platform_data},
-        {"i2c_max7315", SFI_DEV_TYPE_I2C, 1, &max7315_platform_data},
-        {"i2c_max7315_2", SFI_DEV_TYPE_I2C, 1, &max7315_platform_data},
-        {"tca6416", SFI_DEV_TYPE_I2C, 1, &tca6416_platform_data},
-        {"emc1403", SFI_DEV_TYPE_I2C, 1, &emc1403_platform_data},
-        {"i2c_accel", SFI_DEV_TYPE_I2C, 0, &lis331dl_platform_data},
-        {"pmic_audio", SFI_DEV_TYPE_IPC, 1, &no_platform_data},
-        {"mpu3050", SFI_DEV_TYPE_I2C, 1, &mpu3050_platform_data},
-        {"i2c_disp_brig", SFI_DEV_TYPE_I2C, 0, &tc35876x_platform_data},
-        /* MSIC subdevices */
-        {"msic_battery", SFI_DEV_TYPE_IPC, 1, &msic_battery_platform_data},
-        {"msic_gpio", SFI_DEV_TYPE_IPC, 1, &msic_gpio_platform_data},
-        {"msic_audio", SFI_DEV_TYPE_IPC, 1, &msic_audio_platform_data},
-        {"msic_power_btn", SFI_DEV_TYPE_IPC, 1, &msic_power_btn_platform_data},
-        {"msic_ocd", SFI_DEV_TYPE_IPC, 1, &msic_ocd_platform_data},
-        {"msic_thermal", SFI_DEV_TYPE_IPC, 1, &msic_thermal_platform_data},
-        {},
-};
-#define MAX_IPCDEVS     24
-static struct platform_device *ipc_devs[MAX_IPCDEVS];
-static int ipc_next_dev;
-#define MAX_SCU_SPI     24
-static struct spi_board_info *spi_devs[MAX_SCU_SPI];
-static int spi_next_dev;
-#define MAX_SCU_I2C     24
-static struct i2c_board_info *i2c_devs[MAX_SCU_I2C];
-static int i2c_bus[MAX_SCU_I2C];
-static int i2c_next_dev;
-static void __init intel_scu_device_register(struct platform_device *pdev)
-{
-        if(ipc_next_dev == MAX_IPCDEVS)
-                pr_err("too many SCU IPC devices");
-        else
-                ipc_devs[ipc_next_dev++] = pdev;
-}
-static void __init intel_scu_spi_device_register(struct spi_board_info *sdev)
-{
-        struct spi_board_info *new_dev;
-        if (spi_next_dev == MAX_SCU_SPI) {
-                pr_err("too many SCU SPI devices");
-                return;
-        }
-        new_dev = kzalloc(sizeof(*sdev), GFP_KERNEL);
-        if (!new_dev) {
-                pr_err("failed to alloc mem for delayed spi dev %s\n",
-                        sdev->modalias);
-                return;
-        }
-        memcpy(new_dev, sdev, sizeof(*sdev));
-        spi_devs[spi_next_dev++] = new_dev;
-}
-static void __init intel_scu_i2c_device_register(int bus,
-                                                struct i2c_board_info *idev)
-{
-        struct i2c_board_info *new_dev;
-        if (i2c_next_dev == MAX_SCU_I2C) {
-                pr_err("too many SCU I2C devices");
-                return;
-        }
-        new_dev = kzalloc(sizeof(*idev), GFP_KERNEL);
-        if (!new_dev) {
-                pr_err("failed to alloc mem for delayed i2c dev %s\n",
-                        idev->type);
-                return;
-        }
-        memcpy(new_dev, idev, sizeof(*idev));
-        i2c_bus[i2c_next_dev] = bus;
-        i2c_devs[i2c_next_dev++] = new_dev;
-}
-BLOCKING_NOTIFIER_HEAD(intel_scu_notifier);
-EXPORT_SYMBOL_GPL(intel_scu_notifier);
-/* Called by IPC driver */
-void intel_scu_devices_create(void)
-{
-        int i;
-        for (i = 0; i < ipc_next_dev; i++)
-                platform_device_add(ipc_devs[i]);
-        for (i = 0; i < spi_next_dev; i++)
-                spi_register_board_info(spi_devs[i], 1);
-        for (i = 0; i < i2c_next_dev; i++) {
-                struct i2c_adapter *adapter;
-                struct i2c_client *client;
-                adapter = i2c_get_adapter(i2c_bus[i]);
-                if (adapter) {
-                        client = i2c_new_device(adapter, i2c_devs[i]);
-                        if (!client)
-                                pr_err("can't create i2c device %s\n",
-                                        i2c_devs[i]->type);
-                } else
-                        i2c_register_board_info(i2c_bus[i], i2c_devs[i], 1);
-        }
-        intel_scu_notifier_post(SCU_AVAILABLE, NULL);
-}
-EXPORT_SYMBOL_GPL(intel_scu_devices_create);
-/* Called by IPC driver */
-void intel_scu_devices_destroy(void)
-{
-        int i;
-        intel_scu_notifier_post(SCU_DOWN, NULL);
-        for (i = 0; i < ipc_next_dev; i++)
-                platform_device_del(ipc_devs[i]);
-}
-EXPORT_SYMBOL_GPL(intel_scu_devices_destroy);
-static void __init install_irq_resource(struct platform_device *pdev, int irq)
-{
-        /* Single threaded */
-        static struct resource __initdata res = {
-                .name = "IRQ",
-                .flags = IORESOURCE_IRQ,
-        };
-        res.start = irq;
-        platform_device_add_resources(pdev, &res, 1);
-}
-static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *entry)
-{
-        const struct devs_id *dev = device_ids;
-        struct platform_device *pdev;
-        void *pdata = NULL;
-        while (dev->name[0]) {
-                if (dev->type == SFI_DEV_TYPE_IPC &&
-                        !strncmp(dev->name, entry->name, SFI_NAME_LEN)) {
-                        pdata = dev->get_platform_data(entry);
-                        break;
-                }
-                dev++;
-        }
-        /*
-         * On Medfield the platform device creation is handled by the MSIC
-         * MFD driver so we don't need to do it here.
-         */
-        if (mrst_has_msic())
-                return;
-        pdev = platform_device_alloc(entry->name, 0);
-        if (pdev == NULL) {
-                pr_err("out of memory for SFI platform device '%s'.\n",
-                        entry->name);
-                return;
-        }
-        install_irq_resource(pdev, entry->irq);
-        pdev->dev.platform_data = pdata;
-        intel_scu_device_register(pdev);
-}
-static void __init sfi_handle_spi_dev(struct spi_board_info *spi_info)
-{
-        const struct devs_id *dev = device_ids;
-        void *pdata = NULL;
-        while (dev->name[0]) {
-                if (dev->type == SFI_DEV_TYPE_SPI &&
-                                !strncmp(dev->name, spi_info->modalias, SFI_NAME_LEN)) {
-                        pdata = dev->get_platform_data(spi_info);
-                        break;
-                }
-                dev++;
-        }
-        spi_info->platform_data = pdata;
-        if (dev->delay)
-                intel_scu_spi_device_register(spi_info);
-        else
-                spi_register_board_info(spi_info, 1);
-}
-static void __init sfi_handle_i2c_dev(int bus, struct i2c_board_info *i2c_info)
-{
-        const struct devs_id *dev = device_ids;
-        void *pdata = NULL;
-        while (dev->name[0]) {
-                if (dev->type == SFI_DEV_TYPE_I2C &&
-                        !strncmp(dev->name, i2c_info->type, SFI_NAME_LEN)) {
-                        pdata = dev->get_platform_data(i2c_info);
-                        break;
-                }
-                dev++;
-        }
-        i2c_info->platform_data = pdata;
-        if (dev->delay)
-                intel_scu_i2c_device_register(bus, i2c_info);
-        else
-                i2c_register_board_info(bus, i2c_info, 1);
- }
-static int __init sfi_parse_devs(struct sfi_table_header *table)
-{
-        struct sfi_table_simple *sb;
-        struct sfi_device_table_entry *pentry;
-        struct spi_board_info spi_info;
-        struct i2c_board_info i2c_info;
-        int num, i, bus;
-        int ioapic;
-        struct io_apic_irq_attr irq_attr;
-        sb = (struct sfi_table_simple *)table;
-        num = SFI_GET_NUM_ENTRIES(sb, struct sfi_device_table_entry);
-        pentry = (struct sfi_device_table_entry *)sb->pentry;
-        for (i = 0; i < num; i++, pentry++) {
-                int irq = pentry->irq;
-                if (irq != (u8)0xff) { /* native RTE case */
-                        /* these SPI2 devices are not exposed to system as PCI
-                         * devices, but they have separate RTE entry in IOAPIC
-                         * so we have to enable them one by one here
-                         */
-                        ioapic = mp_find_ioapic(irq);
-                        irq_attr.ioapic = ioapic;
-                        irq_attr.ioapic_pin = irq;
-                        irq_attr.trigger = 1;
-                        irq_attr.polarity = 1;
-                        io_apic_set_pci_routing(NULL, irq, &irq_attr);
-                } else
-                        irq = 0; /* No irq */
-                switch (pentry->type) {
-                case SFI_DEV_TYPE_IPC:
-                        pr_debug("info[%2d]: IPC bus, name = %16.16s, "
-                                "irq = 0x%2x\n", i, pentry->name, pentry->irq);
-                        sfi_handle_ipc_dev(pentry);
-                        break;
-                case SFI_DEV_TYPE_SPI:
-                        memset(&spi_info, 0, sizeof(spi_info));
-                        strncpy(spi_info.modalias, pentry->name, SFI_NAME_LEN);
-                        spi_info.irq = irq;
-                        spi_info.bus_num = pentry->host_num;
-                        spi_info.chip_select = pentry->addr;
-                        spi_info.max_speed_hz = pentry->max_freq;
-                        pr_debug("info[%2d]: SPI bus = %d, name = %16.16s, "
-                                "irq = 0x%2x, max_freq = %d, cs = %d\n", i,
-                                spi_info.bus_num,
-                                spi_info.modalias,
-                                spi_info.irq,
-                                spi_info.max_speed_hz,
-                                spi_info.chip_select);
-                        sfi_handle_spi_dev(&spi_info);
-                        break;
-                case SFI_DEV_TYPE_I2C:
-                        memset(&i2c_info, 0, sizeof(i2c_info));
-                        bus = pentry->host_num;
-                        strncpy(i2c_info.type, pentry->name, SFI_NAME_LEN);
-                        i2c_info.irq = irq;
-                        i2c_info.addr = pentry->addr;
-                        pr_debug("info[%2d]: I2C bus = %d, name = %16.16s, "
-                                "irq = 0x%2x, addr = 0x%x\n", i, bus,
-                                i2c_info.type,
-                                i2c_info.irq,
-                                i2c_info.addr);
-                        sfi_handle_i2c_dev(bus, &i2c_info);
-                        break;
-                case SFI_DEV_TYPE_UART:
-                case SFI_DEV_TYPE_HSI:
-                default:
-                        ;
-                }
-        }
-        return 0;
-}
-static int __init mrst_platform_init(void)
-{
-        sfi_table_parse(SFI_SIG_GPIO, NULL, NULL, sfi_parse_gpio);
-        sfi_table_parse(SFI_SIG_DEVS, NULL, NULL, sfi_parse_devs);
-        return 0;
-}
-arch_initcall(mrst_platform_init);
-/*
- * we will search these buttons in SFI GPIO table (by name)
- * and register them dynamically. Please add all possible
- * buttons here, we will shrink them if no GPIO found.
- */
-static struct gpio_keys_button gpio_button[] = {
-        {KEY_POWER,             -1, 1, "power_btn",     EV_KEY, 0, 3000},
-        {KEY_PROG1,             -1, 1, "prog_btn1",     EV_KEY, 0, 20},
-        {KEY_PROG2,             -1, 1, "prog_btn2",     EV_KEY, 0, 20},
-        {SW_LID,                -1, 1, "lid_switch",    EV_SW,  0, 20},
-        {KEY_VOLUMEUP,          -1, 1, "vol_up",        EV_KEY, 0, 20},
-        {KEY_VOLUMEDOWN,        -1, 1, "vol_down",      EV_KEY, 0, 20},
-        {KEY_CAMERA,            -1, 1, "camera_full",   EV_KEY, 0, 20},
-        {KEY_CAMERA_FOCUS,      -1, 1, "camera_half",   EV_KEY, 0, 20},
-        {SW_KEYPAD_SLIDE,       -1, 1, "MagSw1",        EV_SW,  0, 20},
-        {SW_KEYPAD_SLIDE,       -1, 1, "MagSw2",        EV_SW,  0, 20},
-};
-static struct gpio_keys_platform_data mrst_gpio_keys = {
-        .buttons        = gpio_button,
-        .rep            = 1,
-        .nbuttons       = -1, /* will fill it after search */
-};
-static struct platform_device pb_device = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &mrst_gpio_keys,
-        },
-};
-/*
- * Shrink the non-existent buttons, register the gpio button
- * device if there is some
- */
-static int __init pb_keys_init(void)
-{
-        struct gpio_keys_button *gb = gpio_button;
-        int i, num, good = 0;
-        num = sizeof(gpio_button) / sizeof(struct gpio_keys_button);
-        for (i = 0; i < num; i++) {
-                gb[i].gpio = get_gpio_by_name(gb[i].desc);
-                pr_debug("info[%2d]: name = %s, gpio = %d\n", i, gb[i].desc, gb[i].gpio);
-                if (gb[i].gpio == -1)
-                        continue;
-                if (i != good)
-                        gb[good] = gb[i];
-                good++;
-        }
-        if (good) {
-                mrst_gpio_keys.nbuttons = good;
-                return platform_device_register(&pb_device);
-        }
-        return 0;
-}
-late_initcall(pb_keys_init);
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c
index fef7d0ba7e3a..649a12befba9 100644
--- a/arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -40,16 +40,9 @@ static bool				lid_wake_on_close;
 */
 static int set_lid_wake_behavior(bool wake_on_close)
 {
-        struct acpi_object_list arg_list;
-        union acpi_object arg;
        acpi_status status;
-        arg_list.count          = 1;
+        status = acpi_execute_simple_method(NULL, "\\_SB.PCI0.LID.LIDW", wake_on_close);
-        arg_list.pointer        = &arg;
-        arg.type                = ACPI_TYPE_INTEGER;
-        arg.integer.value       = wake_on_close;
-        status = acpi_evaluate_object(NULL, "\\_SB.PCI0.LID.LIDW", &arg_list, NULL);
        if (ACPI_FAILURE(status)) {
                pr_warning(PFX "failed to set lid behavior\n");
                return 1;
diff --git a/arch/x86/platform/uv/Makefile b/arch/x86/platform/uv/Makefile
index 6c40995fefb8..52079bebd014 100644
--- a/arch/x86/platform/uv/Makefile
+++ b/arch/x86/platform/uv/Makefile
@@ -1 +1 @@
-obj-$(CONFIG_X86_UV)            += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o
+obj-$(CONFIG_X86_UV)            += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o uv_nmi.o
diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c
new file mode 100644
index 000000000000..8eeccba73130
--- /dev/null
+++ b/arch/x86/platform/uv/uv_nmi.c
@@ -0,0 +1,700 @@
+/*
+ * SGI NMI support routines
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ *  Copyright (c) 2009-2013 Silicon Graphics, Inc.  All Rights Reserved.
+ *  Copyright (c) Mike Travis
+ */
+#include <linux/cpu.h>
+#include <linux/delay.h>
+#include <linux/kdb.h>
+#include <linux/kexec.h>
+#include <linux/kgdb.h>
+#include <linux/module.h>
+#include <linux/nmi.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <asm/apic.h>
+#include <asm/current.h>
+#include <asm/kdebug.h>
+#include <asm/local64.h>
+#include <asm/nmi.h>
+#include <asm/traps.h>
+#include <asm/uv/uv.h>
+#include <asm/uv/uv_hub.h>
+#include <asm/uv/uv_mmrs.h>
+/*
+ * UV handler for NMI
+ *
+ * Handle system-wide NMI events generated by the global 'power nmi' command.
+ *
+ * Basic operation is to field the NMI interrupt on each cpu and wait
+ * until all cpus have arrived into the nmi handler.  If some cpus do not
+ * make it into the handler, try and force them in with the IPI(NMI) signal.
+ *
+ * We also have to lessen UV Hub MMR accesses as much as possible as this
+ * disrupts the UV Hub's primary mission of directing NumaLink traffic and
+ * can cause system problems to occur.
+ *
+ * To do this we register our primary NMI notifier on the NMI_UNKNOWN
+ * chain.  This reduces the number of false NMI calls when the perf
+ * tools are running which generate an enormous number of NMIs per
+ * second (~4M/s for 1024 cpu threads).  Our secondary NMI handler is
+ * very short as it only checks that if it has been "pinged" with the
+ * IPI(NMI) signal as mentioned above, and does not read the UV Hub's MMR.
+ *
+ */
+static struct uv_hub_nmi_s **uv_hub_nmi_list;
+DEFINE_PER_CPU(struct uv_cpu_nmi_s, __uv_cpu_nmi);
+EXPORT_PER_CPU_SYMBOL_GPL(__uv_cpu_nmi);
+static unsigned long nmi_mmr;
+static unsigned long nmi_mmr_clear;
+static unsigned long nmi_mmr_pending;
+static atomic_t uv_in_nmi;
+static atomic_t uv_nmi_cpu = ATOMIC_INIT(-1);
+static atomic_t uv_nmi_cpus_in_nmi = ATOMIC_INIT(-1);
+static atomic_t uv_nmi_slave_continue;
+static atomic_t uv_nmi_kexec_failed;
+static cpumask_var_t uv_nmi_cpu_mask;
+/* Values for uv_nmi_slave_continue */
+#define SLAVE_CLEAR     0
+#define SLAVE_CONTINUE  1
+#define SLAVE_EXIT      2
+/*
+ * Default is all stack dumps go to the console and buffer.
+ * Lower level to send to log buffer only.
+ */
+static int uv_nmi_loglevel = 7;
+module_param_named(dump_loglevel, uv_nmi_loglevel, int, 0644);
+/*
+ * The following values show statistics on how perf events are affecting
+ * this system.
+ */
+static int param_get_local64(char *buffer, const struct kernel_param *kp)
+{
+        return sprintf(buffer, "%lu\n", local64_read((local64_t *)kp->arg));
+}
+static int param_set_local64(const char *val, const struct kernel_param *kp)
+{
+        /* clear on any write */
+        local64_set((local64_t *)kp->arg, 0);
+        return 0;
+}
+static struct kernel_param_ops param_ops_local64 = {
+        .get = param_get_local64,
+        .set = param_set_local64,
+};
+#define param_check_local64(name, p) __param_check(name, p, local64_t)
+static local64_t uv_nmi_count;
+module_param_named(nmi_count, uv_nmi_count, local64, 0644);
+static local64_t uv_nmi_misses;
+module_param_named(nmi_misses, uv_nmi_misses, local64, 0644);
+static local64_t uv_nmi_ping_count;
+module_param_named(ping_count, uv_nmi_ping_count, local64, 0644);
+static local64_t uv_nmi_ping_misses;
+module_param_named(ping_misses, uv_nmi_ping_misses, local64, 0644);
+/*
+ * Following values allow tuning for large systems under heavy loading
+ */
+static int uv_nmi_initial_delay = 100;
+module_param_named(initial_delay, uv_nmi_initial_delay, int, 0644);
+static int uv_nmi_slave_delay = 100;
+module_param_named(slave_delay, uv_nmi_slave_delay, int, 0644);
+static int uv_nmi_loop_delay = 100;
+module_param_named(loop_delay, uv_nmi_loop_delay, int, 0644);
+static int uv_nmi_trigger_delay = 10000;
+module_param_named(trigger_delay, uv_nmi_trigger_delay, int, 0644);
+static int uv_nmi_wait_count = 100;
+module_param_named(wait_count, uv_nmi_wait_count, int, 0644);
+static int uv_nmi_retry_count = 500;
+module_param_named(retry_count, uv_nmi_retry_count, int, 0644);
+/*
+ * Valid NMI Actions:
+ *  "dump"      - dump process stack for each cpu
+ *  "ips"       - dump IP info for each cpu
+ *  "kdump"     - do crash dump
+ *  "kdb"       - enter KDB/KGDB (default)
+ */
+static char uv_nmi_action[8] = "kdb";
+module_param_string(action, uv_nmi_action, sizeof(uv_nmi_action), 0644);
+static inline bool uv_nmi_action_is(const char *action)
+{
+        return (strncmp(uv_nmi_action, action, strlen(action)) == 0);
+}
+/* Setup which NMI support is present in system */
+static void uv_nmi_setup_mmrs(void)
+{
+        if (uv_read_local_mmr(UVH_NMI_MMRX_SUPPORTED)) {
+                uv_write_local_mmr(UVH_NMI_MMRX_REQ,
+                                        1UL << UVH_NMI_MMRX_REQ_SHIFT);
+                nmi_mmr = UVH_NMI_MMRX;
+                nmi_mmr_clear = UVH_NMI_MMRX_CLEAR;
+                nmi_mmr_pending = 1UL << UVH_NMI_MMRX_SHIFT;
+                pr_info("UV: SMI NMI support: %s\n", UVH_NMI_MMRX_TYPE);
+        } else {
+                nmi_mmr = UVH_NMI_MMR;
+                nmi_mmr_clear = UVH_NMI_MMR_CLEAR;
+                nmi_mmr_pending = 1UL << UVH_NMI_MMR_SHIFT;
+                pr_info("UV: SMI NMI support: %s\n", UVH_NMI_MMR_TYPE);
+        }
+}
+/* Read NMI MMR and check if NMI flag was set by BMC. */
+static inline int uv_nmi_test_mmr(struct uv_hub_nmi_s *hub_nmi)
+{
+        hub_nmi->nmi_value = uv_read_local_mmr(nmi_mmr);
+        atomic_inc(&hub_nmi->read_mmr_count);
+        return !!(hub_nmi->nmi_value & nmi_mmr_pending);
+}
+static inline void uv_local_mmr_clear_nmi(void)
+{
+        uv_write_local_mmr(nmi_mmr_clear, nmi_mmr_pending);
+}
+/*
+ * If first cpu in on this hub, set hub_nmi "in_nmi" and "owner" values and
+ * return true.  If first cpu in on the system, set global "in_nmi" flag.
+ */
+static int uv_set_in_nmi(int cpu, struct uv_hub_nmi_s *hub_nmi)
+{
+        int first = atomic_add_unless(&hub_nmi->in_nmi, 1, 1);
+        if (first) {
+                atomic_set(&hub_nmi->cpu_owner, cpu);
+                if (atomic_add_unless(&uv_in_nmi, 1, 1))
+                        atomic_set(&uv_nmi_cpu, cpu);
+                atomic_inc(&hub_nmi->nmi_count);
+        }
+        return first;
+}
+/* Check if this is a system NMI event */
+static int uv_check_nmi(struct uv_hub_nmi_s *hub_nmi)
+{
+        int cpu = smp_processor_id();
+        int nmi = 0;
+        local64_inc(&uv_nmi_count);
+        uv_cpu_nmi.queries++;
+        do {
+                nmi = atomic_read(&hub_nmi->in_nmi);
+                if (nmi)
+                        break;
+                if (raw_spin_trylock(&hub_nmi->nmi_lock)) {
+                        /* check hub MMR NMI flag */
+                        if (uv_nmi_test_mmr(hub_nmi)) {
+                                uv_set_in_nmi(cpu, hub_nmi);
+                                nmi = 1;
+                                break;
+                        }
+                        /* MMR NMI flag is clear */
+                        raw_spin_unlock(&hub_nmi->nmi_lock);
+                } else {
+                        /* wait a moment for the hub nmi locker to set flag */
+                        cpu_relax();
+                        udelay(uv_nmi_slave_delay);
+                        /* re-check hub in_nmi flag */
+                        nmi = atomic_read(&hub_nmi->in_nmi);
+                        if (nmi)
+                                break;
+                }
+                /* check if this BMC missed setting the MMR NMI flag */
+                if (!nmi) {
+                        nmi = atomic_read(&uv_in_nmi);
+                        if (nmi)
+                                uv_set_in_nmi(cpu, hub_nmi);
+                }
+        } while (0);
+        if (!nmi)
+                local64_inc(&uv_nmi_misses);
+        return nmi;
+}
+/* Need to reset the NMI MMR register, but only once per hub. */
+static inline void uv_clear_nmi(int cpu)
+{
+        struct uv_hub_nmi_s *hub_nmi = uv_hub_nmi;
+        if (cpu == atomic_read(&hub_nmi->cpu_owner)) {
+                atomic_set(&hub_nmi->cpu_owner, -1);
+                atomic_set(&hub_nmi->in_nmi, 0);
+                uv_local_mmr_clear_nmi();
+                raw_spin_unlock(&hub_nmi->nmi_lock);
+        }
+}
+/* Print non-responding cpus */
+static void uv_nmi_nr_cpus_pr(char *fmt)
+{
+        static char cpu_list[1024];
+        int len = sizeof(cpu_list);
+        int c = cpumask_weight(uv_nmi_cpu_mask);
+        int n = cpulist_scnprintf(cpu_list, len, uv_nmi_cpu_mask);
+        if (n >= len-1)
+                strcpy(&cpu_list[len - 6], "...\n");
+        printk(fmt, c, cpu_list);
+}
+/* Ping non-responding cpus attemping to force them into the NMI handler */
+static void uv_nmi_nr_cpus_ping(void)
+{
+        int cpu;
+        for_each_cpu(cpu, uv_nmi_cpu_mask)
+                atomic_set(&uv_cpu_nmi_per(cpu).pinging, 1);
+        apic->send_IPI_mask(uv_nmi_cpu_mask, APIC_DM_NMI);
+}
+/* Clean up flags for cpus that ignored both NMI and ping */
+static void uv_nmi_cleanup_mask(void)
+{
+        int cpu;
+        for_each_cpu(cpu, uv_nmi_cpu_mask) {
+                atomic_set(&uv_cpu_nmi_per(cpu).pinging, 0);
+                atomic_set(&uv_cpu_nmi_per(cpu).state, UV_NMI_STATE_OUT);
+                cpumask_clear_cpu(cpu, uv_nmi_cpu_mask);
+        }
+}
+/* Loop waiting as cpus enter nmi handler */
+static int uv_nmi_wait_cpus(int first)
+{
+        int i, j, k, n = num_online_cpus();
+        int last_k = 0, waiting = 0;
+        if (first) {
+                cpumask_copy(uv_nmi_cpu_mask, cpu_online_mask);
+                k = 0;
+        } else {
+                k = n - cpumask_weight(uv_nmi_cpu_mask);
+        }
+        udelay(uv_nmi_initial_delay);
+        for (i = 0; i < uv_nmi_retry_count; i++) {
+                int loop_delay = uv_nmi_loop_delay;
+                for_each_cpu(j, uv_nmi_cpu_mask) {
+                        if (atomic_read(&uv_cpu_nmi_per(j).state)) {
+                                cpumask_clear_cpu(j, uv_nmi_cpu_mask);
+                                if (++k >= n)
+                                        break;
+                        }
+                }
+                if (k >= n) {           /* all in? */
+                        k = n;
+                        break;
+                }
+                if (last_k != k) {      /* abort if no new cpus coming in */
+                        last_k = k;
+                        waiting = 0;
+                } else if (++waiting > uv_nmi_wait_count)
+                        break;
+                /* extend delay if waiting only for cpu 0 */
+                if (waiting && (n - k) == 1 &&
+                    cpumask_test_cpu(0, uv_nmi_cpu_mask))
+                        loop_delay *= 100;
+                udelay(loop_delay);
+        }
+        atomic_set(&uv_nmi_cpus_in_nmi, k);
+        return n - k;
+}
+/* Wait until all slave cpus have entered UV NMI handler */
+static void uv_nmi_wait(int master)
+{
+        /* indicate this cpu is in */
+        atomic_set(&uv_cpu_nmi.state, UV_NMI_STATE_IN);
+        /* if not the first cpu in (the master), then we are a slave cpu */
+        if (!master)
+                return;
+        do {
+                /* wait for all other cpus to gather here */
+                if (!uv_nmi_wait_cpus(1))
+                        break;
+                /* if not all made it in, send IPI NMI to them */
+                uv_nmi_nr_cpus_pr(KERN_ALERT
+                        "UV: Sending NMI IPI to %d non-responding CPUs: %s\n");
+                uv_nmi_nr_cpus_ping();
+                /* if all cpus are in, then done */
+                if (!uv_nmi_wait_cpus(0))
+                        break;
+                uv_nmi_nr_cpus_pr(KERN_ALERT
+                        "UV: %d CPUs not in NMI loop: %s\n");
+        } while (0);
+        pr_alert("UV: %d of %d CPUs in NMI\n",
+                atomic_read(&uv_nmi_cpus_in_nmi), num_online_cpus());
+}
+static void uv_nmi_dump_cpu_ip_hdr(void)
+{
+        printk(KERN_DEFAULT
+                "\nUV: %4s %6s %-32s %s   (Note: PID 0 not listed)\n",
+                "CPU", "PID", "COMMAND", "IP");
+}
+static void uv_nmi_dump_cpu_ip(int cpu, struct pt_regs *regs)
+{
+        printk(KERN_DEFAULT "UV: %4d %6d %-32.32s ",
+                cpu, current->pid, current->comm);
+        printk_address(regs->ip);
+}
+/* Dump this cpu's state */
+static void uv_nmi_dump_state_cpu(int cpu, struct pt_regs *regs)
+{
+        const char *dots = " ................................. ";
+        if (uv_nmi_action_is("ips")) {
+                if (cpu == 0)
+                        uv_nmi_dump_cpu_ip_hdr();
+                if (current->pid != 0)
+                        uv_nmi_dump_cpu_ip(cpu, regs);
+        } else if (uv_nmi_action_is("dump")) {
+                printk(KERN_DEFAULT
+                        "UV:%sNMI process trace for CPU %d\n", dots, cpu);
+                show_regs(regs);
+        }
+        atomic_set(&uv_cpu_nmi.state, UV_NMI_STATE_DUMP_DONE);
+}
+/* Trigger a slave cpu to dump it's state */
+static void uv_nmi_trigger_dump(int cpu)
+{
+        int retry = uv_nmi_trigger_delay;
+        if (atomic_read(&uv_cpu_nmi_per(cpu).state) != UV_NMI_STATE_IN)
+                return;
+        atomic_set(&uv_cpu_nmi_per(cpu).state, UV_NMI_STATE_DUMP);
+        do {
+                cpu_relax();
+                udelay(10);
+                if (atomic_read(&uv_cpu_nmi_per(cpu).state)
+                                != UV_NMI_STATE_DUMP)
+                        return;
+        } while (--retry > 0);
+        pr_crit("UV: CPU %d stuck in process dump function\n", cpu);
+        atomic_set(&uv_cpu_nmi_per(cpu).state, UV_NMI_STATE_DUMP_DONE);
+}
+/* Wait until all cpus ready to exit */
+static void uv_nmi_sync_exit(int master)
+{
+        atomic_dec(&uv_nmi_cpus_in_nmi);
+        if (master) {
+                while (atomic_read(&uv_nmi_cpus_in_nmi) > 0)
+                        cpu_relax();
+                atomic_set(&uv_nmi_slave_continue, SLAVE_CLEAR);
+        } else {
+                while (atomic_read(&uv_nmi_slave_continue))
+                        cpu_relax();
+        }
+}
+/* Walk through cpu list and dump state of each */
+static void uv_nmi_dump_state(int cpu, struct pt_regs *regs, int master)
+{
+        if (master) {
+                int tcpu;
+                int ignored = 0;
+                int saved_console_loglevel = console_loglevel;
+                pr_alert("UV: tracing %s for %d CPUs from CPU %d\n",
+                        uv_nmi_action_is("ips") ? "IPs" : "processes",
+                        atomic_read(&uv_nmi_cpus_in_nmi), cpu);
+                console_loglevel = uv_nmi_loglevel;
+                atomic_set(&uv_nmi_slave_continue, SLAVE_EXIT);
+                for_each_online_cpu(tcpu) {
+                        if (cpumask_test_cpu(tcpu, uv_nmi_cpu_mask))
+                                ignored++;
+                        else if (tcpu == cpu)
+                                uv_nmi_dump_state_cpu(tcpu, regs);
+                        else
+                                uv_nmi_trigger_dump(tcpu);
+                }
+                if (ignored)
+                        printk(KERN_DEFAULT "UV: %d CPUs ignored NMI\n",
+                                ignored);
+                console_loglevel = saved_console_loglevel;
+                pr_alert("UV: process trace complete\n");
+        } else {
+                while (!atomic_read(&uv_nmi_slave_continue))
+                        cpu_relax();
+                while (atomic_read(&uv_cpu_nmi.state) != UV_NMI_STATE_DUMP)
+                        cpu_relax();
+                uv_nmi_dump_state_cpu(cpu, regs);
+        }
+        uv_nmi_sync_exit(master);
+}
+static void uv_nmi_touch_watchdogs(void)
+{
+        touch_softlockup_watchdog_sync();
+        clocksource_touch_watchdog();
+        rcu_cpu_stall_reset();
+        touch_nmi_watchdog();
+}
+#if defined(CONFIG_KEXEC)
+static void uv_nmi_kdump(int cpu, int master, struct pt_regs *regs)
+{
+        /* Call crash to dump system state */
+        if (master) {
+                pr_emerg("UV: NMI executing crash_kexec on CPU%d\n", cpu);
+                crash_kexec(regs);
+                pr_emerg("UV: crash_kexec unexpectedly returned, ");
+                if (!kexec_crash_image) {
+                        pr_cont("crash kernel not loaded\n");
+                        atomic_set(&uv_nmi_kexec_failed, 1);
+                        uv_nmi_sync_exit(1);
+                        return;
+                }
+                pr_cont("kexec busy, stalling cpus while waiting\n");
+        }
+        /* If crash exec fails the slaves should return, otherwise stall */
+        while (atomic_read(&uv_nmi_kexec_failed) == 0)
+                mdelay(10);
+        /* Crash kernel most likely not loaded, return in an orderly fashion */
+        uv_nmi_sync_exit(0);
+}
+#else /* !CONFIG_KEXEC */
+static inline void uv_nmi_kdump(int cpu, int master, struct pt_regs *regs)
+{
+        if (master)
+                pr_err("UV: NMI kdump: KEXEC not supported in this kernel\n");
+}
+#endif /* !CONFIG_KEXEC */
+#ifdef CONFIG_KGDB_KDB
+/* Call KDB from NMI handler */
+static void uv_call_kdb(int cpu, struct pt_regs *regs, int master)
+{
+        int ret;
+        if (master) {
+                /* call KGDB NMI handler as MASTER */
+                ret = kgdb_nmicallin(cpu, X86_TRAP_NMI, regs,
+                                        &uv_nmi_slave_continue);
+                if (ret) {
+                        pr_alert("KDB returned error, is kgdboc set?\n");
+                        atomic_set(&uv_nmi_slave_continue, SLAVE_EXIT);
+                }
+        } else {
+                /* wait for KGDB signal that it's ready for slaves to enter */
+                int sig;
+                do {
+                        cpu_relax();
+                        sig = atomic_read(&uv_nmi_slave_continue);
+                } while (!sig);
+                /* call KGDB as slave */
+                if (sig == SLAVE_CONTINUE)
+                        kgdb_nmicallback(cpu, regs);
+        }
+        uv_nmi_sync_exit(master);
+}
+#else /* !CONFIG_KGDB_KDB */
+static inline void uv_call_kdb(int cpu, struct pt_regs *regs, int master)
+{
+        pr_err("UV: NMI error: KGDB/KDB is not enabled in this kernel\n");
+}
+#endif /* !CONFIG_KGDB_KDB */
+/*
+ * UV NMI handler
+ */
+int uv_handle_nmi(unsigned int reason, struct pt_regs *regs)
+{
+        struct uv_hub_nmi_s *hub_nmi = uv_hub_nmi;
+        int cpu = smp_processor_id();
+        int master = 0;
+        unsigned long flags;
+        local_irq_save(flags);
+        /* If not a UV System NMI, ignore */
+        if (!atomic_read(&uv_cpu_nmi.pinging) && !uv_check_nmi(hub_nmi)) {
+                local_irq_restore(flags);
+                return NMI_DONE;
+        }
+        /* Indicate we are the first CPU into the NMI handler */
+        master = (atomic_read(&uv_nmi_cpu) == cpu);
+        /* If NMI action is "kdump", then attempt to do it */
+        if (uv_nmi_action_is("kdump"))
+                uv_nmi_kdump(cpu, master, regs);
+        /* Pause as all cpus enter the NMI handler */
+        uv_nmi_wait(master);
+        /* Dump state of each cpu */
+        if (uv_nmi_action_is("ips") || uv_nmi_action_is("dump"))
+                uv_nmi_dump_state(cpu, regs, master);
+        /* Call KDB if enabled */
+        else if (uv_nmi_action_is("kdb"))
+                uv_call_kdb(cpu, regs, master);
+        /* Clear per_cpu "in nmi" flag */
+        atomic_set(&uv_cpu_nmi.state, UV_NMI_STATE_OUT);
+        /* Clear MMR NMI flag on each hub */
+        uv_clear_nmi(cpu);
+        /* Clear global flags */
+        if (master) {
+                if (cpumask_weight(uv_nmi_cpu_mask))
+                        uv_nmi_cleanup_mask();
+                atomic_set(&uv_nmi_cpus_in_nmi, -1);
+                atomic_set(&uv_nmi_cpu, -1);
+                atomic_set(&uv_in_nmi, 0);
+        }
+        uv_nmi_touch_watchdogs();
+        local_irq_restore(flags);
+        return NMI_HANDLED;
+}
+/*
+ * NMI handler for pulling in CPUs when perf events are grabbing our NMI
+ */
+int uv_handle_nmi_ping(unsigned int reason, struct pt_regs *regs)
+{
+        int ret;
+        uv_cpu_nmi.queries++;
+        if (!atomic_read(&uv_cpu_nmi.pinging)) {
+                local64_inc(&uv_nmi_ping_misses);
+                return NMI_DONE;
+        }
+        uv_cpu_nmi.pings++;
+        local64_inc(&uv_nmi_ping_count);
+        ret = uv_handle_nmi(reason, regs);
+        atomic_set(&uv_cpu_nmi.pinging, 0);
+        return ret;
+}
+void uv_register_nmi_notifier(void)
+{
+        if (register_nmi_handler(NMI_UNKNOWN, uv_handle_nmi, 0, "uv"))
+                pr_warn("UV: NMI handler failed to register\n");
+        if (register_nmi_handler(NMI_LOCAL, uv_handle_nmi_ping, 0, "uvping"))
+                pr_warn("UV: PING NMI handler failed to register\n");
+}
+void uv_nmi_init(void)
+{
+        unsigned int value;
+        /*
+         * Unmask NMI on all cpus
+         */
+        value = apic_read(APIC_LVT1) | APIC_DM_NMI;
+        value &= ~APIC_LVT_MASKED;
+        apic_write(APIC_LVT1, value);
+}
+void uv_nmi_setup(void)
+{
+        int size = sizeof(void *) * (1 << NODES_SHIFT);
+        int cpu, nid;
+        /* Setup hub nmi info */
+        uv_nmi_setup_mmrs();
+        uv_hub_nmi_list = kzalloc(size, GFP_KERNEL);
+        pr_info("UV: NMI hub list @ 0x%p (%d)\n", uv_hub_nmi_list, size);
+        BUG_ON(!uv_hub_nmi_list);
+        size = sizeof(struct uv_hub_nmi_s);
+        for_each_present_cpu(cpu) {
+                nid = cpu_to_node(cpu);
+                if (uv_hub_nmi_list[nid] == NULL) {
+                        uv_hub_nmi_list[nid] = kzalloc_node(size,
+                                                            GFP_KERNEL, nid);
+                        BUG_ON(!uv_hub_nmi_list[nid]);
+                        raw_spin_lock_init(&(uv_hub_nmi_list[nid]->nmi_lock));
+                        atomic_set(&uv_hub_nmi_list[nid]->cpu_owner, -1);
+                }
+                uv_hub_nmi_per(cpu) = uv_hub_nmi_list[nid];
+        }
+        BUG_ON(!alloc_cpumask_var(&uv_nmi_cpu_mask, GFP_KERNEL));
+}
diff --git a/arch/x86/um/elfcore.c b/arch/x86/um/elfcore.c
index 6bb49b687c97..7bb89a27a5e4 100644
--- a/arch/x86/um/elfcore.c
+++ b/arch/x86/um/elfcore.c
@@ -11,8 +11,7 @@ Elf32_Half elf_core_extra_phdrs(void)
        return vsyscall_ehdr ? (((struct elfhdr *)vsyscall_ehdr)->e_phnum) : 0;
 }
-int elf_core_write_extra_phdrs(struct file *file, loff_t offset, size_t *size,
+int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)
-                               unsigned long limit)
 {
        if ( vsyscall_ehdr ) {
                const struct elfhdr *const ehdrp =
@@ -32,17 +31,14 @@ int elf_core_write_extra_phdrs(struct file *file, loff_t offset, size_t *size,
                                phdr.p_offset += ofs;
                        }
                        phdr.p_paddr = 0; /* match other core phdrs */
-                        *size += sizeof(phdr);
+                        if (!dump_emit(cprm, &phdr, sizeof(phdr)))
-                        if (*size > limit
-                            || !dump_write(file, &phdr, sizeof(phdr)))
                                return 0;
                }
        }
        return 1;
 }
-int elf_core_write_extra_data(struct file *file, size_t *size,
+int elf_core_write_extra_data(struct coredump_params *cprm)
-                              unsigned long limit)
 {
        if ( vsyscall_ehdr ) {
                const struct elfhdr *const ehdrp =
@@ -55,10 +51,7 @@ int elf_core_write_extra_data(struct file *file, size_t *size,
                        if (phdrp[i].p_type == PT_LOAD) {
                                void *addr = (void *) phdrp[i].p_vaddr;
                                size_t filesz = phdrp[i].p_filesz;
+                                if (!dump_emit(cprm, addr, filesz))
-                                *size += filesz;
-                                if (*size > limit
-                                    || !dump_write(file, addr, filesz))
                                        return 0;
                        }
                }
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
index 72074d528400..2ada505067cc 100644
--- a/arch/x86/vdso/vclock_gettime.c
+++ b/arch/x86/vdso/vclock_gettime.c
@@ -178,7 +178,7 @@ notrace static int __always_inline do_realtime(struct timespec *ts)
        ts->tv_nsec = 0;
        do {
-                seq = read_seqcount_begin(&gtod->seq);
+                seq = read_seqcount_begin_no_lockdep(&gtod->seq);
                mode = gtod->clock.vclock_mode;
                ts->tv_sec = gtod->wall_time_sec;
                ns = gtod->wall_time_snsec;
@@ -198,7 +198,7 @@ notrace static int do_monotonic(struct timespec *ts)
        ts->tv_nsec = 0;
        do {
-                seq = read_seqcount_begin(&gtod->seq);
+                seq = read_seqcount_begin_no_lockdep(&gtod->seq);
                mode = gtod->clock.vclock_mode;
                ts->tv_sec = gtod->monotonic_time_sec;
                ns = gtod->monotonic_time_snsec;
@@ -214,7 +214,7 @@ notrace static int do_realtime_coarse(struct timespec *ts)
 {
        unsigned long seq;
        do {
-                seq = read_seqcount_begin(&gtod->seq);
+                seq = read_seqcount_begin_no_lockdep(&gtod->seq);
                ts->tv_sec = gtod->wall_time_coarse.tv_sec;
                ts->tv_nsec = gtod->wall_time_coarse.tv_nsec;
        } while (unlikely(read_seqcount_retry(&gtod->seq, seq)));
@@ -225,7 +225,7 @@ notrace static int do_monotonic_coarse(struct timespec *ts)
 {
        unsigned long seq;
        do {
-                seq = read_seqcount_begin(&gtod->seq);
+                seq = read_seqcount_begin_no_lockdep(&gtod->seq);
                ts->tv_sec = gtod->monotonic_time_coarse.tv_sec;
                ts->tv_nsec = gtod->monotonic_time_coarse.tv_nsec;
        } while (unlikely(read_seqcount_retry(&gtod->seq, seq)));
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index b3f36369e667..ce563be09cc1 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -796,8 +796,8 @@ static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm)
 {
        spinlock_t *ptl = NULL;
-#if USE_SPLIT_PTLOCKS
+#if USE_SPLIT_PTE_PTLOCKS
-        ptl = __pte_lockptr(page);
+        ptl = ptlock_ptr(page);
        spin_lock_nest_lock(ptl, &mm->page_table_lock);
 #endif
@@ -1637,7 +1637,7 @@ static inline void xen_alloc_ptpage(struct mm_struct *mm, unsigned long pfn,
                        __set_pfn_prot(pfn, PAGE_KERNEL_RO);
-                        if (level == PT_PTE && USE_SPLIT_PTLOCKS)
+                        if (level == PT_PTE && USE_SPLIT_PTE_PTLOCKS)
                                __pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pfn);
                        xen_mc_issue(PARAVIRT_LAZY_MMU);
@@ -1671,7 +1671,7 @@ static inline void xen_release_ptpage(unsigned long pfn, unsigned level)
                if (!PageHighMem(page)) {
                        xen_mc_batch();
-                        if (level == PT_PTE && USE_SPLIT_PTLOCKS)
+                        if (level == PT_PTE && USE_SPLIT_PTE_PTLOCKS)
                                __pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn);
                        __set_pfn_prot(pfn, PAGE_KERNEL);
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 48b57182dbb6..c36b325abd83 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -278,6 +278,15 @@ static void __init xen_smp_prepare_boot_cpu(void)
                   old memory can be recycled */
                make_lowmem_page_readwrite(xen_initial_gdt);
+#ifdef CONFIG_X86_32
+                /*
+                 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
+                 * expects __USER_DS
+                 */
+                loadsegment(ds, __USER_DS);
+                loadsegment(es, __USER_DS);
+#endif
                xen_filter_cpu_maps();
                xen_setup_vcpu_info_placement();
        }