270 files changed, 2433 insertions, 2685 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 176062ac7f07..5df26a9976a2 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -65,6 +65,8 @@ $(obj)/%.dtb: $(src)/dts/%.dts
 $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
+clean-files := *.dtb
 quiet_cmd_uimage = UIMAGE  $@
      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
                   -C none -a $(LOADADDR) -e $(STARTADDR) \
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 9b29a623aaf1..3f9abd6b6964 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -22,11 +22,10 @@
        sdhci@c8000400 {
                cd-gpios = <&gpio 69 0>; /* gpio PI5 */
                wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-                power-gpios = <&gpio 155 0>; /* gpio PT3 */
+                power-gpios = <&gpio 70 0>; /* gpio PI6 */
        };
        sdhci@c8000600 {
-                power-gpios = <&gpio 70 0>; /* gpio PI6 */
                support-8bit;
        };
 };
diff --git a/arch/arm/include/asm/hardware/cache-l2x0.h b/arch/arm/include/asm/hardware/cache-l2x0.h
index 1db1143a9483..7df239bcdf27 100644
--- a/arch/arm/include/asm/hardware/cache-l2x0.h
+++ b/arch/arm/include/asm/hardware/cache-l2x0.h
@@ -20,6 +20,8 @@
 #ifndef __ASM_ARM_HARDWARE_L2X0_H
 #define __ASM_ARM_HARDWARE_L2X0_H
+#include <linux/errno.h>
 #define L2X0_CACHE_ID                   0x000
 #define L2X0_CACHE_TYPE                 0x004
 #define L2X0_CTRL                       0x100
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 7d19425dd496..2b0efc3104ac 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -13,6 +13,7 @@
 struct tag;
 struct meminfo;
 struct sys_timer;
+struct pt_regs;
 struct machine_desc {
        unsigned int            nr;             /* architecture number  */
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index c60a2944f95b..4a1123783806 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -402,6 +402,8 @@
 #define __NR_syncfs                     (__NR_SYSCALL_BASE+373)
 #define __NR_sendmmsg                   (__NR_SYSCALL_BASE+374)
 #define __NR_setns                      (__NR_SYSCALL_BASE+375)
+#define __NR_process_vm_readv           (__NR_SYSCALL_BASE+376)
+#define __NR_process_vm_writev          (__NR_SYSCALL_BASE+377)
 /*
 * The following SWIs are ARM private.
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 9943e9e74a1b..463ff4a0ec8a 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -385,6 +385,8 @@
                CALL(sys_syncfs)
                CALL(sys_sendmmsg)
 /* 375 */       CALL(sys_setns)
+                CALL(sys_process_vm_readv)
+                CALL(sys_process_vm_writev)
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 566c54c2a1fe..08c82fd844a8 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -360,7 +360,7 @@ __secondary_data:
 *  r13 = *virtual* address to jump to upon completion
 */
 __enable_mmu:
-#ifdef CONFIG_ALIGNMENT_TRAP
+#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6
        orr     r0, r0, #CR_A
 #else
        bic     r0, r0, #CR_A
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index c1b4463dcc83..e59bbd496c39 100644
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@ -32,24 +32,6 @@ static atomic_t waiting_for_crash_ipi;
 int machine_kexec_prepare(struct kimage *image)
 {
-        unsigned long page_list;
-        void *reboot_code_buffer;
-        page_list = image->head & PAGE_MASK;
-        reboot_code_buffer = page_address(image->control_code_page);
-        /* Prepare parameters for reboot_code_buffer*/
-        kexec_start_address = image->start;
-        kexec_indirection_page = page_list;
-        kexec_mach_type = machine_arch_type;
-        kexec_boot_atags = image->start - KEXEC_ARM_ZIMAGE_OFFSET + KEXEC_ARM_ATAGS_OFFSET;
-        /* copy our kernel relocation code to the control code page */
-        memcpy(reboot_code_buffer,
-               relocate_new_kernel, relocate_new_kernel_size);
-        flush_icache_range((unsigned long) reboot_code_buffer,
-                           (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE);
        return 0;
 }
@@ -100,14 +82,31 @@ void (*kexec_reinit)(void);
 void machine_kexec(struct kimage *image)
 {
+        unsigned long page_list;
        unsigned long reboot_code_buffer_phys;
        void *reboot_code_buffer;
+        page_list = image->head & PAGE_MASK;
        /* we need both effective and real address here */
        reboot_code_buffer_phys =
            page_to_pfn(image->control_code_page) << PAGE_SHIFT;
        reboot_code_buffer = page_address(image->control_code_page);
+        /* Prepare parameters for reboot_code_buffer*/
+        kexec_start_address = image->start;
+        kexec_indirection_page = page_list;
+        kexec_mach_type = machine_arch_type;
+        kexec_boot_atags = image->start - KEXEC_ARM_ZIMAGE_OFFSET + KEXEC_ARM_ATAGS_OFFSET;
+        /* copy our kernel relocation code to the control code page */
+        memcpy(reboot_code_buffer,
+               relocate_new_kernel, relocate_new_kernel_size);
+        flush_icache_range((unsigned long) reboot_code_buffer,
+                           (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE);
        printk(KERN_INFO "Bye!\n");
        if (kexec_reinit)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 7e7977ab994f..3448a3f9cc8c 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -461,8 +461,10 @@ static void __init setup_processor(void)
               cpu_name, read_cpuid_id(), read_cpuid_id() & 15,
               proc_arch[cpu_architecture()], cr_alignment);
-        sprintf(init_utsname()->machine, "%s%c", list->arch_name, ENDIANNESS);
+        snprintf(init_utsname()->machine, __NEW_UTS_LEN + 1, "%s%c",
-        sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);
+                 list->arch_name, ENDIANNESS);
+        snprintf(elf_platform, ELF_PLATFORM_SIZE, "%s%c",
+                 list->elf_name, ENDIANNESS);
        elf_hwcap = list->elf_hwcap;
 #ifndef CONFIG_ARM_THUMB
        elf_hwcap &= ~HWCAP_THUMB;
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
index a4401d6b5b07..adad70db70eb 100644
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -98,7 +98,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
 *  USB HS Device (Gadget)
 * -------------------------------------------------------------------- */
-#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE)
+#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE)
 static struct resource usba_udc_resources[] = {
        [0] = {
@@ -1021,8 +1021,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
        [0] = {
-                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
+                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -1035,7 +1035,6 @@ static struct resource dbgu_resources[] = {
 static struct atmel_uart_data dbgu_data = {
        .use_dma_tx     = 0,
        .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
-        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
 };
 static u64 dbgu_dmamask = DMA_BIT_MASK(32);
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
index 01d8bbd1468b..66591fa53e05 100644
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -877,8 +877,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
        [0] = {
-                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
+                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -891,7 +891,6 @@ static struct resource dbgu_resources[] = {
 static struct atmel_uart_data dbgu_data = {
        .use_dma_tx     = 0,
        .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
-        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
 };
 static u64 dbgu_dmamask = DMA_BIT_MASK(32);
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 24b6f8c0440d..25e3464fb07f 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -837,8 +837,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
        [0] = {
-                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
+                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -851,7 +851,6 @@ static struct resource dbgu_resources[] = {
 static struct atmel_uart_data dbgu_data = {
        .use_dma_tx     = 0,
        .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
-        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
 };
 static u64 dbgu_dmamask = DMA_BIT_MASK(32);
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 3b70b3897d95..ae78f4d03b73 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -816,8 +816,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
        [0] = {
-                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
+                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -830,7 +830,6 @@ static struct resource dbgu_resources[] = {
 static struct atmel_uart_data dbgu_data = {
        .use_dma_tx     = 0,
        .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
-        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
 };
 static u64 dbgu_dmamask = DMA_BIT_MASK(32);
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index 3faa1fde9ad9..ad017eb1f8df 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -1196,8 +1196,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 static struct resource dbgu_resources[] = {
        [0] = {
-                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
+                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -1210,7 +1210,6 @@ static struct resource dbgu_resources[] = {
 static struct atmel_uart_data dbgu_data = {
        .use_dma_tx     = 0,
        .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
-        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
 };
 static u64 dbgu_dmamask = DMA_BIT_MASK(32);
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 000b5e1da965..09a16d6bd5cd 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -197,7 +197,7 @@ void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data) {}
 *  USB HS Device (Gadget)
 * -------------------------------------------------------------------- */
-#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE)
+#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE)
 static struct resource usba_udc_resources[] = {
        [0] = {
                .start  = AT91SAM9G45_UDPHS_FIFO,
@@ -1332,8 +1332,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
        [0] = {
-                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
+                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -1346,7 +1346,6 @@ static struct resource dbgu_resources[] = {
 static struct atmel_uart_data dbgu_data = {
        .use_dma_tx     = 0,
        .use_dma_rx     = 0,
-        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
 };
 static u64 dbgu_dmamask = DMA_BIT_MASK(32);
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index 305a851b5bff..628eb566d60c 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -75,7 +75,7 @@ void __init at91_add_device_hdmac(void) {}
 *  USB HS Device (Gadget)
 * -------------------------------------------------------------------- */
-#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE)
+#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE)
 static struct resource usba_udc_resources[] = {
        [0] = {
@@ -908,8 +908,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
        [0] = {
-                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
+                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -922,7 +922,6 @@ static struct resource dbgu_resources[] = {
 static struct atmel_uart_data dbgu_data = {
        .use_dma_tx     = 0,
        .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
-        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
 };
 static u64 dbgu_dmamask = DMA_BIT_MASK(32);
diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c
index 649b052231f5..12a3f955162b 100644
--- a/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
@@ -384,7 +384,7 @@ static struct spi_board_info yl9200_spi_devices[] = {
 #include <video/s1d13xxxfb.h>
-static void __init yl9200_init_video(void)
+static void yl9200_init_video(void)
 {
        /* NWAIT Signal */
        at91_set_A_periph(AT91_PIN_PC6, 0);
diff --git a/arch/arm/mach-at91/include/mach/vmalloc.h b/arch/arm/mach-at91/include/mach/vmalloc.h
index 8eb459f3f5b7..8e4a1bd0ab1d 100644
--- a/arch/arm/mach-at91/include/mach/vmalloc.h
+++ b/arch/arm/mach-at91/include/mach/vmalloc.h
@@ -21,6 +21,8 @@
 #ifndef __ASM_ARCH_VMALLOC_H
 #define __ASM_ARCH_VMALLOC_H
+#include <mach/hardware.h>
 #define VMALLOC_END             (AT91_VIRT_BASE & PGDIR_MASK)
 #endif
diff --git a/arch/arm/mach-bcmring/core.c b/arch/arm/mach-bcmring/core.c
index 43eadbcc29ed..430da120a297 100644
--- a/arch/arm/mach-bcmring/core.c
+++ b/arch/arm/mach-bcmring/core.c
@@ -235,7 +235,7 @@ void __init bcmring_init_timer(void)
         */
        bcmring_clocksource_init();
-        sp804_clockevents_register(TIMER0_VA_BASE, IRQ_TIMER0, "timer0");
+        sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMER0, "timer0");
 }
 struct sys_timer bcmring_timer = {
diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c
index b52b8de91bde..f4d4d6d174d0 100644
--- a/arch/arm/mach-bcmring/dma.c
+++ b/arch/arm/mach-bcmring/dma.c
@@ -36,6 +36,7 @@
 #include <linux/mm.h>
 #include <linux/pfn.h>
 #include <linux/atomic.h>
+#include <linux/sched.h>
 #include <mach/dma.h>
 /* I don't quite understand why dc4 fails when this is set to 1 and DMA is enabled */
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot
index 22d85889f622..cfede5768aa0 100644
--- a/arch/arm/mach-imx/Makefile.boot
+++ b/arch/arm/mach-imx/Makefile.boot
@@ -1,22 +1,26 @@
-zreladdr-$(CONFIG_ARCH_MX1)     += 0x08008000
+zreladdr-$(CONFIG_SOC_IMX1)     += 0x08008000
-params_phys-$(CONFIG_ARCH_MX1)  := 0x08000100
+params_phys-$(CONFIG_SOC_IMX1)  := 0x08000100
-initrd_phys-$(CONFIG_ARCH_MX1)  := 0x08800000
+initrd_phys-$(CONFIG_SOC_IMX1)  := 0x08800000
-zreladdr-$(CONFIG_MACH_MX21)    += 0xC0008000
+zreladdr-$(CONFIG_SOC_IMX21)    += 0xC0008000
-params_phys-$(CONFIG_MACH_MX21) := 0xC0000100
+params_phys-$(CONFIG_SOC_IMX21) := 0xC0000100
-initrd_phys-$(CONFIG_MACH_MX21) := 0xC0800000
+initrd_phys-$(CONFIG_SOC_IMX21) := 0xC0800000
-zreladdr-$(CONFIG_ARCH_MX25)    += 0x80008000
+zreladdr-$(CONFIG_SOC_IMX25)    += 0x80008000
-params_phys-$(CONFIG_ARCH_MX25) := 0x80000100
+params_phys-$(CONFIG_SOC_IMX25) := 0x80000100
-initrd_phys-$(CONFIG_ARCH_MX25) := 0x80800000
+initrd_phys-$(CONFIG_SOC_IMX25) := 0x80800000
-zreladdr-$(CONFIG_MACH_MX27)    += 0xA0008000
+zreladdr-$(CONFIG_SOC_IMX27)    += 0xA0008000
-params_phys-$(CONFIG_MACH_MX27) := 0xA0000100
+params_phys-$(CONFIG_SOC_IMX27) := 0xA0000100
-initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000
+initrd_phys-$(CONFIG_SOC_IMX27) := 0xA0800000
-zreladdr-$(CONFIG_ARCH_MX3)     += 0x80008000
+zreladdr-$(CONFIG_SOC_IMX31)    += 0x80008000
-params_phys-$(CONFIG_ARCH_MX3)  := 0x80000100
+params_phys-$(CONFIG_SOC_IMX31) := 0x80000100
-initrd_phys-$(CONFIG_ARCH_MX3)  := 0x80800000
+initrd_phys-$(CONFIG_SOC_IMX31) := 0x80800000
+zreladdr-$(CONFIG_SOC_IMX35)    += 0x80008000
+params_phys-$(CONFIG_SOC_IMX35) := 0x80000100
+initrd_phys-$(CONFIG_SOC_IMX35) := 0x80800000
 zreladdr-$(CONFIG_SOC_IMX6Q)    += 0x10008000
 params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100
diff --git a/arch/arm/mach-imx/clock-imx6q.c b/arch/arm/mach-imx/clock-imx6q.c
index e0b926dfeced..613a1b993bff 100644
--- a/arch/arm/mach-imx/clock-imx6q.c
+++ b/arch/arm/mach-imx/clock-imx6q.c
@@ -1139,7 +1139,7 @@ static int _clk_set_rate(struct clk *clk, unsigned long rate)
                return -EINVAL;
        max_div = ((d->bm_pred >> d->bp_pred) + 1) *
-                  ((d->bm_pred >> d->bp_pred) + 1);
+                  ((d->bm_podf >> d->bp_podf) + 1);
        div = parent_rate / rate;
        if (div == 0)
@@ -2002,6 +2002,21 @@ int __init mx6q_clocks_init(void)
        clk_set_rate(&asrc_serial_clk, 1500000);
        clk_set_rate(&enfc_clk, 11000000);
+        /*
+         * Before pinctrl API is available, we have to rely on the pad
+         * configuration set up by bootloader.  For usdhc example here,
+         * u-boot sets up the pads for 49.5 MHz case, and we have to lower
+         * the usdhc clock from 198 to 49.5 MHz to match the pad configuration.
+         *
+         * FIXME: This is should be removed after pinctrl API is available.
+         * At that time, usdhc driver can call pinctrl API to change pad
+         * configuration dynamically per different usdhc clock settings.
+         */
+        clk_set_rate(&usdhc1_clk, 49500000);
+        clk_set_rate(&usdhc2_clk, 49500000);
+        clk_set_rate(&usdhc3_clk, 49500000);
+        clk_set_rate(&usdhc4_clk, 49500000);
        np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt");
        base = of_iomap(np, 0);
        WARN_ON(!base);
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 4285dfd80b6f..4ad3969b9881 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -15,6 +15,8 @@ obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
 obj-$(CONFIG_MSM_SMD) += last_radio_log.o
 obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o
+CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
 obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
 obj-$(CONFIG_SMP) += headsmp.o platsmp.o
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index 71de5062c71e..db81ed531031 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -42,8 +42,8 @@
 extern struct sys_timer msm_timer;
-static void __init msm7x30_fixup(struct machine_desc *desc, struct tag *tag,
+static void __init msm7x30_fixup(struct tag *tag, char **cmdline,
-                         char **cmdline, struct meminfo *mi)
+                struct meminfo *mi)
 {
        for (; tag->hdr.size; tag = tag_next(tag))
                if (tag->hdr.tag == ATAG_MEM && tag->u.mem.start == 0x200000) {
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index b04468e7d00e..6dc1cbd2a595 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -32,8 +32,8 @@
 #include "devices.h"
-static void __init msm8960_fixup(struct machine_desc *desc, struct tag *tag,
+static void __init msm8960_fixup(struct tag *tag, char **cmdline,
-                         char **cmdline, struct meminfo *mi)
+                struct meminfo *mi)
 {
        for (; tag->hdr.size; tag = tag_next(tag))
                if (tag->hdr.tag == ATAG_MEM &&
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index cf38e2284fa9..44bf71688373 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -28,8 +28,8 @@
 #include <mach/board.h>
 #include <mach/msm_iomap.h>
-static void __init msm8x60_fixup(struct machine_desc *desc, struct tag *tag,
+static void __init msm8x60_fixup(struct tag *tag, char **cmdline,
-                         char **cmdline, struct meminfo *mi)
+                struct meminfo *mi)
 {
        for (; tag->hdr.size; tag = tag_next(tag))
                if (tag->hdr.tag == ATAG_MEM &&
diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c
index 232f97a04504..bafabb502580 100644
--- a/arch/arm/mach-msm/scm.c
+++ b/arch/arm/mach-msm/scm.c
@@ -180,6 +180,9 @@ static u32 smc(u32 cmd_addr)
                        __asmeq("%1", "r0")
                        __asmeq("%2", "r1")
                        __asmeq("%3", "r2")
+#ifdef REQUIRES_SEC
+                        ".arch_extension sec\n"
+#endif
                        "smc    #0      @ switch to secure world\n"
                        : "=r" (r0)
                        : "r" (r0), "r" (r1), "r" (r2)
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c
index 2aacf41c48e7..4cb276977190 100644
--- a/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
@@ -1281,9 +1281,9 @@ DEFINE_CLOCK(gpt_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG9_OFFSET,
        NULL,  NULL, &ipg_clk, &gpt_ipg_clk);
 DEFINE_CLOCK(pwm1_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG6_OFFSET,
-        NULL, NULL, &ipg_clk, NULL);
+        NULL, NULL, &ipg_perclk, NULL);
 DEFINE_CLOCK(pwm2_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG8_OFFSET,
-        NULL, NULL, &ipg_clk, NULL);
+        NULL, NULL, &ipg_perclk, NULL);
 /* I2C */
 DEFINE_CLOCK(i2c1_clk, 0, MXC_CCM_CCGR1, MXC_CCM_CCGRx_CG9_OFFSET,
@@ -1634,6 +1634,7 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc,
        return 0;
 }
+#ifdef CONFIG_OF
 static void __init clk_get_freq_dt(unsigned long *ckil, unsigned long *osc,
                                   unsigned long *ckih1, unsigned long *ckih2)
 {
@@ -1671,3 +1672,4 @@ int __init mx53_clocks_init_dt(void)
        clk_get_freq_dt(&ckil, &osc, &ckih1, &ckih2);
        return mx53_clocks_init(ckil, osc, ckih1, ckih2);
 }
+#endif
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c
index ac2316d53d3c..064ec5abaa55 100644
--- a/arch/arm/mach-mxs/mach-mx28evk.c
+++ b/arch/arm/mach-mxs/mach-mx28evk.c
@@ -471,7 +471,8 @@ static void __init mx28evk_init(void)
                               "mmc0-slot-power");
        if (ret)
                pr_warn("failed to request gpio mmc0-slot-power: %d\n", ret);
-        mx28_add_mxs_mmc(0, &mx28evk_mmc_pdata[0]);
+        else
+                mx28_add_mxs_mmc(0, &mx28evk_mmc_pdata[0]);
        ret = gpio_request_one(MX28EVK_MMC1_SLOT_POWER, GPIOF_OUT_INIT_LOW,
                               "mmc1-slot-power");
@@ -480,7 +481,6 @@ static void __init mx28evk_init(void)
        else
                mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]);
-        mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]);
        mx28_add_rtc_stmp3xxx();
        gpio_led_register_device(0, &mx28evk_led_data);
diff --git a/arch/arm/mach-picoxcell/include/mach/debug-macro.S b/arch/arm/mach-picoxcell/include/mach/debug-macro.S
index 8f2c234ed9d9..58d4ee3ae949 100644
--- a/arch/arm/mach-picoxcell/include/mach/debug-macro.S
+++ b/arch/arm/mach-picoxcell/include/mach/debug-macro.S
@@ -14,7 +14,7 @@
 #define UART_SHIFT 2
-                .macro  addruart, rp, rv
+                .macro  addruart, rp, rv, tmp
                ldr     \rv, =PHYS_TO_IO(PICOXCELL_UART1_BASE)
                ldr     \rp, =PICOXCELL_UART1_BASE
                .endm
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 2aec2f732515..737bdc631b0d 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -3,7 +3,7 @@
 #
 # Common objects
-obj-y                           := timer.o console.o clock.o pm_runtime.o
+obj-y                           := timer.o console.o clock.o
 # CPU objects
 obj-$(CONFIG_ARCH_SH7367)       += setup-sh7367.o clock-sh7367.o intc-sh7367.o
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index 83624e26b884..b862e9f81e3e 100644
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -515,14 +515,14 @@ static void __init ag5evm_init(void)
        /* enable MMCIF */
        gpio_request(GPIO_FN_MMCCLK0, NULL);
        gpio_request(GPIO_FN_MMCCMD0_PU, NULL);
-        gpio_request(GPIO_FN_MMCD0_0, NULL);
+        gpio_request(GPIO_FN_MMCD0_0_PU, NULL);
-        gpio_request(GPIO_FN_MMCD0_1, NULL);
+        gpio_request(GPIO_FN_MMCD0_1_PU, NULL);
-        gpio_request(GPIO_FN_MMCD0_2, NULL);
+        gpio_request(GPIO_FN_MMCD0_2_PU, NULL);
-        gpio_request(GPIO_FN_MMCD0_3, NULL);
+        gpio_request(GPIO_FN_MMCD0_3_PU, NULL);
-        gpio_request(GPIO_FN_MMCD0_4, NULL);
+        gpio_request(GPIO_FN_MMCD0_4_PU, NULL);
-        gpio_request(GPIO_FN_MMCD0_5, NULL);
+        gpio_request(GPIO_FN_MMCD0_5_PU, NULL);
-        gpio_request(GPIO_FN_MMCD0_6, NULL);
+        gpio_request(GPIO_FN_MMCD0_6_PU, NULL);
-        gpio_request(GPIO_FN_MMCD0_7, NULL);
+        gpio_request(GPIO_FN_MMCD0_7_PU, NULL);
        gpio_request(GPIO_PORT208, NULL); /* Reset */
        gpio_direction_output(GPIO_PORT208, 1);
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index ade98c2d9e81..bb08d2d25dcf 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -201,7 +201,7 @@ static struct physmap_flash_data nor_flash_data = {
 static struct resource nor_flash_resources[] = {
        [0]     = {
                .start  = 0x20000000, /* CS0 shadow instead of regular CS0 */
-                .end    = 0x28000000 - 1, /* needed by USB MASK ROM boot */             
+                .end    = 0x28000000 - 1, /* needed by USB MASK ROM boot */
                .flags  = IORESOURCE_MEM,
        }
 };
diff --git a/arch/arm/mach-shmobile/board-kota2.c b/arch/arm/mach-shmobile/board-kota2.c
index adc73122bf20..bd9a78424d6b 100644
--- a/arch/arm/mach-shmobile/board-kota2.c
+++ b/arch/arm/mach-shmobile/board-kota2.c
@@ -48,6 +48,7 @@
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/traps.h>
+/* SMSC 9220 */
 static struct resource smsc9220_resources[] = {
        [0] = {
                .start          = 0x14000000, /* CS5A */
@@ -77,6 +78,7 @@ static struct platform_device eth_device = {
        .num_resources  = ARRAY_SIZE(smsc9220_resources),
 };
+/* KEYSC */
 static struct sh_keysc_info keysc_platdata = {
        .mode           = SH_KEYSC_MODE_6,
        .scan_timing    = 3,
@@ -120,6 +122,7 @@ static struct platform_device keysc_device = {
        },
 };
+/* GPIO KEY */
 #define GPIO_KEY(c, g, d) { .code = c, .gpio = g, .desc = d, .active_low = 1 }
 static struct gpio_keys_button gpio_buttons[] = {
@@ -150,6 +153,7 @@ static struct platform_device gpio_keys_device = {
        },
 };
+/* GPIO LED */
 #define GPIO_LED(n, g) { .name = n, .gpio = g }
 static struct gpio_led gpio_leds[] = {
@@ -175,6 +179,7 @@ static struct platform_device gpio_leds_device = {
        },
 };
+/* MMCIF */
 static struct resource mmcif_resources[] = {
        [0] = {
                .name   = "MMCIF",
@@ -207,6 +212,7 @@ static struct platform_device mmcif_device = {
        .resource       = mmcif_resources,
 };
+/* SDHI0 */
 static struct sh_mobile_sdhi_info sdhi0_info = {
        .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
        .tmio_flags     = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,
@@ -243,6 +249,7 @@ static struct platform_device sdhi0_device = {
        },
 };
+/* SDHI1 */
 static struct sh_mobile_sdhi_info sdhi1_info = {
        .tmio_caps      = MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ,
        .tmio_flags     = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
index 66975921e646..995a9c3aec8f 100644
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@ -476,7 +476,7 @@ static struct clk_ops fsidiv_clk_ops = {
        .disable        = fsidiv_disable,
 };
-static struct clk_mapping sh7372_fsidiva_clk_mapping = {
+static struct clk_mapping fsidiva_clk_mapping = {
        .phys   = FSIDIVA,
        .len    = 8,
 };
@@ -484,10 +484,10 @@ static struct clk_mapping sh7372_fsidiva_clk_mapping = {
 struct clk sh7372_fsidiva_clk = {
        .ops            = &fsidiv_clk_ops,
        .parent         = &div6_reparent_clks[DIV6_FSIA], /* late install */
-        .mapping        = &sh7372_fsidiva_clk_mapping,
+        .mapping        = &fsidiva_clk_mapping,
 };
-static struct clk_mapping sh7372_fsidivb_clk_mapping = {
+static struct clk_mapping fsidivb_clk_mapping = {
        .phys   = FSIDIVB,
        .len    = 8,
 };
@@ -495,7 +495,7 @@ static struct clk_mapping sh7372_fsidivb_clk_mapping = {
 struct clk sh7372_fsidivb_clk = {
        .ops            = &fsidiv_clk_ops,
        .parent         = &div6_reparent_clks[DIV6_FSIB],  /* late install */
-        .mapping        = &sh7372_fsidivb_clk_mapping,
+        .mapping        = &fsidivb_clk_mapping,
 };
 static struct clk *late_main_clks[] = {
diff --git a/arch/arm/mach-shmobile/cpuidle.c b/arch/arm/mach-shmobile/cpuidle.c
index 2e44f11f592e..1b2334277e85 100644
--- a/arch/arm/mach-shmobile/cpuidle.c
+++ b/arch/arm/mach-shmobile/cpuidle.c
@@ -26,65 +26,59 @@ void (*shmobile_cpuidle_modes[CPUIDLE_STATE_MAX])(void) = {
 };
 static int shmobile_cpuidle_enter(struct cpuidle_device *dev,
-                                  struct cpuidle_state *state)
+                                  struct cpuidle_driver *drv,
+                                  int index)
 {
        ktime_t before, after;
-        int requested_state = state - &dev->states[0];
-        dev->last_state = &dev->states[requested_state];
        before = ktime_get();
        local_irq_disable();
        local_fiq_disable();
-        shmobile_cpuidle_modes[requested_state]();
+        shmobile_cpuidle_modes[index]();
        local_irq_enable();
        local_fiq_enable();
        after = ktime_get();
-        return ktime_to_ns(ktime_sub(after, before)) >> 10;
+        dev->last_residency = ktime_to_ns(ktime_sub(after, before)) >> 10;
+        return index;
 }
 static struct cpuidle_device shmobile_cpuidle_dev;
 static struct cpuidle_driver shmobile_cpuidle_driver = {
        .name =         "shmobile_cpuidle",
        .owner =        THIS_MODULE,
+        .states[0] = {
+                .name = "C1",
+                .desc = "WFI",
+                .exit_latency = 1,
+                .target_residency = 1 * 2,
+                .flags = CPUIDLE_FLAG_TIME_VALID,
+        },
+        .safe_state_index = 0, /* C1 */
+        .state_count = 1,
 };
-void (*shmobile_cpuidle_setup)(struct cpuidle_device *dev);
+void (*shmobile_cpuidle_setup)(struct cpuidle_driver *drv);
 static int shmobile_cpuidle_init(void)
 {
        struct cpuidle_device *dev = &shmobile_cpuidle_dev;
-        struct cpuidle_state *state;
+        struct cpuidle_driver *drv = &shmobile_cpuidle_driver;
        int i;
-        cpuidle_register_driver(&shmobile_cpuidle_driver);
+        for (i = 0; i < CPUIDLE_STATE_MAX; i++)
+                drv->states[i].enter = shmobile_cpuidle_enter;
-        for (i = 0; i < CPUIDLE_STATE_MAX; i++) {
-                dev->states[i].name[0] = '\0';
-                dev->states[i].desc[0] = '\0';
-                dev->states[i].enter = shmobile_cpuidle_enter;
-        }
-        i = CPUIDLE_DRIVER_STATE_START;
-        state = &dev->states[i++];
-        snprintf(state->name, CPUIDLE_NAME_LEN, "C1");
-        strncpy(state->desc, "WFI", CPUIDLE_DESC_LEN);
-        state->exit_latency = 1;
-        state->target_residency = 1 * 2;
-        state->power_usage = 3;
-        state->flags = 0;
-        state->flags |= CPUIDLE_FLAG_TIME_VALID;
-        dev->safe_state = state;
-        dev->state_count = i;
        if (shmobile_cpuidle_setup)
-                shmobile_cpuidle_setup(dev);
+                shmobile_cpuidle_setup(drv);
+        cpuidle_register_driver(drv);
+        dev->state_count = drv->state_count;
        cpuidle_register_device(dev);
        return 0;
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index c0cdbf997c91..834bd6cd508f 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -9,9 +9,9 @@ extern int clk_init(void);
 extern void shmobile_handle_irq_intc(struct pt_regs *);
 extern void shmobile_handle_irq_gic(struct pt_regs *);
 extern struct platform_suspend_ops shmobile_suspend_ops;
-struct cpuidle_device;
+struct cpuidle_driver;
 extern void (*shmobile_cpuidle_modes[])(void);
-extern void (*shmobile_cpuidle_setup)(struct cpuidle_device *dev);
+extern void (*shmobile_cpuidle_setup)(struct cpuidle_driver *drv);
 extern void sh7367_init_irq(void);
 extern void sh7367_add_early_devices(void);
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h
index 18ae6a990bc2..881d515a9686 100644
--- a/arch/arm/mach-shmobile/include/mach/sh73a0.h
+++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h
@@ -470,6 +470,14 @@ enum {
        GPIO_FN_SDHICMD2_PU,
        GPIO_FN_MMCCMD0_PU,
        GPIO_FN_MMCCMD1_PU,
+        GPIO_FN_MMCD0_0_PU,
+        GPIO_FN_MMCD0_1_PU,
+        GPIO_FN_MMCD0_2_PU,
+        GPIO_FN_MMCD0_3_PU,
+        GPIO_FN_MMCD0_4_PU,
+        GPIO_FN_MMCD0_5_PU,
+        GPIO_FN_MMCD0_6_PU,
+        GPIO_FN_MMCD0_7_PU,
        GPIO_FN_FSIACK_PU,
        GPIO_FN_FSIAILR_PU,
        GPIO_FN_FSIAIBT_PU,
diff --git a/arch/arm/mach-shmobile/pfc-sh7367.c b/arch/arm/mach-shmobile/pfc-sh7367.c
index 128555e76e43..e6e524654e67 100644
--- a/arch/arm/mach-shmobile/pfc-sh7367.c
+++ b/arch/arm/mach-shmobile/pfc-sh7367.c
@@ -21,68 +21,49 @@
 #include <linux/gpio.h>
 #include <mach/sh7367.h>
-#define _1(fn, pfx, sfx) fn(pfx, sfx)
+#define CPU_ALL_PORT(fn, pfx, sfx)                              \
+        PORT_10(fn, pfx, sfx), PORT_90(fn, pfx, sfx),           \
-#define _10(fn, pfx, sfx)                               \
+        PORT_10(fn, pfx##10, sfx), PORT_90(fn, pfx##1, sfx),    \
-        _1(fn, pfx##0, sfx), _1(fn, pfx##1, sfx),       \
+        PORT_10(fn, pfx##20, sfx), PORT_10(fn, pfx##21, sfx),   \
-        _1(fn, pfx##2, sfx), _1(fn, pfx##3, sfx),       \
+        PORT_10(fn, pfx##22, sfx), PORT_10(fn, pfx##23, sfx),   \
-        _1(fn, pfx##4, sfx), _1(fn, pfx##5, sfx),       \
+        PORT_10(fn, pfx##24, sfx), PORT_10(fn, pfx##25, sfx),   \
-        _1(fn, pfx##6, sfx), _1(fn, pfx##7, sfx),       \
+        PORT_10(fn, pfx##26, sfx), PORT_1(fn, pfx##270, sfx),   \
-        _1(fn, pfx##8, sfx), _1(fn, pfx##9, sfx)
+        PORT_1(fn, pfx##271, sfx), PORT_1(fn, pfx##272, sfx)
-#define _90(fn, pfx, sfx)                               \
-        _10(fn, pfx##1, sfx), _10(fn, pfx##2, sfx),     \
-        _10(fn, pfx##3, sfx), _10(fn, pfx##4, sfx),     \
-        _10(fn, pfx##5, sfx), _10(fn, pfx##6, sfx),     \
-        _10(fn, pfx##7, sfx), _10(fn, pfx##8, sfx),     \
-        _10(fn, pfx##9, sfx)
-#define _273(fn, pfx, sfx)              \
-        _10(fn, pfx, sfx), _90(fn, pfx, sfx),           \
-        _10(fn, pfx##10, sfx), _90(fn, pfx##1, sfx),    \
-        _10(fn, pfx##20, sfx), _10(fn, pfx##21, sfx),   \
-        _10(fn, pfx##22, sfx), _10(fn, pfx##23, sfx),   \
-        _10(fn, pfx##24, sfx), _10(fn, pfx##25, sfx),   \
-        _10(fn, pfx##26, sfx), _1(fn, pfx##270, sfx),   \
-        _1(fn, pfx##271, sfx), _1(fn, pfx##272, sfx)
-#define _PORT(pfx, sfx) pfx##_##sfx
-#define PORT_273(str) _273(_PORT, PORT, str)
 enum {
        PINMUX_RESERVED = 0,
        PINMUX_DATA_BEGIN,
-        PORT_273(DATA), /* PORT0_DATA -> PORT272_DATA */
+        PORT_ALL(DATA), /* PORT0_DATA -> PORT272_DATA */
        PINMUX_DATA_END,
        PINMUX_INPUT_BEGIN,
-        PORT_273(IN), /* PORT0_IN -> PORT272_IN */
+        PORT_ALL(IN), /* PORT0_IN -> PORT272_IN */
        PINMUX_INPUT_END,
        PINMUX_INPUT_PULLUP_BEGIN,
-        PORT_273(IN_PU), /* PORT0_IN_PU -> PORT272_IN_PU */
+        PORT_ALL(IN_PU), /* PORT0_IN_PU -> PORT272_IN_PU */
        PINMUX_INPUT_PULLUP_END,
        PINMUX_INPUT_PULLDOWN_BEGIN,
-        PORT_273(IN_PD), /* PORT0_IN_PD -> PORT272_IN_PD */
+        PORT_ALL(IN_PD), /* PORT0_IN_PD -> PORT272_IN_PD */
        PINMUX_INPUT_PULLDOWN_END,
        PINMUX_OUTPUT_BEGIN,
-        PORT_273(OUT), /* PORT0_OUT -> PORT272_OUT */
+        PORT_ALL(OUT), /* PORT0_OUT -> PORT272_OUT */
        PINMUX_OUTPUT_END,
        PINMUX_FUNCTION_BEGIN,
-        PORT_273(FN_IN), /* PORT0_FN_IN -> PORT272_FN_IN */
+        PORT_ALL(FN_IN), /* PORT0_FN_IN -> PORT272_FN_IN */
-        PORT_273(FN_OUT), /* PORT0_FN_OUT -> PORT272_FN_OUT */
+        PORT_ALL(FN_OUT), /* PORT0_FN_OUT -> PORT272_FN_OUT */
-        PORT_273(FN0), /* PORT0_FN0 -> PORT272_FN0 */
+        PORT_ALL(FN0), /* PORT0_FN0 -> PORT272_FN0 */
-        PORT_273(FN1), /* PORT0_FN1 -> PORT272_FN1 */
+        PORT_ALL(FN1), /* PORT0_FN1 -> PORT272_FN1 */
-        PORT_273(FN2), /* PORT0_FN2 -> PORT272_FN2 */
+        PORT_ALL(FN2), /* PORT0_FN2 -> PORT272_FN2 */
-        PORT_273(FN3), /* PORT0_FN3 -> PORT272_FN3 */
+        PORT_ALL(FN3), /* PORT0_FN3 -> PORT272_FN3 */
-        PORT_273(FN4), /* PORT0_FN4 -> PORT272_FN4 */
+        PORT_ALL(FN4), /* PORT0_FN4 -> PORT272_FN4 */
-        PORT_273(FN5), /* PORT0_FN5 -> PORT272_FN5 */
+        PORT_ALL(FN5), /* PORT0_FN5 -> PORT272_FN5 */
-        PORT_273(FN6), /* PORT0_FN6 -> PORT272_FN6 */
+        PORT_ALL(FN6), /* PORT0_FN6 -> PORT272_FN6 */
-        PORT_273(FN7), /* PORT0_FN7 -> PORT272_FN7 */
+        PORT_ALL(FN7), /* PORT0_FN7 -> PORT272_FN7 */
        MSELBCR_MSEL2_1, MSELBCR_MSEL2_0,
        PINMUX_FUNCTION_END,
@@ -327,41 +308,6 @@ enum {
        PINMUX_MARK_END,
 };
-#define PORT_DATA_I(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_IN)
-#define PORT_DATA_I_PD(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, \
-                    PORT##nr##_IN, PORT##nr##_IN_PD)
-#define PORT_DATA_I_PU(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, \
-                    PORT##nr##_IN, PORT##nr##_IN_PU)
-#define PORT_DATA_I_PU_PD(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, \
-                    PORT##nr##_IN, PORT##nr##_IN_PD, PORT##nr##_IN_PU)
-#define PORT_DATA_O(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_OUT)
-#define PORT_DATA_IO(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_OUT, \
-                    PORT##nr##_IN)
-#define PORT_DATA_IO_PD(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_OUT, \
-                    PORT##nr##_IN, PORT##nr##_IN_PD)
-#define PORT_DATA_IO_PU(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_OUT, \
-                    PORT##nr##_IN, PORT##nr##_IN_PU)
-#define PORT_DATA_IO_PU_PD(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_OUT, \
-                    PORT##nr##_IN, PORT##nr##_IN_PD, PORT##nr##_IN_PU)
 static pinmux_enum_t pinmux_data[] = {
        /* specify valid pin states for each pin in GPIO mode */
@@ -1098,13 +1044,9 @@ static pinmux_enum_t pinmux_data[] = {
        PINMUX_DATA(DIVLOCK_MARK, PORT272_FN1),
 };
-#define _GPIO_PORT(pfx, sfx) PINMUX_GPIO(GPIO_PORT##pfx, PORT##pfx##_DATA)
-#define GPIO_PORT_273() _273(_GPIO_PORT, , unused)
-#define GPIO_FN(str) PINMUX_GPIO(GPIO_FN_##str, str##_MARK)
 static struct pinmux_gpio pinmux_gpios[] = {
        /* 49-1 -> 49-6 (GPIO) */
-        GPIO_PORT_273(),
+        GPIO_PORT_ALL(),
        /* Special Pull-up / Pull-down Functions */
        GPIO_FN(PORT48_KEYIN0_PU), GPIO_FN(PORT49_KEYIN1_PU),
@@ -1345,22 +1287,6 @@ static struct pinmux_gpio pinmux_gpios[] = {
        GPIO_FN(DIVLOCK),
 };
-/* helper for top 4 bits in PORTnCR */
-#define PCRH(in, in_pd, in_pu, out)             \
-        0, (out), (in), 0,                      \
-        0, 0, 0, 0,                             \
-        0, 0, (in_pd), 0,                       \
-        0, 0, (in_pu), 0
-#define PORTCR(nr, reg)                                         \
-        { PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) {           \
-                PCRH(PORT##nr##_IN, PORT##nr##_IN_PD,           \
-                     PORT##nr##_IN_PU, PORT##nr##_OUT),         \
-                PORT##nr##_FN0, PORT##nr##_FN1, PORT##nr##_FN2, \
-                PORT##nr##_FN3, PORT##nr##_FN4, PORT##nr##_FN5, \
-                PORT##nr##_FN6, PORT##nr##_FN7 }                \
-        }
 static struct pinmux_cfg_reg pinmux_config_regs[] = {
        PORTCR(0, 0xe6050000), /* PORT0CR */
        PORTCR(1, 0xe6050001), /* PORT1CR */
diff --git a/arch/arm/mach-shmobile/pfc-sh7372.c b/arch/arm/mach-shmobile/pfc-sh7372.c
index 9c265dae138a..1bd6585a6acf 100644
--- a/arch/arm/mach-shmobile/pfc-sh7372.c
+++ b/arch/arm/mach-shmobile/pfc-sh7372.c
@@ -25,27 +25,13 @@
 #include <linux/gpio.h>
 #include <mach/sh7372.h>
-#define _1(fn, pfx, sfx) fn(pfx, sfx)
+#define CPU_ALL_PORT(fn, pfx, sfx) \
+        PORT_10(fn, pfx, sfx),          PORT_90(fn, pfx, sfx), \
-#define _10(fn, pfx, sfx)                               \
+        PORT_10(fn, pfx##10, sfx),      PORT_10(fn, pfx##11, sfx), \
-        _1(fn, pfx##0, sfx), _1(fn, pfx##1, sfx),       \
+        PORT_10(fn, pfx##12, sfx),      PORT_10(fn, pfx##13, sfx), \
-        _1(fn, pfx##2, sfx), _1(fn, pfx##3, sfx),       \
+        PORT_10(fn, pfx##14, sfx),      PORT_10(fn, pfx##15, sfx), \
-        _1(fn, pfx##4, sfx), _1(fn, pfx##5, sfx),       \
+        PORT_10(fn, pfx##16, sfx),      PORT_10(fn, pfx##17, sfx), \
-        _1(fn, pfx##6, sfx), _1(fn, pfx##7, sfx),       \
+        PORT_10(fn, pfx##18, sfx),      PORT_1(fn, pfx##190, sfx)
-        _1(fn, pfx##8, sfx), _1(fn, pfx##9, sfx)
-#define _80(fn, pfx, sfx)                               \
-        _10(fn, pfx##1, sfx),   _10(fn, pfx##2, sfx),   \
-        _10(fn, pfx##3, sfx),   _10(fn, pfx##4, sfx),   \
-        _10(fn, pfx##5, sfx),   _10(fn, pfx##6, sfx),   \
-        _10(fn, pfx##7, sfx),   _10(fn, pfx##8, sfx)
-#define _190(fn, pfx, sfx) \
-        _10(fn, pfx, sfx), _80(fn, pfx, sfx), _10(fn, pfx##9, sfx), \
-        _10(fn, pfx##10, sfx), _80(fn, pfx##1, sfx), _1(fn, pfx##190, sfx)
-#define _PORT(pfx, sfx) pfx##_##sfx
-#define PORT_ALL(str) _190(_PORT, PORT, str)
 enum {
        PINMUX_RESERVED = 0,
@@ -381,108 +367,124 @@ enum {
        PINMUX_MARK_END,
 };
-/* PORT_DATA_I_PD(nr) */
-#define _I___D(nr)                           \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, \
-                    PORT##nr##_IN, PORT##nr##_IN_PD)
-/* PORT_DATA_I_PU(nr) */
-#define _I__U_(nr)                           \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, \
-                    PORT##nr##_IN, PORT##nr##_IN_PU)
-/* PORT_DATA_I_PU_PD(nr) */
-#define _I__UD(nr)                           \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, \
-                    PORT##nr##_IN, PORT##nr##_IN_PD, PORT##nr##_IN_PU)
-/* PORT_DATA_O(nr) */
-#define __O___(nr)                                                      \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_OUT)
-/* PORT_DATA_IO(nr) */
-#define _IO___(nr)                                   \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_OUT, \
-                    PORT##nr##_IN)
-/* PORT_DATA_IO_PD(nr) */
-#define _IO__D(nr)                                           \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_OUT, \
-                    PORT##nr##_IN, PORT##nr##_IN_PD)
-/* PORT_DATA_IO_PU(nr) */
-#define _IO_U_(nr)                                           \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_OUT, \
-                    PORT##nr##_IN, PORT##nr##_IN_PU)
-/* PORT_DATA_IO_PU_PD(nr) */
-#define _IO_UD(nr)                                           \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_OUT, \
-                    PORT##nr##_IN, PORT##nr##_IN_PD, PORT##nr##_IN_PU)
 static pinmux_enum_t pinmux_data[] = {
        /* specify valid pin states for each pin in GPIO mode */
+        PORT_DATA_IO_PD(0),             PORT_DATA_IO_PD(1),
-        _IO__D(0), _IO__D(1), __O___(2), _I___D(3), _I___D(4),
+        PORT_DATA_O(2),                 PORT_DATA_I_PD(3),
-        _I___D(5), _IO_UD(6), _I___D(7), _IO__D(8), __O___(9),
+        PORT_DATA_I_PD(4),              PORT_DATA_I_PD(5),
+        PORT_DATA_IO_PU_PD(6),          PORT_DATA_I_PD(7),
-        __O___(10), __O___(11), _IO_UD(12), _IO__D(13), _IO__D(14),
+        PORT_DATA_IO_PD(8),             PORT_DATA_O(9),
-        __O___(15), _IO__D(16), _IO__D(17), _I___D(18), _IO___(19),
+        PORT_DATA_O(10),                PORT_DATA_O(11),
-        _IO___(20), _IO___(21), _IO___(22), _IO___(23), _IO___(24),
+        PORT_DATA_IO_PU_PD(12),         PORT_DATA_IO_PD(13),
-        _IO___(25), _IO___(26), _IO___(27), _IO___(28), _IO___(29),
+        PORT_DATA_IO_PD(14),            PORT_DATA_O(15),
+        PORT_DATA_IO_PD(16),            PORT_DATA_IO_PD(17),
-        _IO___(30), _IO___(31), _IO___(32), _IO___(33), _IO___(34),
+        PORT_DATA_I_PD(18),             PORT_DATA_IO(19),
-        _IO___(35), _IO___(36), _IO___(37), _IO___(38), _IO___(39),
+        PORT_DATA_IO(20),               PORT_DATA_IO(21),
-        _IO___(40), _IO___(41), _IO___(42), _IO___(43), _IO___(44),
+        PORT_DATA_IO(22),               PORT_DATA_IO(23),
-        _IO___(45), _IO_U_(46), _IO_U_(47), _IO_U_(48), _IO_U_(49),
+        PORT_DATA_IO(24),               PORT_DATA_IO(25),
+        PORT_DATA_IO(26),               PORT_DATA_IO(27),
-        _IO_U_(50), _IO_U_(51), _IO_U_(52), _IO_U_(53), _IO_U_(54),
+        PORT_DATA_IO(28),               PORT_DATA_IO(29),
-        _IO_U_(55), _IO_U_(56), _IO_U_(57), _IO_U_(58), _IO_U_(59),
+        PORT_DATA_IO(30),               PORT_DATA_IO(31),
-        _IO_U_(60), _IO_U_(61), _IO___(62), __O___(63), __O___(64),
+        PORT_DATA_IO(32),               PORT_DATA_IO(33),
-        _IO_U_(65), __O___(66), _IO_U_(67), __O___(68), _IO___(69), /*66?*/
+        PORT_DATA_IO(34),               PORT_DATA_IO(35),
+        PORT_DATA_IO(36),               PORT_DATA_IO(37),
-        _IO___(70), _IO___(71), __O___(72), _I__U_(73), _I__UD(74),
+        PORT_DATA_IO(38),               PORT_DATA_IO(39),
-        _IO_UD(75), _IO_UD(76), _IO_UD(77), _IO_UD(78), _IO_UD(79),
+        PORT_DATA_IO(40),               PORT_DATA_IO(41),
-        _IO_UD(80), _IO_UD(81), _IO_UD(82), _IO_UD(83), _IO_UD(84),
+        PORT_DATA_IO(42),               PORT_DATA_IO(43),
-        _IO_UD(85), _IO_UD(86), _IO_UD(87), _IO_UD(88), _IO_UD(89),
+        PORT_DATA_IO(44),               PORT_DATA_IO(45),
+        PORT_DATA_IO_PU(46),            PORT_DATA_IO_PU(47),
-        _IO_UD(90), _IO_UD(91), _IO_UD(92), _IO_UD(93), _IO_UD(94),
+        PORT_DATA_IO_PU(48),            PORT_DATA_IO_PU(49),
-        _IO_UD(95), _IO_U_(96), _IO_UD(97), _IO_UD(98), __O___(99), /*99?*/
+        PORT_DATA_IO_PU(50),            PORT_DATA_IO_PU(51),
-        _IO__D(100), _IO__D(101), _IO__D(102), _IO__D(103), _IO__D(104),
+        PORT_DATA_IO_PU(52),            PORT_DATA_IO_PU(53),
-        _IO__D(105), _IO_U_(106), _IO_U_(107), _IO_U_(108), _IO_U_(109),
+        PORT_DATA_IO_PU(54),            PORT_DATA_IO_PU(55),
+        PORT_DATA_IO_PU(56),            PORT_DATA_IO_PU(57),
-        _IO_U_(110), _IO_U_(111), _IO__D(112), _IO__D(113), _IO_U_(114),
+        PORT_DATA_IO_PU(58),            PORT_DATA_IO_PU(59),
-        _IO_U_(115), _IO_U_(116), _IO_U_(117), _IO_U_(118), _IO_U_(119),
+        PORT_DATA_IO_PU(60),            PORT_DATA_IO_PU(61),
-        _IO_U_(120), _IO__D(121), _IO__D(122), _IO__D(123), _IO__D(124),
+        PORT_DATA_IO(62),               PORT_DATA_O(63),
-        _IO__D(125), _IO__D(126), _IO__D(127), _IO__D(128), _IO_UD(129),
+        PORT_DATA_O(64),                PORT_DATA_IO_PU(65),
+        PORT_DATA_O(66),                PORT_DATA_IO_PU(67),  /*66?*/
-        _IO_UD(130), _IO_UD(131), _IO_UD(132), _IO_UD(133), _IO_UD(134),
+        PORT_DATA_O(68),                PORT_DATA_IO(69),
-        _IO_UD(135), _IO__D(136), _IO__D(137), _IO__D(138), _IO__D(139),
+        PORT_DATA_IO(70),               PORT_DATA_IO(71),
-        _IO__D(140), _IO__D(141), _IO__D(142), _IO_UD(143), _IO__D(144),
+        PORT_DATA_O(72),                PORT_DATA_I_PU(73),
-        _IO__D(145), _IO__D(146), _IO__D(147), _IO__D(148), _IO__D(149),
+        PORT_DATA_I_PU_PD(74),          PORT_DATA_IO_PU_PD(75),
+        PORT_DATA_IO_PU_PD(76),         PORT_DATA_IO_PU_PD(77),
-        _IO__D(150), _IO__D(151), _IO_UD(152), _I___D(153), _IO_UD(154),
+        PORT_DATA_IO_PU_PD(78),         PORT_DATA_IO_PU_PD(79),
-        _I___D(155), _IO__D(156), _IO__D(157), _I___D(158), _IO__D(159),
+        PORT_DATA_IO_PU_PD(80),         PORT_DATA_IO_PU_PD(81),
-        __O___(160), _IO__D(161), _IO__D(162), _IO__D(163), _I___D(164),
+        PORT_DATA_IO_PU_PD(82),         PORT_DATA_IO_PU_PD(83),
-        _IO__D(165), _I___D(166), _I___D(167), _I___D(168), _I___D(169),
+        PORT_DATA_IO_PU_PD(84),         PORT_DATA_IO_PU_PD(85),
+        PORT_DATA_IO_PU_PD(86),         PORT_DATA_IO_PU_PD(87),
-        _I___D(170), __O___(171), _IO_UD(172), _IO_UD(173), _IO_UD(174),
+        PORT_DATA_IO_PU_PD(88),         PORT_DATA_IO_PU_PD(89),
-        _IO_UD(175), _IO_UD(176), _IO_UD(177), _IO_UD(178), __O___(179),
+        PORT_DATA_IO_PU_PD(90),         PORT_DATA_IO_PU_PD(91),
-        _IO_UD(180), _IO_UD(181), _IO_UD(182), _IO_UD(183), _IO_UD(184),
+        PORT_DATA_IO_PU_PD(92),         PORT_DATA_IO_PU_PD(93),
-        __O___(185), _IO_UD(186), _IO_UD(187), _IO_UD(188), _IO_UD(189),
+        PORT_DATA_IO_PU_PD(94),         PORT_DATA_IO_PU_PD(95),
+        PORT_DATA_IO_PU(96),            PORT_DATA_IO_PU_PD(97),
-        _IO_UD(190),
+        PORT_DATA_IO_PU_PD(98),         PORT_DATA_O(99), /*99?*/
+        PORT_DATA_IO_PD(100),           PORT_DATA_IO_PD(101),
+        PORT_DATA_IO_PD(102),           PORT_DATA_IO_PD(103),
+        PORT_DATA_IO_PD(104),           PORT_DATA_IO_PD(105),
+        PORT_DATA_IO_PU(106),           PORT_DATA_IO_PU(107),
+        PORT_DATA_IO_PU(108),           PORT_DATA_IO_PU(109),
+        PORT_DATA_IO_PU(110),           PORT_DATA_IO_PU(111),
+        PORT_DATA_IO_PD(112),           PORT_DATA_IO_PD(113),
+        PORT_DATA_IO_PU(114),           PORT_DATA_IO_PU(115),
+        PORT_DATA_IO_PU(116),           PORT_DATA_IO_PU(117),
+        PORT_DATA_IO_PU(118),           PORT_DATA_IO_PU(119),
+        PORT_DATA_IO_PU(120),           PORT_DATA_IO_PD(121),
+        PORT_DATA_IO_PD(122),           PORT_DATA_IO_PD(123),
+        PORT_DATA_IO_PD(124),           PORT_DATA_IO_PD(125),
+        PORT_DATA_IO_PD(126),           PORT_DATA_IO_PD(127),
+        PORT_DATA_IO_PD(128),           PORT_DATA_IO_PU_PD(129),
+        PORT_DATA_IO_PU_PD(130),        PORT_DATA_IO_PU_PD(131),
+        PORT_DATA_IO_PU_PD(132),        PORT_DATA_IO_PU_PD(133),
+        PORT_DATA_IO_PU_PD(134),        PORT_DATA_IO_PU_PD(135),
+        PORT_DATA_IO_PD(136),           PORT_DATA_IO_PD(137),
+        PORT_DATA_IO_PD(138),           PORT_DATA_IO_PD(139),
+        PORT_DATA_IO_PD(140),           PORT_DATA_IO_PD(141),
+        PORT_DATA_IO_PD(142),           PORT_DATA_IO_PU_PD(143),
+        PORT_DATA_IO_PD(144),           PORT_DATA_IO_PD(145),
+        PORT_DATA_IO_PD(146),           PORT_DATA_IO_PD(147),
+        PORT_DATA_IO_PD(148),           PORT_DATA_IO_PD(149),
+        PORT_DATA_IO_PD(150),           PORT_DATA_IO_PD(151),
+        PORT_DATA_IO_PU_PD(152),        PORT_DATA_I_PD(153),
+        PORT_DATA_IO_PU_PD(154),        PORT_DATA_I_PD(155),
+        PORT_DATA_IO_PD(156),           PORT_DATA_IO_PD(157),
+        PORT_DATA_I_PD(158),            PORT_DATA_IO_PD(159),
+        PORT_DATA_O(160),               PORT_DATA_IO_PD(161),
+        PORT_DATA_IO_PD(162),           PORT_DATA_IO_PD(163),
+        PORT_DATA_I_PD(164),            PORT_DATA_IO_PD(165),
+        PORT_DATA_I_PD(166),            PORT_DATA_I_PD(167),
+        PORT_DATA_I_PD(168),            PORT_DATA_I_PD(169),
+        PORT_DATA_I_PD(170),            PORT_DATA_O(171),
+        PORT_DATA_IO_PU_PD(172),        PORT_DATA_IO_PU_PD(173),
+        PORT_DATA_IO_PU_PD(174),        PORT_DATA_IO_PU_PD(175),
+        PORT_DATA_IO_PU_PD(176),        PORT_DATA_IO_PU_PD(177),
+        PORT_DATA_IO_PU_PD(178),        PORT_DATA_O(179),
+        PORT_DATA_IO_PU_PD(180),        PORT_DATA_IO_PU_PD(181),
+        PORT_DATA_IO_PU_PD(182),        PORT_DATA_IO_PU_PD(183),
+        PORT_DATA_IO_PU_PD(184),        PORT_DATA_O(185),
+        PORT_DATA_IO_PU_PD(186),        PORT_DATA_IO_PU_PD(187),
+        PORT_DATA_IO_PU_PD(188),        PORT_DATA_IO_PU_PD(189),
+        PORT_DATA_IO_PU_PD(190),
        /* IRQ */
        PINMUX_DATA(IRQ0_6_MARK,        PORT6_FN0,      MSEL1CR_0_0),
@@ -926,10 +928,6 @@ static pinmux_enum_t pinmux_data[] = {
        PINMUX_DATA(MFIv4_MARK,         MSEL4CR_6_1),
 };
-#define _GPIO_PORT(pfx, sfx) PINMUX_GPIO(GPIO_PORT##pfx, PORT##pfx##_DATA)
-#define GPIO_PORT_ALL() _190(_GPIO_PORT, , unused)
-#define GPIO_FN(str) PINMUX_GPIO(GPIO_FN_##str, str##_MARK)
 static struct pinmux_gpio pinmux_gpios[] = {
        /* PORT */
@@ -1201,22 +1199,6 @@ static struct pinmux_gpio pinmux_gpios[] = {
        GPIO_FN(SDENC_DV_CLKI),
 };
-/* helper for top 4 bits in PORTnCR */
-#define PCRH(in, in_pd, in_pu, out)             \
-        0, (out), (in), 0,                      \
-        0, 0, 0, 0,                             \
-        0, 0, (in_pd), 0,                       \
-        0, 0, (in_pu), 0
-#define PORTCR(nr, reg)                                         \
-        { PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) {           \
-                PCRH(PORT##nr##_IN, PORT##nr##_IN_PD,           \
-                     PORT##nr##_IN_PU, PORT##nr##_OUT),         \
-                PORT##nr##_FN0, PORT##nr##_FN1, PORT##nr##_FN2, \
-                PORT##nr##_FN3, PORT##nr##_FN4, PORT##nr##_FN5, \
-                PORT##nr##_FN6, PORT##nr##_FN7 }                \
-        }
 static struct pinmux_cfg_reg pinmux_config_regs[] = {
        PORTCR(0,       0xE6051000), /* PORT0CR */
        PORTCR(1,       0xE6051001), /* PORT1CR */
diff --git a/arch/arm/mach-shmobile/pfc-sh7377.c b/arch/arm/mach-shmobile/pfc-sh7377.c
index 613e6842ad05..2f10511946ad 100644
--- a/arch/arm/mach-shmobile/pfc-sh7377.c
+++ b/arch/arm/mach-shmobile/pfc-sh7377.c
@@ -22,84 +22,65 @@
 #include <linux/gpio.h>
 #include <mach/sh7377.h>
-#define _1(fn, pfx, sfx) fn(pfx, sfx)
+#define CPU_ALL_PORT(fn, pfx, sfx)                              \
+        PORT_10(fn, pfx, sfx), PORT_90(fn, pfx, sfx),           \
-#define _10(fn, pfx, sfx)                               \
+        PORT_10(fn, pfx##10, sfx),                              \
-        _1(fn, pfx##0, sfx), _1(fn, pfx##1, sfx),       \
+        PORT_1(fn, pfx##110, sfx), PORT_1(fn, pfx##111, sfx),   \
-        _1(fn, pfx##2, sfx), _1(fn, pfx##3, sfx),       \
+        PORT_1(fn, pfx##112, sfx), PORT_1(fn, pfx##113, sfx),   \
-        _1(fn, pfx##4, sfx), _1(fn, pfx##5, sfx),       \
+        PORT_1(fn, pfx##114, sfx), PORT_1(fn, pfx##115, sfx),   \
-        _1(fn, pfx##6, sfx), _1(fn, pfx##7, sfx),       \
+        PORT_1(fn, pfx##116, sfx), PORT_1(fn, pfx##117, sfx),   \
-        _1(fn, pfx##8, sfx), _1(fn, pfx##9, sfx)
+        PORT_1(fn, pfx##118, sfx),                              \
+        PORT_1(fn, pfx##128, sfx), PORT_1(fn, pfx##129, sfx),   \
-#define _90(fn, pfx, sfx)                               \
+        PORT_10(fn, pfx##13, sfx), PORT_10(fn, pfx##14, sfx),   \
-        _10(fn, pfx##1, sfx), _10(fn, pfx##2, sfx),     \
+        PORT_10(fn, pfx##15, sfx),                              \
-        _10(fn, pfx##3, sfx), _10(fn, pfx##4, sfx),     \
+        PORT_1(fn, pfx##160, sfx), PORT_1(fn, pfx##161, sfx),   \
-        _10(fn, pfx##5, sfx), _10(fn, pfx##6, sfx),     \
+        PORT_1(fn, pfx##162, sfx), PORT_1(fn, pfx##163, sfx),   \
-        _10(fn, pfx##7, sfx), _10(fn, pfx##8, sfx),     \
+        PORT_1(fn, pfx##164, sfx),                              \
-        _10(fn, pfx##9, sfx)
+        PORT_1(fn, pfx##192, sfx), PORT_1(fn, pfx##193, sfx),   \
+        PORT_1(fn, pfx##194, sfx), PORT_1(fn, pfx##195, sfx),   \
-#define _265(fn, pfx, sfx)                              \
+        PORT_1(fn, pfx##196, sfx), PORT_1(fn, pfx##197, sfx),   \
-        _10(fn, pfx, sfx), _90(fn, pfx, sfx),           \
+        PORT_1(fn, pfx##198, sfx), PORT_1(fn, pfx##199, sfx),   \
-        _10(fn, pfx##10, sfx),                          \
+        PORT_10(fn, pfx##20, sfx), PORT_10(fn, pfx##21, sfx),   \
-        _1(fn, pfx##110, sfx), _1(fn, pfx##111, sfx),   \
+        PORT_10(fn, pfx##22, sfx), PORT_10(fn, pfx##23, sfx),   \
-        _1(fn, pfx##112, sfx), _1(fn, pfx##113, sfx),   \
+        PORT_10(fn, pfx##24, sfx), PORT_10(fn, pfx##25, sfx),   \
-        _1(fn, pfx##114, sfx), _1(fn, pfx##115, sfx),   \
+        PORT_1(fn, pfx##260, sfx), PORT_1(fn, pfx##261, sfx),   \
-        _1(fn, pfx##116, sfx), _1(fn, pfx##117, sfx),   \
+        PORT_1(fn, pfx##262, sfx), PORT_1(fn, pfx##263, sfx),   \
-        _1(fn, pfx##118, sfx),                          \
+        PORT_1(fn, pfx##264, sfx)
-        _1(fn, pfx##128, sfx), _1(fn, pfx##129, sfx),   \
-        _10(fn, pfx##13, sfx), _10(fn, pfx##14, sfx),   \
-        _10(fn, pfx##15, sfx),                          \
-        _1(fn, pfx##160, sfx), _1(fn, pfx##161, sfx),   \
-        _1(fn, pfx##162, sfx), _1(fn, pfx##163, sfx),   \
-        _1(fn, pfx##164, sfx),                          \
-        _1(fn, pfx##192, sfx), _1(fn, pfx##193, sfx),   \
-        _1(fn, pfx##194, sfx), _1(fn, pfx##195, sfx),   \
-        _1(fn, pfx##196, sfx), _1(fn, pfx##197, sfx),   \
-        _1(fn, pfx##198, sfx), _1(fn, pfx##199, sfx),   \
-        _10(fn, pfx##20, sfx), _10(fn, pfx##21, sfx),   \
-        _10(fn, pfx##22, sfx), _10(fn, pfx##23, sfx),   \
-        _10(fn, pfx##24, sfx), _10(fn, pfx##25, sfx),   \
-        _1(fn, pfx##260, sfx), _1(fn, pfx##261, sfx),   \
-        _1(fn, pfx##262, sfx), _1(fn, pfx##263, sfx),   \
-        _1(fn, pfx##264, sfx)
-#define _PORT(pfx, sfx) pfx##_##sfx
-#define PORT_265(str) _265(_PORT, PORT, str)
 enum {
        PINMUX_RESERVED = 0,
        PINMUX_DATA_BEGIN,
-        PORT_265(DATA), /* PORT0_DATA -> PORT264_DATA */
+        PORT_ALL(DATA), /* PORT0_DATA -> PORT264_DATA */
        PINMUX_DATA_END,
        PINMUX_INPUT_BEGIN,
-        PORT_265(IN), /* PORT0_IN -> PORT264_IN */
+        PORT_ALL(IN), /* PORT0_IN -> PORT264_IN */
        PINMUX_INPUT_END,
        PINMUX_INPUT_PULLUP_BEGIN,
-        PORT_265(IN_PU), /* PORT0_IN_PU -> PORT264_IN_PU */
+        PORT_ALL(IN_PU), /* PORT0_IN_PU -> PORT264_IN_PU */
        PINMUX_INPUT_PULLUP_END,
        PINMUX_INPUT_PULLDOWN_BEGIN,
-        PORT_265(IN_PD), /* PORT0_IN_PD -> PORT264_IN_PD */
+        PORT_ALL(IN_PD), /* PORT0_IN_PD -> PORT264_IN_PD */
        PINMUX_INPUT_PULLDOWN_END,
        PINMUX_OUTPUT_BEGIN,
-        PORT_265(OUT), /* PORT0_OUT -> PORT264_OUT */
+        PORT_ALL(OUT), /* PORT0_OUT -> PORT264_OUT */
        PINMUX_OUTPUT_END,
        PINMUX_FUNCTION_BEGIN,
-        PORT_265(FN_IN), /* PORT0_FN_IN -> PORT264_FN_IN */
+        PORT_ALL(FN_IN), /* PORT0_FN_IN -> PORT264_FN_IN */
-        PORT_265(FN_OUT), /* PORT0_FN_OUT -> PORT264_FN_OUT */
+        PORT_ALL(FN_OUT), /* PORT0_FN_OUT -> PORT264_FN_OUT */
-        PORT_265(FN0), /* PORT0_FN0 -> PORT264_FN0 */
+        PORT_ALL(FN0), /* PORT0_FN0 -> PORT264_FN0 */
-        PORT_265(FN1), /* PORT0_FN1 -> PORT264_FN1 */
+        PORT_ALL(FN1), /* PORT0_FN1 -> PORT264_FN1 */
-        PORT_265(FN2), /* PORT0_FN2 -> PORT264_FN2 */
+        PORT_ALL(FN2), /* PORT0_FN2 -> PORT264_FN2 */
-        PORT_265(FN3), /* PORT0_FN3 -> PORT264_FN3 */
+        PORT_ALL(FN3), /* PORT0_FN3 -> PORT264_FN3 */
-        PORT_265(FN4), /* PORT0_FN4 -> PORT264_FN4 */
+        PORT_ALL(FN4), /* PORT0_FN4 -> PORT264_FN4 */
-        PORT_265(FN5), /* PORT0_FN5 -> PORT264_FN5 */
+        PORT_ALL(FN5), /* PORT0_FN5 -> PORT264_FN5 */
-        PORT_265(FN6), /* PORT0_FN6 -> PORT264_FN6 */
+        PORT_ALL(FN6), /* PORT0_FN6 -> PORT264_FN6 */
-        PORT_265(FN7), /* PORT0_FN7 -> PORT264_FN7 */
+        PORT_ALL(FN7), /* PORT0_FN7 -> PORT264_FN7 */
        MSELBCR_MSEL17_1, MSELBCR_MSEL17_0,
        MSELBCR_MSEL16_1, MSELBCR_MSEL16_0,
@@ -360,45 +341,6 @@ enum {
        PINMUX_MARK_END,
 };
-#define PORT_DATA_I(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_IN)
-#define PORT_DATA_I_PD(nr)      \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_IN, PORT##nr##_IN_PD)
-#define PORT_DATA_I_PU(nr)      \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_IN, PORT##nr##_IN_PU)
-#define PORT_DATA_I_PU_PD(nr)   \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_IN, PORT##nr##_IN_PD,        \
-                                PORT##nr##_IN_PU)
-#define PORT_DATA_O(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_OUT)
-#define PORT_DATA_IO(nr)        \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_OUT, PORT##nr##_IN)
-#define PORT_DATA_IO_PD(nr)     \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_OUT, PORT##nr##_IN,          \
-                                PORT##nr##_IN_PD)
-#define PORT_DATA_IO_PU(nr)     \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_OUT, PORT##nr##_IN,          \
-                                PORT##nr##_IN_PU)
-#define PORT_DATA_IO_PU_PD(nr)  \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_OUT, PORT##nr##_IN,          \
-                                PORT##nr##_IN_PD, PORT##nr##_IN_PU)
 static pinmux_enum_t pinmux_data[] = {
        /* specify valid pin states for each pin in GPIO mode */
        /* 55-1 (GPIO) */
@@ -1078,13 +1020,9 @@ static pinmux_enum_t pinmux_data[] = {
        PINMUX_DATA(RESETOUTS_MARK, PORT264_FN1),
 };
-#define _GPIO_PORT(pfx, sfx) PINMUX_GPIO(GPIO_PORT##pfx, PORT##pfx##_DATA)
-#define GPIO_PORT_265() _265(_GPIO_PORT, , unused)
-#define GPIO_FN(str) PINMUX_GPIO(GPIO_FN_##str, str##_MARK)
 static struct pinmux_gpio pinmux_gpios[] = {
        /* 55-1 -> 55-5 (GPIO) */
-        GPIO_PORT_265(),
+        GPIO_PORT_ALL(),
        /* Special Pull-up / Pull-down Functions */
        GPIO_FN(PORT66_KEYIN0_PU), GPIO_FN(PORT67_KEYIN1_PU),
@@ -1362,23 +1300,6 @@ static struct pinmux_gpio pinmux_gpios[] = {
        GPIO_FN(RESETOUTS),
 };
-/* helper for top 4 bits in PORTnCR */
-#define PCRH(in, in_pd, in_pu, out)     \
-        0, (out), (in), 0,      \
-                0, 0, 0, 0,     \
-                0, 0, (in_pd), 0,       \
-                0, 0, (in_pu), 0
-#define PORTCR(nr, reg) \
-        { PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) {   \
-                        PCRH(PORT##nr##_IN, PORT##nr##_IN_PD,   \
-                                 PORT##nr##_IN_PU, PORT##nr##_OUT),     \
-                                PORT##nr##_FN0, PORT##nr##_FN1, \
-                                PORT##nr##_FN2, PORT##nr##_FN3, \
-                                PORT##nr##_FN4, PORT##nr##_FN5, \
-                                PORT##nr##_FN6, PORT##nr##_FN7 }        \
-        }
 static struct pinmux_cfg_reg pinmux_config_regs[] = {
        PORTCR(0, 0xe6050000), /* PORT0CR */
        PORTCR(1, 0xe6050001), /* PORT1CR */
diff --git a/arch/arm/mach-shmobile/pfc-sh73a0.c b/arch/arm/mach-shmobile/pfc-sh73a0.c
index 5abe02fbd6b9..e05634ce2e0d 100644
--- a/arch/arm/mach-shmobile/pfc-sh73a0.c
+++ b/arch/arm/mach-shmobile/pfc-sh73a0.c
@@ -24,83 +24,71 @@
 #include <mach/sh73a0.h>
 #include <mach/irqs.h>
-#define _1(fn, pfx, sfx) fn(pfx, sfx)
+#define CPU_ALL_PORT(fn, pfx, sfx)                              \
+        PORT_10(fn, pfx,    sfx), PORT_10(fn, pfx##1, sfx),     \
-#define _10(fn, pfx, sfx)                               \
+        PORT_10(fn, pfx##2, sfx), PORT_10(fn, pfx##3, sfx),     \
-        _1(fn, pfx##0, sfx), _1(fn, pfx##1, sfx),       \
+        PORT_10(fn, pfx##4, sfx), PORT_10(fn, pfx##5, sfx),     \
-        _1(fn, pfx##2, sfx), _1(fn, pfx##3, sfx),       \
+        PORT_10(fn, pfx##6, sfx), PORT_10(fn, pfx##7, sfx),     \
-        _1(fn, pfx##4, sfx), _1(fn, pfx##5, sfx),       \
+        PORT_10(fn, pfx##8, sfx), PORT_10(fn, pfx##9, sfx),     \
-        _1(fn, pfx##6, sfx), _1(fn, pfx##7, sfx),       \
+        PORT_10(fn, pfx##10, sfx),                              \
-        _1(fn, pfx##8, sfx), _1(fn, pfx##9, sfx)
+        PORT_1(fn, pfx##110, sfx), PORT_1(fn, pfx##111, sfx),   \
+        PORT_1(fn, pfx##112, sfx), PORT_1(fn, pfx##113, sfx),   \
-#define _310(fn, pfx, sfx)                              \
+        PORT_1(fn, pfx##114, sfx), PORT_1(fn, pfx##115, sfx),   \
-        _10(fn, pfx,    sfx), _10(fn, pfx##1, sfx),     \
+        PORT_1(fn, pfx##116, sfx), PORT_1(fn, pfx##117, sfx),   \
-        _10(fn, pfx##2, sfx), _10(fn, pfx##3, sfx),     \
+        PORT_1(fn, pfx##118, sfx),                              \
-        _10(fn, pfx##4, sfx), _10(fn, pfx##5, sfx),     \
+        PORT_1(fn, pfx##128, sfx), PORT_1(fn, pfx##129, sfx),   \
-        _10(fn, pfx##6, sfx), _10(fn, pfx##7, sfx),     \
+        PORT_10(fn, pfx##13, sfx), PORT_10(fn, pfx##14, sfx),   \
-        _10(fn, pfx##8, sfx), _10(fn, pfx##9, sfx),     \
+        PORT_10(fn, pfx##15, sfx),                              \
-        _10(fn, pfx##10, sfx),                          \
+        PORT_1(fn, pfx##160, sfx), PORT_1(fn, pfx##161, sfx),   \
-        _1(fn, pfx##110, sfx), _1(fn, pfx##111, sfx),   \
+        PORT_1(fn, pfx##162, sfx), PORT_1(fn, pfx##163, sfx),   \
-        _1(fn, pfx##112, sfx), _1(fn, pfx##113, sfx),   \
+        PORT_1(fn, pfx##164, sfx),                              \
-        _1(fn, pfx##114, sfx), _1(fn, pfx##115, sfx),   \
+        PORT_1(fn, pfx##192, sfx), PORT_1(fn, pfx##193, sfx),   \
-        _1(fn, pfx##116, sfx), _1(fn, pfx##117, sfx),   \
+        PORT_1(fn, pfx##194, sfx), PORT_1(fn, pfx##195, sfx),   \
-        _1(fn, pfx##118, sfx),                          \
+        PORT_1(fn, pfx##196, sfx), PORT_1(fn, pfx##197, sfx),   \
-        _1(fn, pfx##128, sfx), _1(fn, pfx##129, sfx),   \
+        PORT_1(fn, pfx##198, sfx), PORT_1(fn, pfx##199, sfx),   \
-        _10(fn, pfx##13, sfx), _10(fn, pfx##14, sfx),   \
+        PORT_10(fn, pfx##20, sfx), PORT_10(fn, pfx##21, sfx),   \
-        _10(fn, pfx##15, sfx),                          \
+        PORT_10(fn, pfx##22, sfx), PORT_10(fn, pfx##23, sfx),   \
-        _1(fn, pfx##160, sfx), _1(fn, pfx##161, sfx),   \
+        PORT_10(fn, pfx##24, sfx), PORT_10(fn, pfx##25, sfx),   \
-        _1(fn, pfx##162, sfx), _1(fn, pfx##163, sfx),   \
+        PORT_10(fn, pfx##26, sfx), PORT_10(fn, pfx##27, sfx),   \
-        _1(fn, pfx##164, sfx),                          \
+        PORT_1(fn, pfx##280, sfx), PORT_1(fn, pfx##281, sfx),   \
-        _1(fn, pfx##192, sfx), _1(fn, pfx##193, sfx),   \
+        PORT_1(fn, pfx##282, sfx),                              \
-        _1(fn, pfx##194, sfx), _1(fn, pfx##195, sfx),   \
+        PORT_1(fn, pfx##288, sfx), PORT_1(fn, pfx##289, sfx),   \
-        _1(fn, pfx##196, sfx), _1(fn, pfx##197, sfx),   \
+        PORT_10(fn, pfx##29, sfx), PORT_10(fn, pfx##30, sfx)
-        _1(fn, pfx##198, sfx), _1(fn, pfx##199, sfx),   \
-        _10(fn, pfx##20, sfx), _10(fn, pfx##21, sfx),   \
-        _10(fn, pfx##22, sfx), _10(fn, pfx##23, sfx),   \
-        _10(fn, pfx##24, sfx), _10(fn, pfx##25, sfx),   \
-        _10(fn, pfx##26, sfx), _10(fn, pfx##27, sfx),   \
-        _1(fn, pfx##280, sfx), _1(fn, pfx##281, sfx),   \
-        _1(fn, pfx##282, sfx),                          \
-        _1(fn, pfx##288, sfx), _1(fn, pfx##289, sfx),   \
-        _10(fn, pfx##29, sfx), _10(fn, pfx##30, sfx)
-#define _PORT(pfx, sfx) pfx##_##sfx
-#define PORT_310(str) _310(_PORT, PORT, str)
 enum {
        PINMUX_RESERVED = 0,
        PINMUX_DATA_BEGIN,
-        PORT_310(DATA),                 /* PORT0_DATA -> PORT309_DATA */
+        PORT_ALL(DATA),                 /* PORT0_DATA -> PORT309_DATA */
        PINMUX_DATA_END,
        PINMUX_INPUT_BEGIN,
-        PORT_310(IN),                   /* PORT0_IN -> PORT309_IN */
+        PORT_ALL(IN),                   /* PORT0_IN -> PORT309_IN */
        PINMUX_INPUT_END,
        PINMUX_INPUT_PULLUP_BEGIN,
-        PORT_310(IN_PU),                /* PORT0_IN_PU -> PORT309_IN_PU */
+        PORT_ALL(IN_PU),                /* PORT0_IN_PU -> PORT309_IN_PU */
        PINMUX_INPUT_PULLUP_END,
        PINMUX_INPUT_PULLDOWN_BEGIN,
-        PORT_310(IN_PD),                /* PORT0_IN_PD -> PORT309_IN_PD */
+        PORT_ALL(IN_PD),                /* PORT0_IN_PD -> PORT309_IN_PD */
        PINMUX_INPUT_PULLDOWN_END,
        PINMUX_OUTPUT_BEGIN,
-        PORT_310(OUT),                  /* PORT0_OUT -> PORT309_OUT */
+        PORT_ALL(OUT),                  /* PORT0_OUT -> PORT309_OUT */
        PINMUX_OUTPUT_END,
        PINMUX_FUNCTION_BEGIN,
-        PORT_310(FN_IN),                /* PORT0_FN_IN -> PORT309_FN_IN */
+        PORT_ALL(FN_IN),                /* PORT0_FN_IN -> PORT309_FN_IN */
-        PORT_310(FN_OUT),               /* PORT0_FN_OUT -> PORT309_FN_OUT */
+        PORT_ALL(FN_OUT),               /* PORT0_FN_OUT -> PORT309_FN_OUT */
-        PORT_310(FN0),                  /* PORT0_FN0 -> PORT309_FN0 */
+        PORT_ALL(FN0),                  /* PORT0_FN0 -> PORT309_FN0 */
-        PORT_310(FN1),                  /* PORT0_FN1 -> PORT309_FN1 */
+        PORT_ALL(FN1),                  /* PORT0_FN1 -> PORT309_FN1 */
-        PORT_310(FN2),                  /* PORT0_FN2 -> PORT309_FN2 */
+        PORT_ALL(FN2),                  /* PORT0_FN2 -> PORT309_FN2 */
-        PORT_310(FN3),                  /* PORT0_FN3 -> PORT309_FN3 */
+        PORT_ALL(FN3),                  /* PORT0_FN3 -> PORT309_FN3 */
-        PORT_310(FN4),                  /* PORT0_FN4 -> PORT309_FN4 */
+        PORT_ALL(FN4),                  /* PORT0_FN4 -> PORT309_FN4 */
-        PORT_310(FN5),                  /* PORT0_FN5 -> PORT309_FN5 */
+        PORT_ALL(FN5),                  /* PORT0_FN5 -> PORT309_FN5 */
-        PORT_310(FN6),                  /* PORT0_FN6 -> PORT309_FN6 */
+        PORT_ALL(FN6),                  /* PORT0_FN6 -> PORT309_FN6 */
-        PORT_310(FN7),                  /* PORT0_FN7 -> PORT309_FN7 */
+        PORT_ALL(FN7),                  /* PORT0_FN7 -> PORT309_FN7 */
        MSEL2CR_MSEL19_0, MSEL2CR_MSEL19_1,
        MSEL2CR_MSEL18_0, MSEL2CR_MSEL18_1,
@@ -508,6 +496,14 @@ enum {
        SDHICMD2_PU_MARK,
        MMCCMD0_PU_MARK,
        MMCCMD1_PU_MARK,
+        MMCD0_0_PU_MARK,
+        MMCD0_1_PU_MARK,
+        MMCD0_2_PU_MARK,
+        MMCD0_3_PU_MARK,
+        MMCD0_4_PU_MARK,
+        MMCD0_5_PU_MARK,
+        MMCD0_6_PU_MARK,
+        MMCD0_7_PU_MARK,
        FSIBISLD_PU_MARK,
        FSIACK_PU_MARK,
        FSIAILR_PU_MARK,
@@ -517,45 +513,6 @@ enum {
        PINMUX_MARK_END,
 };
-#define PORT_DATA_I(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0, PORT##nr##_IN)
-#define PORT_DATA_I_PD(nr)      \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_IN, PORT##nr##_IN_PD)
-#define PORT_DATA_I_PU(nr)      \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_IN, PORT##nr##_IN_PU)
-#define PORT_DATA_I_PU_PD(nr)   \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_IN, PORT##nr##_IN_PD,        \
-                                PORT##nr##_IN_PU)
-#define PORT_DATA_O(nr) \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_OUT)
-#define PORT_DATA_IO(nr)        \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_OUT, PORT##nr##_IN)
-#define PORT_DATA_IO_PD(nr)     \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_OUT, PORT##nr##_IN,          \
-                                PORT##nr##_IN_PD)
-#define PORT_DATA_IO_PU(nr)     \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_OUT, PORT##nr##_IN,          \
-                                PORT##nr##_IN_PU)
-#define PORT_DATA_IO_PU_PD(nr)  \
-        PINMUX_DATA(PORT##nr##_DATA, PORT##nr##_FN0,    \
-                                PORT##nr##_OUT, PORT##nr##_IN,          \
-                                PORT##nr##_IN_PD, PORT##nr##_IN_PU)
 static pinmux_enum_t pinmux_data[] = {
        /* specify valid pin states for each pin in GPIO mode */
@@ -1561,6 +1518,24 @@ static pinmux_enum_t pinmux_data[] = {
                MSEL4CR_MSEL15_0),
        PINMUX_DATA(MMCCMD1_PU_MARK, PORT297_FN2, PORT297_IN_PU,
                MSEL4CR_MSEL15_1),
+        PINMUX_DATA(MMCD0_0_PU_MARK,
+                    PORT271_FN1, PORT271_IN_PU, MSEL4CR_MSEL15_0),
+        PINMUX_DATA(MMCD0_1_PU_MARK,
+                    PORT272_FN1, PORT272_IN_PU, MSEL4CR_MSEL15_0),
+        PINMUX_DATA(MMCD0_2_PU_MARK,
+                    PORT273_FN1, PORT273_IN_PU, MSEL4CR_MSEL15_0),
+        PINMUX_DATA(MMCD0_3_PU_MARK,
+                    PORT274_FN1, PORT274_IN_PU, MSEL4CR_MSEL15_0),
+        PINMUX_DATA(MMCD0_4_PU_MARK,
+                    PORT275_FN1, PORT275_IN_PU, MSEL4CR_MSEL15_0),
+        PINMUX_DATA(MMCD0_5_PU_MARK,
+                    PORT276_FN1, PORT276_IN_PU, MSEL4CR_MSEL15_0),
+        PINMUX_DATA(MMCD0_6_PU_MARK,
+                    PORT277_FN1, PORT277_IN_PU, MSEL4CR_MSEL15_0),
+        PINMUX_DATA(MMCD0_7_PU_MARK,
+                    PORT278_FN1, PORT278_IN_PU, MSEL4CR_MSEL15_0),
        PINMUX_DATA(FSIBISLD_PU_MARK, PORT39_FN1, PORT39_IN_PU),
        PINMUX_DATA(FSIACK_PU_MARK, PORT49_FN1, PORT49_IN_PU),
        PINMUX_DATA(FSIAILR_PU_MARK, PORT50_FN5, PORT50_IN_PU),
@@ -1568,12 +1543,8 @@ static pinmux_enum_t pinmux_data[] = {
        PINMUX_DATA(FSIAISLD_PU_MARK, PORT55_FN1, PORT55_IN_PU),
 };
-#define _GPIO_PORT(pfx, sfx) PINMUX_GPIO(GPIO_PORT##pfx, PORT##pfx##_DATA)
-#define GPIO_PORT_310() _310(_GPIO_PORT, , unused)
-#define GPIO_FN(str) PINMUX_GPIO(GPIO_FN_##str, str##_MARK)
 static struct pinmux_gpio pinmux_gpios[] = {
-        GPIO_PORT_310(),
+        GPIO_PORT_ALL(),
        /* Table 25-1 (Functions 0-7) */
        GPIO_FN(VBUS_0),
@@ -2236,24 +2207,20 @@ static struct pinmux_gpio pinmux_gpios[] = {
        GPIO_FN(SDHICMD2_PU),
        GPIO_FN(MMCCMD0_PU),
        GPIO_FN(MMCCMD1_PU),
+        GPIO_FN(MMCD0_0_PU),
+        GPIO_FN(MMCD0_1_PU),
+        GPIO_FN(MMCD0_2_PU),
+        GPIO_FN(MMCD0_3_PU),
+        GPIO_FN(MMCD0_4_PU),
+        GPIO_FN(MMCD0_5_PU),
+        GPIO_FN(MMCD0_6_PU),
+        GPIO_FN(MMCD0_7_PU),
        GPIO_FN(FSIACK_PU),
        GPIO_FN(FSIAILR_PU),
        GPIO_FN(FSIAIBT_PU),
        GPIO_FN(FSIAISLD_PU),
 };
-#define PORTCR(nr, reg) \
-        { PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) { \
-                0, \
-                /*0001*/ PORT##nr##_OUT , \
-                /*0010*/ PORT##nr##_IN , 0, 0, 0, 0, 0, 0, 0, \
-                /*1010*/ PORT##nr##_IN_PD, 0, 0, 0, \
-                /*1110*/ PORT##nr##_IN_PU, 0, \
-                PORT##nr##_FN0, PORT##nr##_FN1, PORT##nr##_FN2, \
-                PORT##nr##_FN3, PORT##nr##_FN4, PORT##nr##_FN5, \
-                PORT##nr##_FN6, PORT##nr##_FN7, 0, 0, 0, 0, 0, 0, 0, 0 } \
-        }
 static struct pinmux_cfg_reg pinmux_config_regs[] = {
        PORTCR(0, 0xe6050000), /* PORT0CR */
        PORTCR(1, 0xe6050001), /* PORT1CR */
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index 79612737c5b2..34bbcbfb1706 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/bitrev.h>
+#include <linux/console.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/tlbflush.h>
@@ -106,9 +107,8 @@ static int pd_power_down(struct generic_pm_domain *genpd)
        return 0;
 }
-static int pd_power_up(struct generic_pm_domain *genpd)
+static int __pd_power_up(struct sh7372_pm_domain *sh7372_pd, bool do_resume)
 {
-        struct sh7372_pm_domain *sh7372_pd = to_sh7372_pd(genpd);
        unsigned int mask = 1 << sh7372_pd->bit_shift;
        unsigned int retry_count;
        int ret = 0;
@@ -123,13 +123,13 @@ static int pd_power_up(struct generic_pm_domain *genpd)
        for (retry_count = 2 * PSTR_RETRIES; retry_count; retry_count--) {
                if (!(__raw_readl(SWUCR) & mask))
-                        goto out;
+                        break;
                if (retry_count > PSTR_RETRIES)
                        udelay(PSTR_DELAY_US);
                else
                        cpu_relax();
        }
-        if (__raw_readl(SWUCR) & mask)
+        if (!retry_count)
                ret = -EIO;
        if (!sh7372_pd->no_debug)
@@ -137,12 +137,17 @@ static int pd_power_up(struct generic_pm_domain *genpd)
                         mask, __raw_readl(PSTR));
 out:
-        if (ret == 0 && sh7372_pd->resume)
+        if (ret == 0 && sh7372_pd->resume && do_resume)
                sh7372_pd->resume();
        return ret;
 }
+static int pd_power_up(struct generic_pm_domain *genpd)
+{
+         return __pd_power_up(to_sh7372_pd(genpd), true);
+}
 static void sh7372_a4r_suspend(void)
 {
        sh7372_intcs_suspend();
@@ -174,7 +179,7 @@ void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd)
        genpd->active_wakeup = pd_active_wakeup;
        genpd->power_off = pd_power_down;
        genpd->power_on = pd_power_up;
-        genpd->power_on(&sh7372_pd->genpd);
+        __pd_power_up(sh7372_pd, false);
 }
 void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd,
@@ -227,11 +232,23 @@ struct sh7372_pm_domain sh7372_a3sp = {
        .no_debug = true,
 };
+static void sh7372_a3sp_init(void)
+{
+        /* serial consoles make use of SCIF hardware located in A3SP,
+         * keep such power domain on if "no_console_suspend" is set.
+         */
+        sh7372_a3sp.stay_on = !console_suspend_enabled;
+}
 struct sh7372_pm_domain sh7372_a3sg = {
        .bit_shift = 13,
 };
-#endif /* CONFIG_PM */
+#else /* !CONFIG_PM */
+static inline void sh7372_a3sp_init(void) {}
+#endif /* !CONFIG_PM */
 #if defined(CONFIG_SUSPEND) || defined(CONFIG_CPU_IDLE)
 static int sh7372_do_idle_core_standby(unsigned long unused)
@@ -402,22 +419,18 @@ static void sh7372_setup_a3sm(unsigned long msk, unsigned long msk2)
 #ifdef CONFIG_CPU_IDLE
-static void sh7372_cpuidle_setup(struct cpuidle_device *dev)
+static void sh7372_cpuidle_setup(struct cpuidle_driver *drv)
 {
-        struct cpuidle_state *state;
+        struct cpuidle_state *state = &drv->states[drv->state_count];
-        int i = dev->state_count;
-        state = &dev->states[i];
        snprintf(state->name, CPUIDLE_NAME_LEN, "C2");
        strncpy(state->desc, "Core Standby Mode", CPUIDLE_DESC_LEN);
        state->exit_latency = 10;
        state->target_residency = 20 + 10;
-        state->power_usage = 1; /* perhaps not */
+        state->flags = CPUIDLE_FLAG_TIME_VALID;
-        state->flags = 0;
+        shmobile_cpuidle_modes[drv->state_count] = sh7372_enter_core_standby;
-        state->flags |= CPUIDLE_FLAG_TIME_VALID;
-        shmobile_cpuidle_modes[i] = sh7372_enter_core_standby;
-        dev->state_count = i + 1;
+        drv->state_count++;
 }
 static void sh7372_cpuidle_init(void)
@@ -469,6 +482,8 @@ void __init sh7372_pm_init(void)
        /* do not convert A3SM, A3SP, A3SG, A4R power down into A4S */
        __raw_writel(0, PDNSEL);
+        sh7372_a3sp_init();
        sh7372_suspend_init();
        sh7372_cpuidle_init();
 }
diff --git a/arch/arm/mach-shmobile/pm_runtime.c b/arch/arm/mach-shmobile/pm_runtime.c
deleted file mode 100644
index bd5c6a3b8c55..000000000000
--- a/arch/arm/mach-shmobile/pm_runtime.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * arch/arm/mach-shmobile/pm_runtime.c
- *
- * Runtime PM support code for SuperH Mobile ARM
- *
- *  Copyright (C) 2009-2010 Magnus Damm
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/pm_runtime.h>
-#include <linux/pm_domain.h>
-#include <linux/pm_clock.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/sh_clk.h>
-#include <linux/bitmap.h>
-#include <linux/slab.h>
-#ifdef CONFIG_PM_RUNTIME
-static int default_platform_runtime_idle(struct device *dev)
-{
-        /* suspend synchronously to disable clocks immediately */
-        return pm_runtime_suspend(dev);
-}
-static struct dev_pm_domain default_pm_domain = {
-        .ops = {
-                .runtime_suspend = pm_clk_suspend,
-                .runtime_resume = pm_clk_resume,
-                .runtime_idle = default_platform_runtime_idle,
-                USE_PLATFORM_PM_SLEEP_OPS
-        },
-};
-#define DEFAULT_PM_DOMAIN_PTR   (&default_pm_domain)
-#else
-#define DEFAULT_PM_DOMAIN_PTR   NULL
-#endif /* CONFIG_PM_RUNTIME */
-static struct pm_clk_notifier_block platform_bus_notifier = {
-        .pm_domain = DEFAULT_PM_DOMAIN_PTR,
-        .con_ids = { NULL, },
-};
-static int __init sh_pm_runtime_init(void)
-{
-        pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
-        return 0;
-}
-core_initcall(sh_pm_runtime_init);
-static int __init sh_pm_runtime_late_init(void)
-{
-        pm_genpd_poweroff_unused();
-        return 0;
-}
-late_initcall(sh_pm_runtime_late_init);
diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt.c
index d368f8dafcfd..74743ad3d2d3 100644
--- a/arch/arm/mach-tegra/board-dt.c
+++ b/arch/arm/mach-tegra/board-dt.c
@@ -101,6 +101,13 @@ static void __init tegra_dt_init(void)
        tegra_clk_init_from_table(tegra_dt_clk_init_table);
+        /*
+         * Finished with the static registrations now; fill in the missing
+         * devices
+         */
+        of_platform_populate(NULL, tegra_dt_match_table,
+                                tegra20_auxdata_lookup, NULL);
        for (i = 0; i < ARRAY_SIZE(pinmux_configs); i++) {
                if (of_machine_is_compatible(pinmux_configs[i].machine)) {
                        pinmux_configs[i].init();
@@ -110,12 +117,6 @@ static void __init tegra_dt_init(void)
        WARN(i == ARRAY_SIZE(pinmux_configs),
                "Unknown platform! Pinmuxing not initialized\n");
-        /*
-         * Finished with the static registrations now; fill in the missing
-         * devices
-         */
-        of_platform_populate(NULL, tegra_dt_match_table, tegra20_auxdata_lookup, NULL);
 }
 static const char * tegra_dt_board_compat[] = {
diff --git a/arch/arm/mach-tegra/board-harmony-pinmux.c b/arch/arm/mach-tegra/board-harmony-pinmux.c
index e99b45618cd0..7a4a26d5174c 100644
--- a/arch/arm/mach-tegra/board-harmony-pinmux.c
+++ b/arch/arm/mach-tegra/board-harmony-pinmux.c
@@ -16,6 +16,8 @@
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <linux/of.h>
 #include <mach/pinmux.h>
 #include "gpio-names.h"
@@ -161,7 +163,9 @@ static struct tegra_gpio_table gpio_table[] = {
 void harmony_pinmux_init(void)
 {
-        platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));
+        if (!of_machine_is_compatible("nvidia,tegra20"))
+                platform_add_devices(pinmux_devices,
+                                        ARRAY_SIZE(pinmux_devices));
        tegra_pinmux_config_table(harmony_pinmux, ARRAY_SIZE(harmony_pinmux));
diff --git a/arch/arm/mach-tegra/board-paz00-pinmux.c b/arch/arm/mach-tegra/board-paz00-pinmux.c
index fb20894862b0..be30e215f4b7 100644
--- a/arch/arm/mach-tegra/board-paz00-pinmux.c
+++ b/arch/arm/mach-tegra/board-paz00-pinmux.c
@@ -16,6 +16,8 @@
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <linux/of.h>
 #include <mach/pinmux.h>
 #include "gpio-names.h"
@@ -158,7 +160,9 @@ static struct tegra_gpio_table gpio_table[] = {
 void paz00_pinmux_init(void)
 {
-        platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));
+        if (!of_machine_is_compatible("nvidia,tegra20"))
+                platform_add_devices(pinmux_devices,
+                                        ARRAY_SIZE(pinmux_devices));
        tegra_pinmux_config_table(paz00_pinmux, ARRAY_SIZE(paz00_pinmux));
diff --git a/arch/arm/mach-tegra/board-seaboard-pinmux.c b/arch/arm/mach-tegra/board-seaboard-pinmux.c
index fbce31daa3c9..b1c2972f62fe 100644
--- a/arch/arm/mach-tegra/board-seaboard-pinmux.c
+++ b/arch/arm/mach-tegra/board-seaboard-pinmux.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
+#include <linux/of.h>
 #include <mach/pinmux.h>
 #include <mach/pinmux-t2.h>
@@ -191,6 +192,7 @@ static struct tegra_gpio_table common_gpio_table[] = {
        { .gpio = TEGRA_GPIO_SD2_POWER,         .enable = true },
        { .gpio = TEGRA_GPIO_LIDSWITCH,         .enable = true },
        { .gpio = TEGRA_GPIO_POWERKEY,          .enable = true },
+        { .gpio = TEGRA_GPIO_HP_DET,            .enable = true },
        { .gpio = TEGRA_GPIO_ISL29018_IRQ,      .enable = true },
        { .gpio = TEGRA_GPIO_CDC_IRQ,           .enable = true },
        { .gpio = TEGRA_GPIO_USB1,              .enable = true },
@@ -218,7 +220,9 @@ static void __init update_pinmux(struct tegra_pingroup_config *newtbl, int size)
 void __init seaboard_common_pinmux_init(void)
 {
-        platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));
+        if (!of_machine_is_compatible("nvidia,tegra20"))
+                platform_add_devices(pinmux_devices,
+                                        ARRAY_SIZE(pinmux_devices));
        tegra_pinmux_config_table(seaboard_pinmux, ARRAY_SIZE(seaboard_pinmux));
diff --git a/arch/arm/mach-tegra/board-trimslice-pinmux.c b/arch/arm/mach-tegra/board-trimslice-pinmux.c
index 4969dd28a04c..7ab719d46da0 100644
--- a/arch/arm/mach-tegra/board-trimslice-pinmux.c
+++ b/arch/arm/mach-tegra/board-trimslice-pinmux.c
@@ -16,6 +16,7 @@
 #include <linux/gpio.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/of.h>
 #include <mach/pinmux.h>
@@ -157,7 +158,9 @@ static struct tegra_gpio_table gpio_table[] = {
 void __init trimslice_pinmux_init(void)
 {
-        platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));
+        if (!of_machine_is_compatible("nvidia,tegra20"))
+                platform_add_devices(pinmux_devices,
+                                        ARRAY_SIZE(pinmux_devices));
        tegra_pinmux_config_table(trimslice_pinmux, ARRAY_SIZE(trimslice_pinmux));
        tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table));
 }
diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c
index 7a1fa6adb7c3..5b0c38abacc1 100644
--- a/arch/arm/mach-w90x900/dev.c
+++ b/arch/arm/mach-w90x900/dev.c
@@ -422,7 +422,7 @@ struct platform_device nuc900_device_kpi = {
 /* LCD controller*/
-static struct nuc900fb_display __initdata nuc900_lcd_info[] = {
+static struct nuc900fb_display nuc900_lcd_info[] = {
        /* Giantplus Technology GPM1040A0 320x240 Color TFT LCD */
        [0] = {
                .type           = LCM_DCCS_VA_SRC_RGB565,
@@ -445,7 +445,7 @@ static struct nuc900fb_display __initdata nuc900_lcd_info[] = {
        },
 };
-static struct nuc900fb_mach_info nuc900_fb_info __initdata = {
+static struct nuc900fb_mach_info nuc900_fb_info = {
 #if defined(CONFIG_GPM1040A0_320X240)
        .displays               = &nuc900_lcd_info[0],
 #else
diff --git a/arch/arm/mach-w90x900/include/mach/mfp.h b/arch/arm/mach-w90x900/include/mach/mfp.h
index 94c0e71617c6..23ef1f573abd 100644
--- a/arch/arm/mach-w90x900/include/mach/mfp.h
+++ b/arch/arm/mach-w90x900/include/mach/mfp.h
@@ -19,6 +19,7 @@
 extern void mfp_set_groupf(struct device *dev);
 extern void mfp_set_groupc(struct device *dev);
 extern void mfp_set_groupi(struct device *dev);
-extern void mfp_set_groupg(struct device *dev);
+extern void mfp_set_groupg(struct device *dev, const char *subname);
+extern void mfp_set_groupd(struct device *dev, const char *subname);
 #endif /* __ASM_ARCH_MFP_H */
diff --git a/arch/arm/mach-w90x900/include/mach/nuc900_spi.h b/arch/arm/mach-w90x900/include/mach/nuc900_spi.h
index bd94819e314f..2c4e0c128501 100644
--- a/arch/arm/mach-w90x900/include/mach/nuc900_spi.h
+++ b/arch/arm/mach-w90x900/include/mach/nuc900_spi.h
@@ -14,7 +14,7 @@
 #ifndef __ASM_ARCH_SPI_H
 #define __ASM_ARCH_SPI_H
-extern void mfp_set_groupg(struct device *dev);
+extern void mfp_set_groupg(struct device *dev, const char *subname);
 struct nuc900_spi_info {
        unsigned int num_cs;
diff --git a/arch/arm/mach-w90x900/mfp.c b/arch/arm/mach-w90x900/mfp.c
index fb7fb627b1a5..9dd74612bb87 100644
--- a/arch/arm/mach-w90x900/mfp.c
+++ b/arch/arm/mach-w90x900/mfp.c
@@ -26,10 +26,8 @@
 #define REG_MFSEL       (W90X900_VA_GCR + 0xC)
 #define GPSELF          (0x01 << 1)
 #define GPSELC          (0x03 << 2)
-#define ENKPI           (0x02 << 2)
+#define GPSELD          (0x0f << 4)
-#define ENNAND          (0x01 << 2)
 #define GPSELEI0        (0x01 << 26)
 #define GPSELEI1        (0x01 << 27)
@@ -37,11 +35,16 @@
 #define GPIOG0TO1       (0x03 << 14)
 #define GPIOG2TO3       (0x03 << 16)
 #define GPIOG22TO23     (0x03 << 22)
+#define GPIOG18TO20     (0x07 << 18)
 #define ENSPI           (0x0a << 14)
 #define ENI2C0          (0x01 << 14)
 #define ENI2C1          (0x01 << 16)
 #define ENAC97          (0x02 << 22)
+#define ENSD1           (0x02 << 18)
+#define ENSD0           (0x0a << 4)
+#define ENKPI           (0x02 << 2)
+#define ENNAND          (0x01 << 2)
 static DEFINE_MUTEX(mfp_mutex);
@@ -127,16 +130,19 @@ void mfp_set_groupi(struct device *dev)
 }
 EXPORT_SYMBOL(mfp_set_groupi);
-void mfp_set_groupg(struct device *dev)
+void mfp_set_groupg(struct device *dev, const char *subname)
 {
        unsigned long mfpen;
        const char *dev_id;
-        BUG_ON(!dev);
+        BUG_ON((!dev) && (!subname));
        mutex_lock(&mfp_mutex);
-        dev_id = dev_name(dev);
+        if (subname != NULL)
+                dev_id = subname;
+        else
+                dev_id = dev_name(dev);
        mfpen = __raw_readl(REG_MFSEL);
@@ -152,6 +158,9 @@ void mfp_set_groupg(struct device *dev)
        } else if (strcmp(dev_id, "nuc900-audio") == 0) {
                mfpen &= ~(GPIOG22TO23);
                mfpen |= ENAC97;/*enable AC97*/
+        } else if (strcmp(dev_id, "nuc900-mmc-port1") == 0) {
+                mfpen &= ~(GPIOG18TO20);
+                mfpen |= (ENSD1 | 0x01);/*enable sd1*/
        } else {
                mfpen &= ~(GPIOG0TO1 | GPIOG2TO3);/*GPIOG[3:0]*/
        }
@@ -162,3 +171,30 @@ void mfp_set_groupg(struct device *dev)
 }
 EXPORT_SYMBOL(mfp_set_groupg);
+void mfp_set_groupd(struct device *dev, const char *subname)
+{
+        unsigned long mfpen;
+        const char *dev_id;
+        BUG_ON((!dev) && (!subname));
+        mutex_lock(&mfp_mutex);
+        if (subname != NULL)
+                dev_id = subname;
+        else
+                dev_id = dev_name(dev);
+        mfpen = __raw_readl(REG_MFSEL);
+        if (strcmp(dev_id, "nuc900-mmc-port0") == 0) {
+                mfpen &= ~GPSELD;/*enable sd0*/
+                mfpen |= ENSD0;
+        } else
+                mfpen &= (~GPSELD);
+        __raw_writel(mfpen, REG_MFSEL);
+        mutex_unlock(&mfp_mutex);
+}
+EXPORT_SYMBOL(mfp_set_groupd);
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index a08a95107a63..b3a1f2b3ada3 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -10,7 +10,7 @@ choice
 config ARCH_IMX_V4_V5
        bool "i.MX1, i.MX21, i.MX25, i.MX27"
-        select AUTO_ZRELADDR
+        select AUTO_ZRELADDR if !ZBOOT_ROM
        select ARM_PATCH_PHYS_VIRT
        help
          This enables support for systems based on the Freescale i.MX ARMv4
@@ -26,7 +26,7 @@ config ARCH_IMX_V6_V7
 config ARCH_MX5
        bool "i.MX50, i.MX51, i.MX53"
-        select AUTO_ZRELADDR
+        select AUTO_ZRELADDR if !ZBOOT_ROM
        select ARM_PATCH_PHYS_VIRT
        help
          This enables support for machines using Freescale's i.MX50 and i.MX53
diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c
index 8875fb415f68..55f15699a383 100644
--- a/arch/arm/plat-mxc/avic.c
+++ b/arch/arm/plat-mxc/avic.c
@@ -22,6 +22,7 @@
 #include <linux/io.h>
 #include <mach/common.h>
 #include <asm/mach/irq.h>
+#include <asm/exception.h>
 #include <mach/hardware.h>
 #include "irq-common.h"
diff --git a/arch/arm/plat-mxc/gic.c b/arch/arm/plat-mxc/gic.c
index b3b8eed263b8..12f8f8109010 100644
--- a/arch/arm/plat-mxc/gic.c
+++ b/arch/arm/plat-mxc/gic.c
@@ -28,21 +28,14 @@ asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)
                if (irqnr == 1023)
                        break;
-                if (irqnr > 29 && irqnr < 1021)
+                if (irqnr > 15 && irqnr < 1021)
                        handle_IRQ(irqnr, regs);
 #ifdef CONFIG_SMP
-                else if (irqnr < 16) {
+                else {
                        writel_relaxed(irqstat, gic_cpu_base_addr +
                                                GIC_CPU_EOI);
                        handle_IPI(irqnr, regs);
                }
 #endif
-#ifdef CONFIG_LOCAL_TIMERS
-                else if (irqnr == 29) {
-                        writel_relaxed(irqstat, gic_cpu_base_addr +
-                                                GIC_CPU_EOI);
-                        handle_local_timer(regs);
-                }
-#endif
        } while (1);
 }
diff --git a/arch/arm/plat-mxc/include/mach/entry-macro.S b/arch/arm/plat-mxc/include/mach/entry-macro.S
index 9fe0dfcf4e7e..ca5cf26a04b1 100644
--- a/arch/arm/plat-mxc/include/mach/entry-macro.S
+++ b/arch/arm/plat-mxc/include/mach/entry-macro.S
@@ -25,6 +25,3 @@
        .macro test_for_ipi, irqnr, irqstat, base, tmp
        .endm
-        .macro test_for_ltirq, irqnr, irqstat, base, tmp
-        .endm
diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c
index e993a184189a..a3c164c7ba82 100644
--- a/arch/arm/plat-mxc/tzic.c
+++ b/arch/arm/plat-mxc/tzic.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <asm/mach/irq.h>
+#include <asm/exception.h>
 #include <mach/hardware.h>
 #include <mach/common.h>
diff --git a/arch/blackfin/include/asm/bfin_serial.h b/arch/blackfin/include/asm/bfin_serial.h
index 7fd0ec7b5b0f..ecacdf34768b 100644
--- a/arch/blackfin/include/asm/bfin_serial.h
+++ b/arch/blackfin/include/asm/bfin_serial.h
@@ -32,6 +32,8 @@ struct work_struct;
 struct bfin_serial_port {
        struct uart_port port;
        unsigned int old_status;
+        int tx_irq;
+        int rx_irq;
        int status_irq;
 #ifndef BFIN_UART_BF54X_STYLE
        unsigned int lsr;
diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c
index 1082e49f7a9f..d1c0c0cff3ef 100644
--- a/arch/blackfin/mach-bf518/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf518/boards/ezbrd.c
@@ -373,8 +373,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -416,8 +421,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c b/arch/blackfin/mach-bf518/boards/tcm-bf518.c
index 55c127908815..5470bf89e52e 100644
--- a/arch/blackfin/mach-bf518/boards/tcm-bf518.c
+++ b/arch/blackfin/mach-bf518/boards/tcm-bf518.c
@@ -309,8 +309,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -352,8 +357,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c
index 8d65d476f118..5bc6938157ad 100644
--- a/arch/blackfin/mach-bf527/boards/ad7160eval.c
+++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c
@@ -381,8 +381,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -424,8 +429,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index 6410fc1af8ed..cd289698b4dd 100644
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -8,6 +8,7 @@
 */
 #include <linux/device.h>
+#include <linux/export.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -539,8 +540,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -582,8 +588,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -801,7 +812,6 @@ static struct platform_device bfin_sport1_uart_device = {
 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
-#include <linux/export.h>
 static struct gpio_keys_button bfin_gpio_keys_table[] = {
        {BTN_0, GPIO_PF14, 1, "gpio-keys: BTN0"},
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
index 64f7278aba53..9f792eafd1cc 100644
--- a/arch/blackfin/mach-bf527/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c
@@ -7,6 +7,7 @@
 */
 #include <linux/device.h>
+#include <linux/export.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -417,8 +418,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -460,8 +466,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -674,7 +685,6 @@ static struct platform_device bfin_sport1_uart_device = {
 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
-#include <linux/export.h>
 static struct gpio_keys_button bfin_gpio_keys_table[] = {
        {BTN_0, GPIO_PG0, 1, "gpio-keys: BTN0"},
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index e4c6a122b66c..3ecafff5d2ef 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -711,8 +711,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -754,8 +759,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c b/arch/blackfin/mach-bf527/boards/tll6527m.c
index 76dbc03a8d4d..3a92c4318d2d 100644
--- a/arch/blackfin/mach-bf527/boards/tll6527m.c
+++ b/arch/blackfin/mach-bf527/boards/tll6527m.c
@@ -496,8 +496,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -540,8 +545,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c
index 5da5787fc4ef..47cadd316e76 100644
--- a/arch/blackfin/mach-bf533/boards/H8606.c
+++ b/arch/blackfin/mach-bf533/boards/H8606.c
@@ -238,8 +238,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX + 1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c
index b0ec825fb4ec..18817d57c7a1 100644
--- a/arch/blackfin/mach-bf533/boards/blackstamp.c
+++ b/arch/blackfin/mach-bf533/boards/blackstamp.c
@@ -193,8 +193,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX + 1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c
index 14f54a31e74c..2c8f30ef6a7b 100644
--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c
+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -221,8 +221,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX + 1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index ecd2801f050d..144556e14499 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -292,8 +292,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX + 1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf533/boards/ip0x.c b/arch/blackfin/mach-bf533/boards/ip0x.c
index fbee77fa9211..b597d4e50d58 100644
--- a/arch/blackfin/mach-bf533/boards/ip0x.c
+++ b/arch/blackfin/mach-bf533/boards/ip0x.c
@@ -151,8 +151,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX + 1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 964a8e5f79b4..2afd02e14bd1 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -298,8 +298,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX + 1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
index 1471c51ea697..604a430038e1 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
@@ -8,6 +8,7 @@
 */
 #include <linux/device.h>
+#include <linux/export.h>
 #include <linux/etherdevice.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
@@ -305,8 +306,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -366,8 +372,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -569,7 +580,6 @@ static struct platform_device bfin_sport1_uart_device = {
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
 #include <linux/bfin_mac.h>
-#include <linux/export.h>
 static const unsigned short bfin_mac_peripherals[] = P_MII0;
 static struct bfin_phydev_platform_data bfin_phydev_data[] = {
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
index 47cf37de33ba..d916b46a44fe 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
@@ -9,6 +9,7 @@
 #include <linux/device.h>
 #include <linux/etherdevice.h>
+#include <linux/export.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -306,8 +307,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -349,8 +355,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -534,7 +545,6 @@ static struct platform_device bfin_sport1_uart_device = {
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
 #include <linux/bfin_mac.h>
-#include <linux/export.h>
 static const unsigned short bfin_mac_peripherals[] = P_MII0;
 static struct bfin_phydev_platform_data bfin_phydev_data[] = {
diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
index 33e69e427e98..5f307228be63 100644
--- a/arch/blackfin/mach-bf537/boards/dnp5370.c
+++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
@@ -12,6 +12,7 @@
 */
 #include <linux/device.h>
+#include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
@@ -49,7 +50,6 @@ static struct platform_device rtc_device = {
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
 #include <linux/bfin_mac.h>
-#include <linux/export.h>
 static const unsigned short bfin_mac_peripherals[] = P_RMII0;
 static struct bfin_phydev_platform_data bfin_phydev_data[] = {
@@ -237,8 +237,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -281,8 +286,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end   = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end   = IRQ_UART1_RX+1,
+                .end   = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c
index c62f9dccd9f7..3901dd093b90 100644
--- a/arch/blackfin/mach-bf537/boards/minotaur.c
+++ b/arch/blackfin/mach-bf537/boards/minotaur.c
@@ -240,8 +240,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -283,8 +288,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 3099e91114fc..aebd31c845f0 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -8,6 +8,7 @@
 #include <linux/device.h>
 #include <linux/etherdevice.h>
+#include <linux/export.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -309,8 +310,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -352,8 +358,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 27f955db9976..7fbb0bbf8676 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -7,6 +7,7 @@
 */
 #include <linux/device.h>
+#include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
@@ -1566,8 +1567,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -1621,8 +1627,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -1992,7 +2003,6 @@ static struct adp8870_backlight_platform_data adp8870_pdata = {
 #if defined(CONFIG_BACKLIGHT_ADP8860) || defined(CONFIG_BACKLIGHT_ADP8860_MODULE)
 #include <linux/i2c/adp8860.h>
-#include <linux/export.h>
 static struct led_info adp8860_leds[] = {
        {
                .name = "adp8860-led7",
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index 841803038d6f..6917ce2fa55e 100644
--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@ -9,6 +9,7 @@
 #include <linux/device.h>
 #include <linux/etherdevice.h>
+#include <linux/export.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -306,8 +307,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -349,8 +355,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -536,7 +547,6 @@ static struct platform_device bfin_sport1_uart_device = {
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
 #include <linux/bfin_mac.h>
-#include <linux/export.h>
 static const unsigned short bfin_mac_peripherals[] = P_MII0;
 static struct bfin_phydev_platform_data bfin_phydev_data[] = {
diff --git a/arch/blackfin/mach-bf538/boards/ezkit.c b/arch/blackfin/mach-bf538/boards/ezkit.c
index 629f3c333415..8356eb599f19 100644
--- a/arch/blackfin/mach-bf538/boards/ezkit.c
+++ b/arch/blackfin/mach-bf538/boards/ezkit.c
@@ -49,8 +49,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -104,8 +109,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -147,8 +157,13 @@ static struct resource bfin_uart2_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART2_TX,
+                .end = IRQ_UART2_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART2_RX,
-                .end = IRQ_UART2_RX+1,
+                .end = IRQ_UART2_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c
index 212b9e0a08c8..0350eacec21b 100644
--- a/arch/blackfin/mach-bf548/boards/cm_bf548.c
+++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c
@@ -135,8 +135,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -178,8 +183,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -237,8 +247,13 @@ static struct resource bfin_uart2_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART2_TX,
+                .end = IRQ_UART2_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART2_RX,
-                .end = IRQ_UART2_RX+1,
+                .end = IRQ_UART2_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -280,8 +295,13 @@ static struct resource bfin_uart3_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART3_TX,
+                .end = IRQ_UART3_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART3_RX,
-                .end = IRQ_UART3_RX+1,
+                .end = IRQ_UART3_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index cd9cbb68de69..bb868ac0fe2d 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -241,8 +241,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART0_TX,
+                .end = IRQ_UART0_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART0_RX,
-                .end = IRQ_UART0_RX+1,
+                .end = IRQ_UART0_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -284,8 +289,13 @@ static struct resource bfin_uart1_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART1_TX,
+                .end = IRQ_UART1_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART1_RX,
-                .end = IRQ_UART1_RX+1,
+                .end = IRQ_UART1_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -343,8 +353,13 @@ static struct resource bfin_uart2_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART2_TX,
+                .end = IRQ_UART2_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART2_RX,
-                .end = IRQ_UART2_RX+1,
+                .end = IRQ_UART2_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
@@ -386,8 +401,13 @@ static struct resource bfin_uart3_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART3_TX,
+                .end = IRQ_UART3_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART3_RX,
-                .end = IRQ_UART3_RX+1,
+                .end = IRQ_UART3_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
index 972e1347c6bc..b1b7339b6ba7 100644
--- a/arch/blackfin/mach-bf561/boards/acvilon.c
+++ b/arch/blackfin/mach-bf561/boards/acvilon.c
@@ -203,8 +203,13 @@ static struct resource bfin_uart0_resources[] = {
         .flags = IORESOURCE_MEM,
         },
        {
+         .start = IRQ_UART_TX,
+         .end = IRQ_UART_TX,
+         .flags = IORESOURCE_IRQ,
+         },
+        {
         .start = IRQ_UART_RX,
-         .end = IRQ_UART_RX + 1,
+         .end = IRQ_UART_RX,
         .flags = IORESOURCE_IRQ,
         },
        {
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index c1b72f2d6354..c017cf07ed4e 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -277,8 +277,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART_TX,
+                .end = IRQ_UART_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART_RX,
-                .end = IRQ_UART_RX+1,
+                .end = IRQ_UART_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 9490dc800ca5..27f22ed381d9 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -172,8 +172,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART_TX,
+                .end = IRQ_UART_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART_RX,
-                .end = IRQ_UART_RX+1,
+                .end = IRQ_UART_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/blackfin/mach-bf561/boards/tepla.c b/arch/blackfin/mach-bf561/boards/tepla.c
index bb056e60f6ed..1a57bc986aad 100644
--- a/arch/blackfin/mach-bf561/boards/tepla.c
+++ b/arch/blackfin/mach-bf561/boards/tepla.c
@@ -51,8 +51,13 @@ static struct resource bfin_uart0_resources[] = {
                .flags = IORESOURCE_MEM,
        },
        {
+                .start = IRQ_UART_TX,
+                .end = IRQ_UART_TX,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
                .start = IRQ_UART_RX,
-                .end = IRQ_UART_RX+1,
+                .end = IRQ_UART_RX,
                .flags = IORESOURCE_IRQ,
        },
        {
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index 32d90867a984..5f2cdb3e428c 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -3,7 +3,7 @@ if ETRAX_ARCH_V10
 config ETRAX_ETHERNET
        bool "Ethernet support"
        depends on ETRAX_ARCH_V10
-        select NET_ETHERNET
+        select ETHERNET
        select NET_CORE
        select MII
        help
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index e47e9c3401b0..de43aadcdbc4 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -3,7 +3,7 @@ if ETRAX_ARCH_V32
 config ETRAX_ETHERNET
        bool "Ethernet support"
        depends on ETRAX_ARCH_V32
-        select NET_ETHERNET
+        select ETHERNET
        select NET_CORE
        select MII
        help
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 6c28582fb98f..361d54019bb0 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -4,8 +4,8 @@ config M68K
        select HAVE_IDE
        select HAVE_AOUT if MMU
        select GENERIC_ATOMIC64 if MMU
-        select HAVE_GENERIC_HARDIRQS if !MMU
+        select HAVE_GENERIC_HARDIRQS
-        select GENERIC_IRQ_SHOW if !MMU
+        select GENERIC_IRQ_SHOW
        select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
 config RWSEM_GENERIC_SPINLOCK
diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus
index 8294f0c1785e..3adb499584fb 100644
--- a/arch/m68k/Kconfig.bus
+++ b/arch/m68k/Kconfig.bus
@@ -2,6 +2,15 @@ if MMU
 comment "Bus Support"
+config DIO
+        bool "DIO bus support"
+        depends on HP300
+        default y
+        help
+          Say Y here to enable support for the "DIO" expansion bus used in
+          HP300 machines. If you are using such a system you almost certainly
+          want this.
 config NUBUS
        bool
        depends on MAC
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index d214034be6a6..6033f5d4e67e 100644
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -24,6 +24,37 @@ config PROC_HARDWARE
          including the model, CPU, MMU, clock speed, BogoMIPS rating,
          and memory size.
+config NATFEAT
+        bool "ARAnyM emulator support"
+        depends on ATARI
+        help
+          This option enables support for ARAnyM native features, such as
+          access to a disk image as /dev/hda.
+config NFBLOCK
+        tristate "NatFeat block device support"
+        depends on BLOCK && NATFEAT
+        help
+          Say Y to include support for the ARAnyM NatFeat block device
+          which allows direct access to the hard drives without using
+          the hardware emulation.
+config NFCON
+        tristate "NatFeat console driver"
+        depends on NATFEAT
+        help
+          Say Y to include support for the ARAnyM NatFeat console driver
+          which allows the console output to be redirected to the stderr
+          output of ARAnyM.
+config NFETH
+        tristate "NatFeat Ethernet support"
+        depends on ETHERNET && NATFEAT
+        help
+          Say Y to include support for the ARAnyM NatFeat network device
+          which will emulate a regular ethernet device while presenting an
+          ethertap device to the host system.
 endmenu
 menu "Character devices"
diff --git a/arch/m68k/amiga/amiints.c b/arch/m68k/amiga/amiints.c
index c5b5212cc3f9..47b5f90002ab 100644
--- a/arch/m68k/amiga/amiints.c
+++ b/arch/m68k/amiga/amiints.c
@@ -1,43 +1,15 @@
 /*
- * linux/arch/m68k/amiga/amiints.c -- Amiga Linux interrupt handling code
+ * Amiga Linux interrupt handling code
 *
 * This file is subject to the terms and conditions of the GNU General Public
 * License.  See the file COPYING in the main directory of this archive
 * for more details.
- *
- * 11/07/96: rewritten interrupt handling, irq lists are exists now only for
- *           this sources where it makes sense (VERTB/PORTS/EXTER) and you must
- *           be careful that dev_id for this sources is unique since this the
- *           only possibility to distinguish between different handlers for
- *           free_irq. irq lists also have different irq flags:
- *           - IRQ_FLG_FAST: handler is inserted at top of list (after other
- *                           fast handlers)
- *           - IRQ_FLG_SLOW: handler is inserted at bottom of list and before
- *                           they're executed irq level is set to the previous
- *                           one, but handlers don't need to be reentrant, if
- *                           reentrance occurred, slow handlers will be just
- *                           called again.
- *           The whole interrupt handling for CIAs is moved to cia.c
- *           /Roman Zippel
- *
- * 07/08/99: rewamp of the interrupt handling - we now have two types of
- *           interrupts, normal and fast handlers, fast handlers being
- *           marked with IRQF_DISABLED and runs with all other interrupts
- *           disabled. Normal interrupts disable their own source but
- *           run with all other interrupt sources enabled.
- *           PORTS and EXTER interrupts are always shared even if the
- *           drivers do not explicitly mark this when calling
- *           request_irq which they really should do.
- *           This is similar to the way interrupts are handled on all
- *           other architectures and makes a ton of sense besides
- *           having the advantage of making it easier to share
- *           drivers.
- *           /Jes
 */
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
+#include <linux/irq.h>
 #include <asm/irq.h>
 #include <asm/traps.h>
@@ -45,56 +17,6 @@
 #include <asm/amigaints.h>
 #include <asm/amipcmcia.h>
-static void amiga_enable_irq(unsigned int irq);
-static void amiga_disable_irq(unsigned int irq);
-static irqreturn_t ami_int1(int irq, void *dev_id);
-static irqreturn_t ami_int3(int irq, void *dev_id);
-static irqreturn_t ami_int4(int irq, void *dev_id);
-static irqreturn_t ami_int5(int irq, void *dev_id);
-static struct irq_controller amiga_irq_controller = {
-        .name           = "amiga",
-        .lock           = __SPIN_LOCK_UNLOCKED(amiga_irq_controller.lock),
-        .enable         = amiga_enable_irq,
-        .disable        = amiga_disable_irq,
-};
-/*
- * void amiga_init_IRQ(void)
- *
- * Parameters:  None
- *
- * Returns:     Nothing
- *
- * This function should be called during kernel startup to initialize
- * the amiga IRQ handling routines.
- */
-void __init amiga_init_IRQ(void)
-{
-        if (request_irq(IRQ_AUTO_1, ami_int1, 0, "int1", NULL))
-                pr_err("Couldn't register int%d\n", 1);
-        if (request_irq(IRQ_AUTO_3, ami_int3, 0, "int3", NULL))
-                pr_err("Couldn't register int%d\n", 3);
-        if (request_irq(IRQ_AUTO_4, ami_int4, 0, "int4", NULL))
-                pr_err("Couldn't register int%d\n", 4);
-        if (request_irq(IRQ_AUTO_5, ami_int5, 0, "int5", NULL))
-                pr_err("Couldn't register int%d\n", 5);
-        m68k_setup_irq_controller(&amiga_irq_controller, IRQ_USER, AMI_STD_IRQS);
-        /* turn off PCMCIA interrupts */
-        if (AMIGAHW_PRESENT(PCMCIA))
-                gayle.inten = GAYLE_IRQ_IDE;
-        /* turn off all interrupts and enable the master interrupt bit */
-        amiga_custom.intena = 0x7fff;
-        amiga_custom.intreq = 0x7fff;
-        amiga_custom.intena = IF_SETCLR | IF_INTEN;
-        cia_init_IRQ(&ciaa_base);
-        cia_init_IRQ(&ciab_base);
-}
 /*
 * Enable/disable a particular machine specific interrupt source.
@@ -103,112 +25,150 @@ void __init amiga_init_IRQ(void)
 * internal data, that may not be changed by the interrupt at the same time.
 */
-static void amiga_enable_irq(unsigned int irq)
+static void amiga_irq_enable(struct irq_data *data)
 {
-        amiga_custom.intena = IF_SETCLR | (1 << (irq - IRQ_USER));
+        amiga_custom.intena = IF_SETCLR | (1 << (data->irq - IRQ_USER));
 }
-static void amiga_disable_irq(unsigned int irq)
+static void amiga_irq_disable(struct irq_data *data)
 {
-        amiga_custom.intena = 1 << (irq - IRQ_USER);
+        amiga_custom.intena = 1 << (data->irq - IRQ_USER);
 }
+static struct irq_chip amiga_irq_chip = {
+        .name           = "amiga",
+        .irq_enable     = amiga_irq_enable,
+        .irq_disable    = amiga_irq_disable,
+};
 /*
 * The builtin Amiga hardware interrupt handlers.
 */
-static irqreturn_t ami_int1(int irq, void *dev_id)
+static void ami_int1(unsigned int irq, struct irq_desc *desc)
 {
        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
        /* if serial transmit buffer empty, interrupt */
        if (ints & IF_TBE) {
                amiga_custom.intreq = IF_TBE;
-                m68k_handle_int(IRQ_AMIGA_TBE);
+                generic_handle_irq(IRQ_AMIGA_TBE);
        }
        /* if floppy disk transfer complete, interrupt */
        if (ints & IF_DSKBLK) {
                amiga_custom.intreq = IF_DSKBLK;
-                m68k_handle_int(IRQ_AMIGA_DSKBLK);
+                generic_handle_irq(IRQ_AMIGA_DSKBLK);
        }
        /* if software interrupt set, interrupt */
        if (ints & IF_SOFT) {
                amiga_custom.intreq = IF_SOFT;
-                m68k_handle_int(IRQ_AMIGA_SOFT);
+                generic_handle_irq(IRQ_AMIGA_SOFT);
        }
-        return IRQ_HANDLED;
 }
-static irqreturn_t ami_int3(int irq, void *dev_id)
+static void ami_int3(unsigned int irq, struct irq_desc *desc)
 {
        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
        /* if a blitter interrupt */
        if (ints & IF_BLIT) {
                amiga_custom.intreq = IF_BLIT;
-                m68k_handle_int(IRQ_AMIGA_BLIT);
+                generic_handle_irq(IRQ_AMIGA_BLIT);
        }
        /* if a copper interrupt */
        if (ints & IF_COPER) {
                amiga_custom.intreq = IF_COPER;
-                m68k_handle_int(IRQ_AMIGA_COPPER);
+                generic_handle_irq(IRQ_AMIGA_COPPER);
        }
        /* if a vertical blank interrupt */
        if (ints & IF_VERTB) {
                amiga_custom.intreq = IF_VERTB;
-                m68k_handle_int(IRQ_AMIGA_VERTB);
+                generic_handle_irq(IRQ_AMIGA_VERTB);
        }
-        return IRQ_HANDLED;
 }
-static irqreturn_t ami_int4(int irq, void *dev_id)
+static void ami_int4(unsigned int irq, struct irq_desc *desc)
 {
        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
        /* if audio 0 interrupt */
        if (ints & IF_AUD0) {
                amiga_custom.intreq = IF_AUD0;
-                m68k_handle_int(IRQ_AMIGA_AUD0);
+                generic_handle_irq(IRQ_AMIGA_AUD0);
        }
        /* if audio 1 interrupt */
        if (ints & IF_AUD1) {
                amiga_custom.intreq = IF_AUD1;
-                m68k_handle_int(IRQ_AMIGA_AUD1);
+                generic_handle_irq(IRQ_AMIGA_AUD1);
        }
        /* if audio 2 interrupt */
        if (ints & IF_AUD2) {
                amiga_custom.intreq = IF_AUD2;
-                m68k_handle_int(IRQ_AMIGA_AUD2);
+                generic_handle_irq(IRQ_AMIGA_AUD2);
        }
        /* if audio 3 interrupt */
        if (ints & IF_AUD3) {
                amiga_custom.intreq = IF_AUD3;
-                m68k_handle_int(IRQ_AMIGA_AUD3);
+                generic_handle_irq(IRQ_AMIGA_AUD3);
        }
-        return IRQ_HANDLED;
 }
-static irqreturn_t ami_int5(int irq, void *dev_id)
+static void ami_int5(unsigned int irq, struct irq_desc *desc)
 {
        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
        /* if serial receive buffer full interrupt */
        if (ints & IF_RBF) {
                /* acknowledge of IF_RBF must be done by the serial interrupt */
-                m68k_handle_int(IRQ_AMIGA_RBF);
+                generic_handle_irq(IRQ_AMIGA_RBF);
        }
        /* if a disk sync interrupt */
        if (ints & IF_DSKSYN) {
                amiga_custom.intreq = IF_DSKSYN;
-                m68k_handle_int(IRQ_AMIGA_DSKSYN);
+                generic_handle_irq(IRQ_AMIGA_DSKSYN);
        }
-        return IRQ_HANDLED;
+}
+/*
+ * void amiga_init_IRQ(void)
+ *
+ * Parameters:  None
+ *
+ * Returns:     Nothing
+ *
+ * This function should be called during kernel startup to initialize
+ * the amiga IRQ handling routines.
+ */
+void __init amiga_init_IRQ(void)
+{
+        m68k_setup_irq_controller(&amiga_irq_chip, handle_simple_irq, IRQ_USER,
+                                  AMI_STD_IRQS);
+        irq_set_chained_handler(IRQ_AUTO_1, ami_int1);
+        irq_set_chained_handler(IRQ_AUTO_3, ami_int3);
+        irq_set_chained_handler(IRQ_AUTO_4, ami_int4);
+        irq_set_chained_handler(IRQ_AUTO_5, ami_int5);
+        /* turn off PCMCIA interrupts */
+        if (AMIGAHW_PRESENT(PCMCIA))
+                gayle.inten = GAYLE_IRQ_IDE;
+        /* turn off all interrupts and enable the master interrupt bit */
+        amiga_custom.intena = 0x7fff;
+        amiga_custom.intreq = 0x7fff;
+        amiga_custom.intena = IF_SETCLR | IF_INTEN;
+        cia_init_IRQ(&ciaa_base);
+        cia_init_IRQ(&ciab_base);
 }
diff --git a/arch/m68k/amiga/cia.c b/arch/m68k/amiga/cia.c
index ecd0f7ca6f0e..18c0e29976e3 100644
--- a/arch/m68k/amiga/cia.c
+++ b/arch/m68k/amiga/cia.c
@@ -93,13 +93,14 @@ static irqreturn_t cia_handler(int irq, void *dev_id)
        amiga_custom.intreq = base->int_mask;
        for (; ints; mach_irq++, ints >>= 1) {
                if (ints & 1)
-                        m68k_handle_int(mach_irq);
+                        generic_handle_irq(mach_irq);
        }
        return IRQ_HANDLED;
 }
-static void cia_enable_irq(unsigned int irq)
+static void cia_irq_enable(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        unsigned char mask;
        if (irq >= IRQ_AMIGA_CIAB) {
@@ -113,19 +114,20 @@ static void cia_enable_irq(unsigned int irq)
        }
 }
-static void cia_disable_irq(unsigned int irq)
+static void cia_irq_disable(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        if (irq >= IRQ_AMIGA_CIAB)
                cia_able_irq(&ciab_base, 1 << (irq - IRQ_AMIGA_CIAB));
        else
                cia_able_irq(&ciaa_base, 1 << (irq - IRQ_AMIGA_CIAA));
 }
-static struct irq_controller cia_irq_controller = {
+static struct irq_chip cia_irq_chip = {
        .name           = "cia",
-        .lock           = __SPIN_LOCK_UNLOCKED(cia_irq_controller.lock),
+        .irq_enable     = cia_irq_enable,
-        .enable         = cia_enable_irq,
+        .irq_disable    = cia_irq_disable,
-        .disable        = cia_disable_irq,
 };
 /*
@@ -134,9 +136,9 @@ static struct irq_controller cia_irq_controller = {
 * into this chain.
 */
-static void auto_enable_irq(unsigned int irq)
+static void auto_irq_enable(struct irq_data *data)
 {
-        switch (irq) {
+        switch (data->irq) {
        case IRQ_AUTO_2:
                amiga_custom.intena = IF_SETCLR | IF_PORTS;
                break;
@@ -146,9 +148,9 @@ static void auto_enable_irq(unsigned int irq)
        }
 }
-static void auto_disable_irq(unsigned int irq)
+static void auto_irq_disable(struct irq_data *data)
 {
-        switch (irq) {
+        switch (data->irq) {
        case IRQ_AUTO_2:
                amiga_custom.intena = IF_PORTS;
                break;
@@ -158,24 +160,25 @@ static void auto_disable_irq(unsigned int irq)
        }
 }
-static struct irq_controller auto_irq_controller = {
+static struct irq_chip auto_irq_chip = {
        .name           = "auto",
-        .lock           = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
+        .irq_enable     = auto_irq_enable,
-        .enable         = auto_enable_irq,
+        .irq_disable    = auto_irq_disable,
-        .disable        = auto_disable_irq,
 };
 void __init cia_init_IRQ(struct ciabase *base)
 {
-        m68k_setup_irq_controller(&cia_irq_controller, base->cia_irq, CIA_IRQS);
+        m68k_setup_irq_controller(&cia_irq_chip, handle_simple_irq,
+                                  base->cia_irq, CIA_IRQS);
        /* clear any pending interrupt and turn off all interrupts */
        cia_set_irq(base, CIA_ICR_ALL);
        cia_able_irq(base, CIA_ICR_ALL);
        /* override auto int and install CIA handler */
-        m68k_setup_irq_controller(&auto_irq_controller, base->handler_irq, 1);
+        m68k_setup_irq_controller(&auto_irq_chip, handle_simple_irq,
-        m68k_irq_startup(base->handler_irq);
+                                  base->handler_irq, 1);
+        m68k_irq_startup_irq(base->handler_irq);
        if (request_irq(base->handler_irq, cia_handler, IRQF_SHARED,
                        base->name, base))
                pr_err("Couldn't register %s interrupt\n", base->name);
diff --git a/arch/m68k/apollo/dn_ints.c b/arch/m68k/apollo/dn_ints.c
index 5d47f3aa3810..17be1e7e2df2 100644
--- a/arch/m68k/apollo/dn_ints.c
+++ b/arch/m68k/apollo/dn_ints.c
@@ -1,19 +1,13 @@
 #include <linux/interrupt.h>
+#include <linux/irq.h>
-#include <asm/irq.h>
 #include <asm/traps.h>
 #include <asm/apollohw.h>
-void dn_process_int(unsigned int irq, struct pt_regs *fp)
+unsigned int apollo_irq_startup(struct irq_data *data)
 {
-        __m68k_handle_int(irq, fp);
+        unsigned int irq = data->irq;
-        *(volatile unsigned char *)(pica)=0x20;
-        *(volatile unsigned char *)(picb)=0x20;
-}
-int apollo_irq_startup(unsigned int irq)
-{
        if (irq < 8)
                *(volatile unsigned char *)(pica+1) &= ~(1 << irq);
        else
@@ -21,24 +15,33 @@ int apollo_irq_startup(unsigned int irq)
        return 0;
 }
-void apollo_irq_shutdown(unsigned int irq)
+void apollo_irq_shutdown(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        if (irq < 8)
                *(volatile unsigned char *)(pica+1) |= (1 << irq);
        else
                *(volatile unsigned char *)(picb+1) |= (1 << (irq - 8));
 }
-static struct irq_controller apollo_irq_controller = {
+void apollo_irq_eoi(struct irq_data *data)
+{
+        *(volatile unsigned char *)(pica) = 0x20;
+        *(volatile unsigned char *)(picb) = 0x20;
+}
+static struct irq_chip apollo_irq_chip = {
        .name           = "apollo",
-        .lock           = __SPIN_LOCK_UNLOCKED(apollo_irq_controller.lock),
+        .irq_startup    = apollo_irq_startup,
-        .startup        = apollo_irq_startup,
+        .irq_shutdown   = apollo_irq_shutdown,
-        .shutdown       = apollo_irq_shutdown,
+        .irq_eoi        = apollo_irq_eoi,
 };
 void __init dn_init_IRQ(void)
 {
-        m68k_setup_user_interrupt(VEC_USER + 96, 16, dn_process_int);
+        m68k_setup_user_interrupt(VEC_USER + 96, 16);
-        m68k_setup_irq_controller(&apollo_irq_controller, IRQ_APOLLO, 16);
+        m68k_setup_irq_controller(&apollo_irq_chip, handle_fasteoi_irq,
+                                  IRQ_APOLLO, 16);
 }
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c
index 26a804e67bce..6d196dadfdbc 100644
--- a/arch/m68k/atari/ataints.c
+++ b/arch/m68k/atari/ataints.c
@@ -60,243 +60,7 @@
 * <asm/atariints.h>): Autovector interrupts are 1..7, then follow ST-MFP,
 * TT-MFP, SCC, and finally VME interrupts. Vector numbers for the latter can
 * be allocated by atari_register_vme_int().
- *
- * Each interrupt can be of three types:
- *
- *  - SLOW: The handler runs with all interrupts enabled, except the one it
- *    was called by (to avoid reentering). This should be the usual method.
- *    But it is currently possible only for MFP ints, since only the MFP
- *    offers an easy way to mask interrupts.
- *
- *  - FAST: The handler runs with all interrupts disabled. This should be used
- *    only for really fast handlers, that just do actions immediately
- *    necessary, and let the rest do a bottom half or task queue.
- *
- *  - PRIORITIZED: The handler can be interrupted by higher-level ints
- *    (greater IPL, no MFP priorities!). This is the method of choice for ints
- *    which should be slow, but are not from a MFP.
- *
- * The feature of more than one handler for one int source is still there, but
- * only applicable if all handers are of the same type. To not slow down
- * processing of ints with only one handler by the chaining feature, the list
- * calling function atari_call_irq_list() is only plugged in at the time the
- * second handler is registered.
- *
- * Implementation notes: For fast-as-possible int handling, there are separate
- * entry points for each type (slow/fast/prio). The assembler handler calls
- * the irq directly in the usual case, no C wrapper is involved. In case of
- * multiple handlers, atari_call_irq_list() is registered as handler and calls
- * in turn the real irq's. To ease access from assembler level to the irq
- * function pointer and accompanying data, these two are stored in a separate
- * array, irq_handler[]. The rest of data (type, name) are put into a second
- * array, irq_param, that is accessed from C only. For each slow interrupt (32
- * in all) there are separate handler functions, which makes it possible to
- * hard-code the MFP register address and value, are necessary to mask the
- * int. If there'd be only one generic function, lots of calculations would be
- * needed to determine MFP register and int mask from the vector number :-(
- *
- * Furthermore, slow ints may not lower the IPL below its previous value
- * (before the int happened). This is needed so that an int of class PRIO, on
- * that this int may be stacked, cannot be reentered. This feature is
- * implemented as follows: If the stack frame format is 1 (throwaway), the int
- * is not stacked, and the IPL is anded with 0xfbff, resulting in a new level
- * 2, which still blocks the HSYNC, but no interrupts of interest. If the
- * frame format is 0, the int is nested, and the old IPL value can be found in
- * the sr copy in the frame.
- */
-#if 0
-#define NUM_INT_SOURCES (8 + NUM_ATARI_SOURCES)
-typedef void (*asm_irq_handler)(void);
-struct irqhandler {
-        irqreturn_t (*handler)(int, void *, struct pt_regs *);
-        void    *dev_id;
-};
-struct irqparam {
-        unsigned long   flags;
-        const char      *devname;
-};
-/*
- * Array with irq's and their parameter data. This array is accessed from low
- * level assembler code, so an element size of 8 allows usage of index scaling
- * addressing mode.
 */
-static struct irqhandler irq_handler[NUM_INT_SOURCES];
-/*
- * This array hold the rest of parameters of int handlers: type
- * (slow,fast,prio) and the name of the handler. These values are only
- * accessed from C
- */
-static struct irqparam irq_param[NUM_INT_SOURCES];
-/* check for valid int number (complex, sigh...) */
-#define IS_VALID_INTNO(n)                                                                                       \
-        ((n) > 0 &&                                                                                                             \
-         /* autovec and ST-MFP ok anyway */                                                             \
-         (((n) < TTMFP_SOURCE_BASE) ||                                                                  \
-          /* TT-MFP ok if present */                                                                    \
-          ((n) >= TTMFP_SOURCE_BASE && (n) < SCC_SOURCE_BASE &&                 \
-           ATARIHW_PRESENT(TT_MFP)) ||                                                                  \
-          /* SCC ok if present and number even */                                               \
-          ((n) >= SCC_SOURCE_BASE && (n) < VME_SOURCE_BASE &&                   \
-           !((n) & 1) && ATARIHW_PRESENT(SCC)) ||                                               \
-          /* greater numbers ok if they are registered VME vectors */           \
-          ((n) >= VME_SOURCE_BASE && (n) < VME_SOURCE_BASE + VME_MAX_SOURCES && \
-                  free_vme_vec_bitmap & (1 << ((n) - VME_SOURCE_BASE)))))
-/*
- * Here start the assembler entry points for interrupts
- */
-#define IRQ_NAME(nr) atari_slow_irq_##nr##_handler(void)
-#define BUILD_SLOW_IRQ(n)                                                  \
-asmlinkage void IRQ_NAME(n);                                               \
-/* Dummy function to allow asm with operands.  */                          \
-void atari_slow_irq_##n##_dummy (void) {                                   \
-__asm__ (__ALIGN_STR "\n"                                                  \
-"atari_slow_irq_" #n "_handler:\t"                                         \
-"       addl    %6,%5\n"        /* preempt_count() += HARDIRQ_OFFSET */    \
-        SAVE_ALL_INT "\n"                                                  \
-        GET_CURRENT(%%d0) "\n"                                             \
-"       andb    #~(1<<(%c3&7)),%a4:w\n" /* mask this interrupt */          \
-        /* get old IPL from stack frame */                                 \
-"       bfextu  %%sp@(%c2){#5,#3},%%d0\n"                                  \
-"       movew   %%sr,%%d1\n"                                               \
-"       bfins   %%d0,%%d1{#21,#3}\n"                                       \
-"       movew   %%d1,%%sr\n"            /* set IPL = previous value */     \
-"       addql   #1,%a0\n"                                                  \
-"       lea     %a1,%%a0\n"                                                \
-"       pea     %%sp@\n"                /* push addr of frame */           \
-"       movel   %%a0@(4),%%sp@-\n"      /* push handler data */            \
-"       pea     (%c3+8)\n"              /* push int number */              \
-"       movel   %%a0@,%%a0\n"                                              \
-"       jbsr    %%a0@\n"                /* call the handler */             \
-"       addql   #8,%%sp\n"                                                 \
-"       addql   #4,%%sp\n"                                                 \
-"       orw     #0x0600,%%sr\n"                                            \
-"       andw    #0xfeff,%%sr\n"         /* set IPL = 6 again */            \
-"       orb     #(1<<(%c3&7)),%a4:w\n"  /* now unmask the int again */     \
-"       jbra    ret_from_interrupt\n"                                      \
-         : : "i" (&kstat_cpu(0).irqs[n+8]), "i" (&irq_handler[n+8]),       \
-             "n" (PT_OFF_SR), "n" (n),                                     \
-             "i" (n & 8 ? (n & 16 ? &tt_mfp.int_mk_a : &st_mfp.int_mk_a)   \
-                        : (n & 16 ? &tt_mfp.int_mk_b : &st_mfp.int_mk_b)), \
-             "m" (preempt_count()), "di" (HARDIRQ_OFFSET)                  \
-);                                                                         \
-        for (;;);                       /* fake noreturn */                \
-}
-BUILD_SLOW_IRQ(0);
-BUILD_SLOW_IRQ(1);
-BUILD_SLOW_IRQ(2);
-BUILD_SLOW_IRQ(3);
-BUILD_SLOW_IRQ(4);
-BUILD_SLOW_IRQ(5);
-BUILD_SLOW_IRQ(6);
-BUILD_SLOW_IRQ(7);
-BUILD_SLOW_IRQ(8);
-BUILD_SLOW_IRQ(9);
-BUILD_SLOW_IRQ(10);
-BUILD_SLOW_IRQ(11);
-BUILD_SLOW_IRQ(12);
-BUILD_SLOW_IRQ(13);
-BUILD_SLOW_IRQ(14);
-BUILD_SLOW_IRQ(15);
-BUILD_SLOW_IRQ(16);
-BUILD_SLOW_IRQ(17);
-BUILD_SLOW_IRQ(18);
-BUILD_SLOW_IRQ(19);
-BUILD_SLOW_IRQ(20);
-BUILD_SLOW_IRQ(21);
-BUILD_SLOW_IRQ(22);
-BUILD_SLOW_IRQ(23);
-BUILD_SLOW_IRQ(24);
-BUILD_SLOW_IRQ(25);
-BUILD_SLOW_IRQ(26);
-BUILD_SLOW_IRQ(27);
-BUILD_SLOW_IRQ(28);
-BUILD_SLOW_IRQ(29);
-BUILD_SLOW_IRQ(30);
-BUILD_SLOW_IRQ(31);
-asm_irq_handler slow_handlers[32] = {
-        [0]     = atari_slow_irq_0_handler,
-        [1]     = atari_slow_irq_1_handler,
-        [2]     = atari_slow_irq_2_handler,
-        [3]     = atari_slow_irq_3_handler,
-        [4]     = atari_slow_irq_4_handler,
-        [5]     = atari_slow_irq_5_handler,
-        [6]     = atari_slow_irq_6_handler,
-        [7]     = atari_slow_irq_7_handler,
-        [8]     = atari_slow_irq_8_handler,
-        [9]     = atari_slow_irq_9_handler,
-        [10]    = atari_slow_irq_10_handler,
-        [11]    = atari_slow_irq_11_handler,
-        [12]    = atari_slow_irq_12_handler,
-        [13]    = atari_slow_irq_13_handler,
-        [14]    = atari_slow_irq_14_handler,
-        [15]    = atari_slow_irq_15_handler,
-        [16]    = atari_slow_irq_16_handler,
-        [17]    = atari_slow_irq_17_handler,
-        [18]    = atari_slow_irq_18_handler,
-        [19]    = atari_slow_irq_19_handler,
-        [20]    = atari_slow_irq_20_handler,
-        [21]    = atari_slow_irq_21_handler,
-        [22]    = atari_slow_irq_22_handler,
-        [23]    = atari_slow_irq_23_handler,
-        [24]    = atari_slow_irq_24_handler,
-        [25]    = atari_slow_irq_25_handler,
-        [26]    = atari_slow_irq_26_handler,
-        [27]    = atari_slow_irq_27_handler,
-        [28]    = atari_slow_irq_28_handler,
-        [29]    = atari_slow_irq_29_handler,
-        [30]    = atari_slow_irq_30_handler,
-        [31]    = atari_slow_irq_31_handler
-};
-asmlinkage void atari_fast_irq_handler( void );
-asmlinkage void atari_prio_irq_handler( void );
-/* Dummy function to allow asm with operands.  */
-void atari_fast_prio_irq_dummy (void) {
-__asm__ (__ALIGN_STR "\n"
-"atari_fast_irq_handler:\n\t"
-        "orw    #0x700,%%sr\n"          /* disable all interrupts */
-"atari_prio_irq_handler:\n\t"
-        "addl   %3,%2\n\t"              /* preempt_count() += HARDIRQ_OFFSET */
-        SAVE_ALL_INT "\n\t"
-        GET_CURRENT(%%d0) "\n\t"
-        /* get vector number from stack frame and convert to source */
-        "bfextu %%sp@(%c1){#4,#10},%%d0\n\t"
-        "subw   #(0x40-8),%%d0\n\t"
-        "jpl    1f\n\t"
-        "addw   #(0x40-8-0x18),%%d0\n"
-    "1:\tlea    %a0,%%a0\n\t"
-        "addql  #1,%%a0@(%%d0:l:4)\n\t"
-        "lea    irq_handler,%%a0\n\t"
-        "lea    %%a0@(%%d0:l:8),%%a0\n\t"
-        "pea    %%sp@\n\t"              /* push frame address */
-        "movel  %%a0@(4),%%sp@-\n\t"    /* push handler data */
-        "movel  %%d0,%%sp@-\n\t"        /* push int number */
-        "movel  %%a0@,%%a0\n\t"
-        "jsr    %%a0@\n\t"              /* and call the handler */
-        "addql  #8,%%sp\n\t"
-        "addql  #4,%%sp\n\t"
-        "jbra   ret_from_interrupt"
-         : : "i" (&kstat_cpu(0).irqs), "n" (PT_OFF_FORMATVEC),
-             "m" (preempt_count()), "di" (HARDIRQ_OFFSET)
-);
-        for (;;);
-}
-#endif
 /*
 * Bitmap for free interrupt vector numbers
@@ -320,31 +84,44 @@ extern void atari_microwire_cmd(int cmd);
 extern int atari_SCC_reset_done;
-static int atari_startup_irq(unsigned int irq)
+static unsigned int atari_irq_startup(struct irq_data *data)
 {
-        m68k_irq_startup(irq);
+        unsigned int irq = data->irq;
+        m68k_irq_startup(data);
        atari_turnon_irq(irq);
        atari_enable_irq(irq);
        return 0;
 }
-static void atari_shutdown_irq(unsigned int irq)
+static void atari_irq_shutdown(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        atari_disable_irq(irq);
        atari_turnoff_irq(irq);
-        m68k_irq_shutdown(irq);
+        m68k_irq_shutdown(data);
        if (irq == IRQ_AUTO_4)
            vectors[VEC_INT4] = falcon_hblhandler;
 }
-static struct irq_controller atari_irq_controller = {
+static void atari_irq_enable(struct irq_data *data)
+{
+        atari_enable_irq(data->irq);
+}
+static void atari_irq_disable(struct irq_data *data)
+{
+        atari_disable_irq(data->irq);
+}
+static struct irq_chip atari_irq_chip = {
        .name           = "atari",
-        .lock           = __SPIN_LOCK_UNLOCKED(atari_irq_controller.lock),
+        .irq_startup    = atari_irq_startup,
-        .startup        = atari_startup_irq,
+        .irq_shutdown   = atari_irq_shutdown,
-        .shutdown       = atari_shutdown_irq,
+        .irq_enable     = atari_irq_enable,
-        .enable         = atari_enable_irq,
+        .irq_disable    = atari_irq_disable,
-        .disable        = atari_disable_irq,
 };
 /*
@@ -360,8 +137,9 @@ static struct irq_controller atari_irq_controller = {
 void __init atari_init_IRQ(void)
 {
-        m68k_setup_user_interrupt(VEC_USER, NUM_ATARI_SOURCES - IRQ_USER, NULL);
+        m68k_setup_user_interrupt(VEC_USER, NUM_ATARI_SOURCES - IRQ_USER);
-        m68k_setup_irq_controller(&atari_irq_controller, 1, NUM_ATARI_SOURCES - 1);
+        m68k_setup_irq_controller(&atari_irq_chip, handle_simple_irq, 1,
+                                  NUM_ATARI_SOURCES - 1);
        /* Initialize the MFP(s) */
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index 1edd95095cb4..81286476f740 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -86,7 +86,7 @@ static void bvme6000_get_model(char *model)
 */
 static void __init bvme6000_init_IRQ(void)
 {
-        m68k_setup_user_interrupt(VEC_USER, 192, NULL);
+        m68k_setup_user_interrupt(VEC_USER, 192);
 }
 void __init config_bvme6000(void)
diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c
index f6312c7d8727..c87fe69b0728 100644
--- a/arch/m68k/hp300/time.c
+++ b/arch/m68k/hp300/time.c
@@ -70,7 +70,7 @@ void __init hp300_sched_init(irq_handler_t vector)
  asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));
-  if (request_irq(IRQ_AUTO_6, hp300_tick, IRQ_FLG_STD, "timer tick", vector))
+  if (request_irq(IRQ_AUTO_6, hp300_tick, 0, "timer tick", vector))
    pr_err("Couldn't register timer interrupt\n");
  out_8(CLOCKBASE + CLKCR2, 0x1);               /* select CR1 */
diff --git a/arch/m68k/include/asm/hardirq.h b/arch/m68k/include/asm/hardirq.h
index 870e5347155b..db30ed276878 100644
--- a/arch/m68k/include/asm/hardirq.h
+++ b/arch/m68k/include/asm/hardirq.h
@@ -18,6 +18,11 @@
 #ifdef CONFIG_MMU
+static inline void ack_bad_irq(unsigned int irq)
+{
+        pr_crit("unexpected IRQ trap at vector %02x\n", irq);
+}
 /* entry.S is sensitive to the offsets of these fields */
 typedef struct {
        unsigned int __softirq_pending;
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
index 69ed0d74d532..6198df5ff245 100644
--- a/arch/m68k/include/asm/irq.h
+++ b/arch/m68k/include/asm/irq.h
@@ -27,11 +27,6 @@
 #ifdef CONFIG_MMU
-#include <linux/linkage.h>
-#include <linux/hardirq.h>
-#include <linux/irqreturn.h>
-#include <linux/spinlock_types.h>
 /*
 * Interrupt source definitions
 * General interrupt sources are the level 1-7.
@@ -54,10 +49,6 @@
 #define IRQ_USER        8
-extern unsigned int irq_canonicalize(unsigned int irq);
-struct pt_regs;
 /*
 * various flags for request_irq() - the Amiga now uses the standard
 * mechanism like all other architectures - IRQF_DISABLED and
@@ -71,57 +62,27 @@ struct pt_regs;
 #define IRQ_FLG_STD     (0x8000)        /* internally used              */
 #endif
-/*
+struct irq_data;
- * This structure is used to chain together the ISRs for a particular
+struct irq_chip;
- * interrupt source (if it supports chaining).
+struct irq_desc;
- */
+extern unsigned int m68k_irq_startup(struct irq_data *data);
-typedef struct irq_node {
+extern unsigned int m68k_irq_startup_irq(unsigned int irq);
-        irqreturn_t     (*handler)(int, void *);
+extern void m68k_irq_shutdown(struct irq_data *data);
-        void            *dev_id;
+extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int,
-        struct irq_node *next;
+                                                      struct pt_regs *));
-        unsigned long   flags;
+extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt);
-        const char      *devname;
+extern void m68k_setup_irq_controller(struct irq_chip *,
-} irq_node_t;
+                                      void (*handle)(unsigned int irq,
+                                                     struct irq_desc *desc),
-/*
+                                      unsigned int irq, unsigned int cnt);
- * This structure has only 4 elements for speed reasons
- */
-struct irq_handler {
-        int             (*handler)(int, void *);
-        unsigned long   flags;
-        void            *dev_id;
-        const char      *devname;
-};
-struct irq_controller {
-        const char *name;
-        spinlock_t lock;
-        int (*startup)(unsigned int irq);
-        void (*shutdown)(unsigned int irq);
-        void (*enable)(unsigned int irq);
-        void (*disable)(unsigned int irq);
-};
-extern int m68k_irq_startup(unsigned int);
-extern void m68k_irq_shutdown(unsigned int);
-/*
- * This function returns a new irq_node_t
- */
-extern irq_node_t *new_irq_node(void);
-extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *));
+extern unsigned int irq_canonicalize(unsigned int irq);
-extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
-                                      void (*handler)(unsigned int, struct pt_regs *));
-extern void m68k_setup_irq_controller(struct irq_controller *, unsigned int, unsigned int);
-asmlinkage void m68k_handle_int(unsigned int);
-asmlinkage void __m68k_handle_int(unsigned int, struct pt_regs *);
 #else
 #define irq_canonicalize(irq)  (irq)
 #endif /* CONFIG_MMU */
 asmlinkage void do_IRQ(int irq, struct pt_regs *regs);
+extern atomic_t irq_err_count;
 #endif /* _M68K_IRQ_H_ */
diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h
index c2a1c5eac1a6..12ebe43b008b 100644
--- a/arch/m68k/include/asm/macintosh.h
+++ b/arch/m68k/include/asm/macintosh.h
@@ -12,6 +12,8 @@ extern void mac_reset(void);
 extern void mac_poweroff(void);
 extern void mac_init_IRQ(void);
 extern int mac_irq_pending(unsigned int);
+extern void mac_irq_enable(struct irq_data *data);
+extern void mac_irq_disable(struct irq_data *data);
 /*
 *      Floppy driver magic hook - probably shouldn't be here
diff --git a/arch/m68k/include/asm/q40ints.h b/arch/m68k/include/asm/q40ints.h
index 3d970afb708f..22f12c9eb910 100644
--- a/arch/m68k/include/asm/q40ints.h
+++ b/arch/m68k/include/asm/q40ints.h
@@ -24,6 +24,3 @@
 #define Q40_IRQ10_MASK       (1<<5)
 #define Q40_IRQ14_MASK       (1<<6)
 #define Q40_IRQ15_MASK       (1<<7)
-extern unsigned long q40_probe_irq_on (void);
-extern int q40_probe_irq_off (unsigned long irqs);
diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile
index e7f0f2e5ad44..c5696193281a 100644
--- a/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
@@ -6,16 +6,15 @@ extra-$(CONFIG_MMU)	:= head.o
 extra-$(CONFIG_SUN3)    := sun3-head.o
 extra-y                 += vmlinux.lds
-obj-y   := entry.o m68k_ksyms.o module.o process.o ptrace.o setup.o signal.o \
+obj-y   := entry.o irq.o m68k_ksyms.o module.o process.o ptrace.o setup.o \
-           sys_m68k.o syscalltable.o time.o traps.o
+           signal.o sys_m68k.o syscalltable.o time.o traps.o
-obj-$(CONFIG_MMU)       += ints.o devres.o vectors.o
+obj-$(CONFIG_MMU)       += ints.o vectors.o
-devres-$(CONFIG_MMU)    = ../../../kernel/irq/devres.o
 ifndef CONFIG_MMU_SUN3
 obj-y                   += dma.o
 endif
 ifndef CONFIG_MMU
-obj-y                   += init_task.o irq.o
+obj-y                   += init_task.o
 endif
diff --git a/arch/m68k/kernel/entry_mm.S b/arch/m68k/kernel/entry_mm.S
index bd0ec05263b2..c713f514843d 100644
--- a/arch/m68k/kernel/entry_mm.S
+++ b/arch/m68k/kernel/entry_mm.S
@@ -48,7 +48,7 @@
 .globl sys_fork, sys_clone, sys_vfork
 .globl ret_from_interrupt, bad_interrupt
 .globl auto_irqhandler_fixup
-.globl user_irqvec_fixup, user_irqhandler_fixup
+.globl user_irqvec_fixup
 .text
 ENTRY(buserr)
@@ -207,7 +207,7 @@ ENTRY(auto_inthandler)
        movel   %sp,%sp@-
        movel   %d0,%sp@-               |  put vector # on stack
 auto_irqhandler_fixup = . + 2
-        jsr     __m68k_handle_int       |  process the IRQ
+        jsr     do_IRQ                  |  process the IRQ
        addql   #8,%sp                  |  pop parameters off stack
 ret_from_interrupt:
@@ -240,8 +240,7 @@ user_irqvec_fixup = . + 2
        movel   %sp,%sp@-
        movel   %d0,%sp@-               |  put vector # on stack
-user_irqhandler_fixup = . + 2
+        jsr     do_IRQ                  |  process the IRQ
-        jsr     __m68k_handle_int       |  process the IRQ
        addql   #8,%sp                  |  pop parameters off stack
        subqb   #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 761ee0440c99..74fefac00899 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -4,25 +4,6 @@
 * This file is subject to the terms and conditions of the GNU General Public
 * License.  See the file COPYING in the main directory of this archive
 * for more details.
- *
- * 07/03/96: Timer initialization, and thus mach_sched_init(),
- *           removed from request_irq() and moved to init_time().
- *           We should therefore consider renaming our add_isr() and
- *           remove_isr() to request_irq() and free_irq()
- *           respectively, so they are compliant with the other
- *           architectures.                                     /Jes
- * 11/07/96: Changed all add_/remove_isr() to request_/free_irq() calls.
- *           Removed irq list support, if any machine needs an irq server
- *           it must implement this itself (as it's already done), instead
- *           only default handler are used with mach_default_handler.
- *           request_irq got some flags different from other architectures:
- *           - IRQ_FLG_REPLACE : Replace an existing handler (the default one
- *                               can be replaced without this flag)
- *           - IRQ_FLG_LOCK : handler can't be replaced
- *           There are other machine depending flags, see there
- *           If you want to replace a default handler you should know what
- *           you're doing, since it might handle different other irq sources
- *           which must be served                               /Roman Zippel
 */
 #include <linux/module.h>
@@ -47,33 +28,22 @@
 #endif
 extern u32 auto_irqhandler_fixup[];
-extern u32 user_irqhandler_fixup[];
 extern u16 user_irqvec_fixup[];
-/* table for system interrupt handlers */
-static struct irq_node *irq_list[NR_IRQS];
-static struct irq_controller *irq_controller[NR_IRQS];
-static int irq_depth[NR_IRQS];
 static int m68k_first_user_vec;
-static struct irq_controller auto_irq_controller = {
+static struct irq_chip auto_irq_chip = {
        .name           = "auto",
-        .lock           = __SPIN_LOCK_UNLOCKED(auto_irq_controller.lock),
+        .irq_startup    = m68k_irq_startup,
-        .startup        = m68k_irq_startup,
+        .irq_shutdown   = m68k_irq_shutdown,
-        .shutdown       = m68k_irq_shutdown,
 };
-static struct irq_controller user_irq_controller = {
+static struct irq_chip user_irq_chip = {
        .name           = "user",
-        .lock           = __SPIN_LOCK_UNLOCKED(user_irq_controller.lock),
+        .irq_startup    = m68k_irq_startup,
-        .startup        = m68k_irq_startup,
+        .irq_shutdown   = m68k_irq_shutdown,
-        .shutdown       = m68k_irq_shutdown,
 };
-#define NUM_IRQ_NODES 100
-static irq_node_t nodes[NUM_IRQ_NODES];
 /*
 * void init_IRQ(void)
 *
@@ -96,7 +66,7 @@ void __init init_IRQ(void)
        }
        for (i = IRQ_AUTO_1; i <= IRQ_AUTO_7; i++)
-                irq_controller[i] = &auto_irq_controller;
+                irq_set_chip_and_handler(i, &auto_irq_chip, handle_simple_irq);
        mach_init_IRQ();
 }
@@ -106,7 +76,7 @@ void __init init_IRQ(void)
 * @handler: called from auto vector interrupts
 *
 * setup the handler to be called from auto vector interrupts instead of the
- * standard __m68k_handle_int(), it will be called with irq numbers in the range
+ * standard do_IRQ(), it will be called with irq numbers in the range
 * from IRQ_AUTO_1 - IRQ_AUTO_7.
 */
 void __init m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *))
@@ -120,217 +90,49 @@ void __init m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_re
 * m68k_setup_user_interrupt
 * @vec: first user vector interrupt to handle
 * @cnt: number of active user vector interrupts
- * @handler: called from user vector interrupts
 *
 * setup user vector interrupts, this includes activating the specified range
 * of interrupts, only then these interrupts can be requested (note: this is
- * different from auto vector interrupts). An optional handler can be installed
+ * different from auto vector interrupts).
- * to be called instead of the default __m68k_handle_int(), it will be called
- * with irq numbers starting from IRQ_USER.
 */
-void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
+void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt)
-                                      void (*handler)(unsigned int, struct pt_regs *))
 {
        int i;
        BUG_ON(IRQ_USER + cnt > NR_IRQS);
        m68k_first_user_vec = vec;
        for (i = 0; i < cnt; i++)
-                irq_controller[IRQ_USER + i] = &user_irq_controller;
+                irq_set_chip(IRQ_USER + i, &user_irq_chip);
        *user_irqvec_fixup = vec - IRQ_USER;
-        if (handler)
-                *user_irqhandler_fixup = (u32)handler;
        flush_icache();
 }
 /**
 * m68k_setup_irq_controller
- * @contr: irq controller which controls specified irq
+ * @chip: irq chip which controls specified irq
+ * @handle: flow handler which handles specified irq
 * @irq: first irq to be managed by the controller
+ * @cnt: number of irqs to be managed by the controller
 *
 * Change the controller for the specified range of irq, which will be used to
 * manage these irq. auto/user irq already have a default controller, which can
 * be changed as well, but the controller probably should use m68k_irq_startup/
 * m68k_irq_shutdown.
 */
-void m68k_setup_irq_controller(struct irq_controller *contr, unsigned int irq,
+void m68k_setup_irq_controller(struct irq_chip *chip,
+                               irq_flow_handler_t handle, unsigned int irq,
                               unsigned int cnt)
 {
        int i;
-        for (i = 0; i < cnt; i++)
+        for (i = 0; i < cnt; i++) {
-                irq_controller[irq + i] = contr;
+                irq_set_chip(irq + i, chip);
-}
+                if (handle)
+                        irq_set_handler(irq + i, handle);
-irq_node_t *new_irq_node(void)
-{
-        irq_node_t *node;
-        short i;
-        for (node = nodes, i = NUM_IRQ_NODES-1; i >= 0; node++, i--) {
-                if (!node->handler) {
-                        memset(node, 0, sizeof(*node));
-                        return node;
-                }
        }
-        printk ("new_irq_node: out of nodes\n");
-        return NULL;
 }
-int setup_irq(unsigned int irq, struct irq_node *node)
+unsigned int m68k_irq_startup_irq(unsigned int irq)
-{
-        struct irq_controller *contr;
-        struct irq_node **prev;
-        unsigned long flags;
-        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
-                printk("%s: Incorrect IRQ %d from %s\n",
-                       __func__, irq, node->devname);
-                return -ENXIO;
-        }
-        spin_lock_irqsave(&contr->lock, flags);
-        prev = irq_list + irq;
-        if (*prev) {
-                /* Can't share interrupts unless both agree to */
-                if (!((*prev)->flags & node->flags & IRQF_SHARED)) {
-                        spin_unlock_irqrestore(&contr->lock, flags);
-                        return -EBUSY;
-                }
-                while (*prev)
-                        prev = &(*prev)->next;
-        }
-        if (!irq_list[irq]) {
-                if (contr->startup)
-                        contr->startup(irq);
-                else
-                        contr->enable(irq);
-        }
-        node->next = NULL;
-        *prev = node;
-        spin_unlock_irqrestore(&contr->lock, flags);
-        return 0;
-}
-int request_irq(unsigned int irq,
-                irq_handler_t handler,
-                unsigned long flags, const char *devname, void *dev_id)
-{
-        struct irq_node *node;
-        int res;
-        node = new_irq_node();
-        if (!node)
-                return -ENOMEM;
-        node->handler = handler;
-        node->flags   = flags;
-        node->dev_id  = dev_id;
-        node->devname = devname;
-        res = setup_irq(irq, node);
-        if (res)
-                node->handler = NULL;
-        return res;
-}
-EXPORT_SYMBOL(request_irq);
-void free_irq(unsigned int irq, void *dev_id)
-{
-        struct irq_controller *contr;
-        struct irq_node **p, *node;
-        unsigned long flags;
-        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
-                printk("%s: Incorrect IRQ %d\n", __func__, irq);
-                return;
-        }
-        spin_lock_irqsave(&contr->lock, flags);
-        p = irq_list + irq;
-        while ((node = *p)) {
-                if (node->dev_id == dev_id)
-                        break;
-                p = &node->next;
-        }
-        if (node) {
-                *p = node->next;
-                node->handler = NULL;
-        } else
-                printk("%s: Removing probably wrong IRQ %d\n",
-                       __func__, irq);
-        if (!irq_list[irq]) {
-                if (contr->shutdown)
-                        contr->shutdown(irq);
-                else
-                        contr->disable(irq);
-        }
-        spin_unlock_irqrestore(&contr->lock, flags);
-}
-EXPORT_SYMBOL(free_irq);
-void enable_irq(unsigned int irq)
-{
-        struct irq_controller *contr;
-        unsigned long flags;
-        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
-                printk("%s: Incorrect IRQ %d\n",
-                       __func__, irq);
-                return;
-        }
-        spin_lock_irqsave(&contr->lock, flags);
-        if (irq_depth[irq]) {
-                if (!--irq_depth[irq]) {
-                        if (contr->enable)
-                                contr->enable(irq);
-                }
-        } else
-                WARN_ON(1);
-        spin_unlock_irqrestore(&contr->lock, flags);
-}
-EXPORT_SYMBOL(enable_irq);
-void disable_irq(unsigned int irq)
-{
-        struct irq_controller *contr;
-        unsigned long flags;
-        if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
-                printk("%s: Incorrect IRQ %d\n",
-                       __func__, irq);
-                return;
-        }
-        spin_lock_irqsave(&contr->lock, flags);
-        if (!irq_depth[irq]++) {
-                if (contr->disable)
-                        contr->disable(irq);
-        }
-        spin_unlock_irqrestore(&contr->lock, flags);
-}
-EXPORT_SYMBOL(disable_irq);
-void disable_irq_nosync(unsigned int irq) __attribute__((alias("disable_irq")));
-EXPORT_SYMBOL(disable_irq_nosync);
-int m68k_irq_startup(unsigned int irq)
 {
        if (irq <= IRQ_AUTO_7)
                vectors[VEC_SPUR + irq] = auto_inthandler;
@@ -339,41 +141,21 @@ int m68k_irq_startup(unsigned int irq)
        return 0;
 }
-void m68k_irq_shutdown(unsigned int irq)
+unsigned int m68k_irq_startup(struct irq_data *data)
 {
-        if (irq <= IRQ_AUTO_7)
+        return m68k_irq_startup_irq(data->irq);
-                vectors[VEC_SPUR + irq] = bad_inthandler;
-        else
-                vectors[m68k_first_user_vec + irq - IRQ_USER] = bad_inthandler;
 }
+void m68k_irq_shutdown(struct irq_data *data)
-/*
- * Do we need these probe functions on the m68k?
- *
- *  ... may be useful with ISA devices
- */
-unsigned long probe_irq_on (void)
 {
-#ifdef CONFIG_Q40
+        unsigned int irq = data->irq;
-        if (MACH_IS_Q40)
-                return q40_probe_irq_on();
-#endif
-        return 0;
-}
-EXPORT_SYMBOL(probe_irq_on);
+        if (irq <= IRQ_AUTO_7)
+                vectors[VEC_SPUR + irq] = bad_inthandler;
-int probe_irq_off (unsigned long irqs)
+        else
-{
+                vectors[m68k_first_user_vec + irq - IRQ_USER] = bad_inthandler;
-#ifdef CONFIG_Q40
-        if (MACH_IS_Q40)
-                return q40_probe_irq_off(irqs);
-#endif
-        return 0;
 }
-EXPORT_SYMBOL(probe_irq_off);
 unsigned int irq_canonicalize(unsigned int irq)
 {
@@ -386,52 +168,9 @@ unsigned int irq_canonicalize(unsigned int irq)
 EXPORT_SYMBOL(irq_canonicalize);
-asmlinkage void m68k_handle_int(unsigned int irq)
-{
-        struct irq_node *node;
-        kstat_cpu(0).irqs[irq]++;
-        node = irq_list[irq];
-        do {
-                node->handler(irq, node->dev_id);
-                node = node->next;
-        } while (node);
-}
-asmlinkage void __m68k_handle_int(unsigned int irq, struct pt_regs *regs)
-{
-        struct pt_regs *old_regs;
-        old_regs = set_irq_regs(regs);
-        m68k_handle_int(irq);
-        set_irq_regs(old_regs);
-}
 asmlinkage void handle_badint(struct pt_regs *regs)
 {
-        kstat_cpu(0).irqs[0]++;
+        atomic_inc(&irq_err_count);
-        printk("unexpected interrupt from %u\n", regs->vector);
+        pr_warn("unexpected interrupt from %u\n", regs->vector);
-}
-int show_interrupts(struct seq_file *p, void *v)
-{
-        struct irq_controller *contr;
-        struct irq_node *node;
-        int i = *(loff_t *) v;
-        /* autovector interrupts */
-        if (irq_list[i]) {
-                contr = irq_controller[i];
-                node = irq_list[i];
-                seq_printf(p, "%-8s %3u: %10u %s", contr->name, i, kstat_cpu(0).irqs[i], node->devname);
-                while ((node = node->next))
-                        seq_printf(p, ", %s", node->devname);
-                seq_puts(p, "\n");
-        }
-        return 0;
-}
-#ifdef CONFIG_PROC_FS
-void init_irq_proc(void)
-{
-        /* Insert /proc/irq driver here */
 }
-#endif
diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c
index 2a96bebd8969..b403924a1cad 100644
--- a/arch/m68k/mac/baboon.c
+++ b/arch/m68k/mac/baboon.c
@@ -11,6 +11,7 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <asm/traps.h>
 #include <asm/bootinfo.h>
@@ -20,9 +21,6 @@
 /* #define DEBUG_IRQS */
-extern void mac_enable_irq(unsigned int);
-extern void mac_disable_irq(unsigned int);
 int baboon_present;
 static volatile struct baboon *baboon;
 static unsigned char baboon_disabled;
@@ -53,7 +51,7 @@ void __init baboon_init(void)
 * Baboon interrupt handler. This works a lot like a VIA.
 */
-static irqreturn_t baboon_irq(int irq, void *dev_id)
+static void baboon_irq(unsigned int irq, struct irq_desc *desc)
 {
        int irq_bit, irq_num;
        unsigned char events;
@@ -64,15 +62,16 @@ static irqreturn_t baboon_irq(int irq, void *dev_id)
                (uint) baboon->mb_status);
 #endif
-        if (!(events = baboon->mb_ifr & 0x07))
+        events = baboon->mb_ifr & 0x07;
-                return IRQ_NONE;
+        if (!events)
+                return;
        irq_num = IRQ_BABOON_0;
        irq_bit = 1;
        do {
                if (events & irq_bit) {
                        baboon->mb_ifr &= ~irq_bit;
-                        m68k_handle_int(irq_num);
+                        generic_handle_irq(irq_num);
                }
                irq_bit <<= 1;
                irq_num++;
@@ -82,7 +81,6 @@ static irqreturn_t baboon_irq(int irq, void *dev_id)
        /* for now we need to smash all interrupts */
        baboon->mb_ifr &= ~events;
 #endif
-        return IRQ_HANDLED;
 }
 /*
@@ -92,8 +90,7 @@ static irqreturn_t baboon_irq(int irq, void *dev_id)
 void __init baboon_register_interrupts(void)
 {
        baboon_disabled = 0;
-        if (request_irq(IRQ_NUBUS_C, baboon_irq, 0, "baboon", (void *)baboon))
+        irq_set_chained_handler(IRQ_NUBUS_C, baboon_irq);
-                pr_err("Couldn't register baboon interrupt\n");
 }
 /*
@@ -111,7 +108,7 @@ void baboon_irq_enable(int irq)
        baboon_disabled &= ~(1 << irq_idx);
        if (!baboon_disabled)
-                mac_enable_irq(IRQ_NUBUS_C);
+                mac_irq_enable(irq_get_irq_data(IRQ_NUBUS_C));
 }
 void baboon_irq_disable(int irq)
@@ -124,7 +121,7 @@ void baboon_irq_disable(int irq)
        baboon_disabled |= 1 << irq_idx;
        if (baboon_disabled)
-                mac_disable_irq(IRQ_NUBUS_C);
+                mac_irq_disable(irq_get_irq_data(IRQ_NUBUS_C));
 }
 void baboon_irq_clear(int irq)
diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c
index 1ad4e9d80eba..a5462cc0bfd6 100644
--- a/arch/m68k/mac/iop.c
+++ b/arch/m68k/mac/iop.c
@@ -305,15 +305,13 @@ void __init iop_register_interrupts(void)
 {
        if (iop_ism_present) {
                if (oss_present) {
-                        if (request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq,
+                        if (request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq, 0,
-                                        IRQ_FLG_LOCK, "ISM IOP",
+                                        "ISM IOP", (void *)IOP_NUM_ISM))
-                                        (void *) IOP_NUM_ISM))
                                pr_err("Couldn't register ISM IOP interrupt\n");
                        oss_irq_enable(IRQ_MAC_ADB);
                } else {
-                        if (request_irq(IRQ_VIA2_0, iop_ism_irq,
+                        if (request_irq(IRQ_VIA2_0, iop_ism_irq, 0, "ISM IOP",
-                                        IRQ_FLG_LOCK|IRQ_FLG_FAST, "ISM IOP",
+                                        (void *)IOP_NUM_ISM))
-                                        (void *) IOP_NUM_ISM))
                                pr_err("Couldn't register ISM IOP interrupt\n");
                }
                if (!iop_alive(iop_base[IOP_NUM_ISM])) {
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index f92190c159b4..ba220b70ab8c 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -190,14 +190,10 @@ irqreturn_t mac_debug_handler(int, void *);
 /* #define DEBUG_MACINTS */
-void mac_enable_irq(unsigned int irq);
+static struct irq_chip mac_irq_chip = {
-void mac_disable_irq(unsigned int irq);
-static struct irq_controller mac_irq_controller = {
        .name           = "mac",
-        .lock           = __SPIN_LOCK_UNLOCKED(mac_irq_controller.lock),
+        .irq_enable     = mac_irq_enable,
-        .enable         = mac_enable_irq,
+        .irq_disable    = mac_irq_disable,
-        .disable        = mac_disable_irq,
 };
 void __init mac_init_IRQ(void)
@@ -205,7 +201,7 @@ void __init mac_init_IRQ(void)
 #ifdef DEBUG_MACINTS
        printk("mac_init_IRQ(): Setting things up...\n");
 #endif
-        m68k_setup_irq_controller(&mac_irq_controller, IRQ_USER,
+        m68k_setup_irq_controller(&mac_irq_chip, handle_simple_irq, IRQ_USER,
                                  NUM_MAC_SOURCES - IRQ_USER);
        /* Make sure the SONIC interrupt is cleared or things get ugly */
 #ifdef SHUTUP_SONIC
@@ -241,16 +237,17 @@ void __init mac_init_IRQ(void)
 }
 /*
- *  mac_enable_irq - enable an interrupt source
+ *  mac_irq_enable - enable an interrupt source
- * mac_disable_irq - disable an interrupt source
+ * mac_irq_disable - disable an interrupt source
 *   mac_clear_irq - clears a pending interrupt
- * mac_pending_irq - Returns the pending status of an IRQ (nonzero = pending)
+ * mac_irq_pending - returns the pending status of an IRQ (nonzero = pending)
 *
 * These routines are just dispatchers to the VIA/OSS/PSC routines.
 */
-void mac_enable_irq(unsigned int irq)
+void mac_irq_enable(struct irq_data *data)
 {
+        int irq = data->irq;
        int irq_src = IRQ_SRC(irq);
        switch(irq_src) {
@@ -283,8 +280,9 @@ void mac_enable_irq(unsigned int irq)
        }
 }
-void mac_disable_irq(unsigned int irq)
+void mac_irq_disable(struct irq_data *data)
 {
+        int irq = data->irq;
        int irq_src = IRQ_SRC(irq);
        switch(irq_src) {
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index a9c0f5ab4cc0..a4c82dab9ff1 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -19,6 +19,7 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <asm/bootinfo.h>
 #include <asm/macintosh.h>
@@ -29,10 +30,7 @@
 int oss_present;
 volatile struct mac_oss *oss;
-static irqreturn_t oss_irq(int, void *);
+extern void via1_irq(unsigned int irq, struct irq_desc *desc);
-static irqreturn_t oss_nubus_irq(int, void *);
-extern irqreturn_t via1_irq(int, void *);
 /*
 * Initialize the OSS
@@ -60,26 +58,6 @@ void __init oss_init(void)
 }
 /*
- * Register the OSS and NuBus interrupt dispatchers.
- */
-void __init oss_register_interrupts(void)
-{
-        if (request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK,
-                        "scsi", (void *) oss))
-                pr_err("Couldn't register %s interrupt\n", "scsi");
-        if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK,
-                        "nubus", (void *) oss))
-                pr_err("Couldn't register %s interrupt\n", "nubus");
-        if (request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK,
-                        "sound", (void *) oss))
-                pr_err("Couldn't register %s interrupt\n", "sound");
-        if (request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK,
-                        "via1", (void *) via1))
-                pr_err("Couldn't register %s interrupt\n", "via1");
-}
-/*
 * Initialize OSS for Nubus access
 */
@@ -92,17 +70,17 @@ void __init oss_nubus_init(void)
 * and SCSI; everything else is routed to its own autovector IRQ.
 */
-static irqreturn_t oss_irq(int irq, void *dev_id)
+static void oss_irq(unsigned int irq, struct irq_desc *desc)
 {
        int events;
        events = oss->irq_pending & (OSS_IP_SOUND|OSS_IP_SCSI);
        if (!events)
-                return IRQ_NONE;
+                return;
 #ifdef DEBUG_IRQS
        if ((console_loglevel == 10) && !(events & OSS_IP_SCSI)) {
-                printk("oss_irq: irq %d events = 0x%04X\n", irq,
+                printk("oss_irq: irq %u events = 0x%04X\n", irq,
                        (int) oss->irq_pending);
        }
 #endif
@@ -113,11 +91,10 @@ static irqreturn_t oss_irq(int irq, void *dev_id)
                /* FIXME: call sound handler */
        } else if (events & OSS_IP_SCSI) {
                oss->irq_pending &= ~OSS_IP_SCSI;
-                m68k_handle_int(IRQ_MAC_SCSI);
+                generic_handle_irq(IRQ_MAC_SCSI);
        } else {
                /* FIXME: error check here? */
        }
-        return IRQ_HANDLED;
 }
 /*
@@ -126,13 +103,13 @@ static irqreturn_t oss_irq(int irq, void *dev_id)
 * Unlike the VIA/RBV this is on its own autovector interrupt level.
 */
-static irqreturn_t oss_nubus_irq(int irq, void *dev_id)
+static void oss_nubus_irq(unsigned int irq, struct irq_desc *desc)
 {
        int events, irq_bit, i;
        events = oss->irq_pending & OSS_IP_NUBUS;
        if (!events)
-                return IRQ_NONE;
+                return;
 #ifdef DEBUG_NUBUS_INT
        if (console_loglevel > 7) {
@@ -148,10 +125,21 @@ static irqreturn_t oss_nubus_irq(int irq, void *dev_id)
                irq_bit >>= 1;
                if (events & irq_bit) {
                        oss->irq_pending &= ~irq_bit;
-                        m68k_handle_int(NUBUS_SOURCE_BASE + i);
+                        generic_handle_irq(NUBUS_SOURCE_BASE + i);
                }
        } while(events & (irq_bit - 1));
-        return IRQ_HANDLED;
+}
+/*
+ * Register the OSS and NuBus interrupt dispatchers.
+ */
+void __init oss_register_interrupts(void)
+{
+        irq_set_chained_handler(OSS_IRQLEV_SCSI, oss_irq);
+        irq_set_chained_handler(OSS_IRQLEV_NUBUS, oss_nubus_irq);
+        irq_set_chained_handler(OSS_IRQLEV_SOUND, oss_irq);
+        irq_set_chained_handler(OSS_IRQLEV_VIA1, via1_irq);
 }
 /*
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c
index a4c3eb60706e..e6c2d20f328d 100644
--- a/arch/m68k/mac/psc.c
+++ b/arch/m68k/mac/psc.c
@@ -18,6 +18,7 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <asm/traps.h>
 #include <asm/bootinfo.h>
@@ -30,8 +31,6 @@
 int psc_present;
 volatile __u8 *psc;
-irqreturn_t psc_irq(int, void *);
 /*
 * Debugging dump, used in various places to see what's going on.
 */
@@ -112,52 +111,52 @@ void __init psc_init(void)
 }
 /*
- * Register the PSC interrupt dispatchers for autovector interrupts 3-6.
- */
-void __init psc_register_interrupts(void)
-{
-        if (request_irq(IRQ_AUTO_3, psc_irq, 0, "psc3", (void *) 0x30))
-                pr_err("Couldn't register psc%d interrupt\n", 3);
-        if (request_irq(IRQ_AUTO_4, psc_irq, 0, "psc4", (void *) 0x40))
-                pr_err("Couldn't register psc%d interrupt\n", 4);
-        if (request_irq(IRQ_AUTO_5, psc_irq, 0, "psc5", (void *) 0x50))
-                pr_err("Couldn't register psc%d interrupt\n", 5);
-        if (request_irq(IRQ_AUTO_6, psc_irq, 0, "psc6", (void *) 0x60))
-                pr_err("Couldn't register psc%d interrupt\n", 6);
-}
-/*
 * PSC interrupt handler. It's a lot like the VIA interrupt handler.
 */
-irqreturn_t psc_irq(int irq, void *dev_id)
+static void psc_irq(unsigned int irq, struct irq_desc *desc)
 {
-        int pIFR        = pIFRbase + ((int) dev_id);
+        unsigned int offset = (unsigned int)irq_desc_get_handler_data(desc);
-        int pIER        = pIERbase + ((int) dev_id);
+        int pIFR        = pIFRbase + offset;
+        int pIER        = pIERbase + offset;
        int irq_num;
        unsigned char irq_bit, events;
 #ifdef DEBUG_IRQS
-        printk("psc_irq: irq %d pIFR = 0x%02X pIER = 0x%02X\n",
+        printk("psc_irq: irq %u pIFR = 0x%02X pIER = 0x%02X\n",
                irq, (int) psc_read_byte(pIFR), (int) psc_read_byte(pIER));
 #endif
        events = psc_read_byte(pIFR) & psc_read_byte(pIER) & 0xF;
        if (!events)
-                return IRQ_NONE;
+                return;
        irq_num = irq << 3;
        irq_bit = 1;
        do {
                if (events & irq_bit) {
                        psc_write_byte(pIFR, irq_bit);
-                        m68k_handle_int(irq_num);
+                        generic_handle_irq(irq_num);
                }
                irq_num++;
                irq_bit <<= 1;
        } while (events >= irq_bit);
-        return IRQ_HANDLED;
+}
+/*
+ * Register the PSC interrupt dispatchers for autovector interrupts 3-6.
+ */
+void __init psc_register_interrupts(void)
+{
+        irq_set_chained_handler(IRQ_AUTO_3, psc_irq);
+        irq_set_handler_data(IRQ_AUTO_3, (void *)0x30);
+        irq_set_chained_handler(IRQ_AUTO_4, psc_irq);
+        irq_set_handler_data(IRQ_AUTO_4, (void *)0x40);
+        irq_set_chained_handler(IRQ_AUTO_5, psc_irq);
+        irq_set_handler_data(IRQ_AUTO_5, (void *)0x50);
+        irq_set_chained_handler(IRQ_AUTO_6, psc_irq);
+        irq_set_handler_data(IRQ_AUTO_6, (void *)0x60);
 }
 void psc_irq_enable(int irq) {
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index e71166daec6a..f1600ad26621 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/irq.h>
 #include <asm/bootinfo.h>
 #include <asm/macintosh.h>
@@ -77,9 +78,6 @@ static int gIER,gIFR,gBufA,gBufB;
 static u8 nubus_disabled;
 void via_debug_dump(void);
-irqreturn_t via1_irq(int, void *);
-irqreturn_t via2_irq(int, void *);
-irqreturn_t via_nubus_irq(int, void *);
 void via_irq_enable(int irq);
 void via_irq_disable(int irq);
 void via_irq_clear(int irq);
@@ -281,40 +279,11 @@ void __init via_init_clock(irq_handler_t func)
        via1[vT1CL] = MAC_CLOCK_LOW;
        via1[vT1CH] = MAC_CLOCK_HIGH;
-        if (request_irq(IRQ_MAC_TIMER_1, func, IRQ_FLG_LOCK, "timer", func))
+        if (request_irq(IRQ_MAC_TIMER_1, func, 0, "timer", func))
                pr_err("Couldn't register %s interrupt\n", "timer");
 }
 /*
- * Register the interrupt dispatchers for VIA or RBV machines only.
- */
-void __init via_register_interrupts(void)
-{
-        if (via_alt_mapping) {
-                if (request_irq(IRQ_AUTO_1, via1_irq,
-                                IRQ_FLG_LOCK|IRQ_FLG_FAST, "software",
-                                (void *) via1))
-                        pr_err("Couldn't register %s interrupt\n", "software");
-                if (request_irq(IRQ_AUTO_6, via1_irq,
-                                IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",
-                                (void *) via1))
-                        pr_err("Couldn't register %s interrupt\n", "via1");
-        } else {
-                if (request_irq(IRQ_AUTO_1, via1_irq,
-                                IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",
-                                (void *) via1))
-                        pr_err("Couldn't register %s interrupt\n", "via1");
-        }
-        if (request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,
-                        "via2", (void *) via2))
-                pr_err("Couldn't register %s interrupt\n", "via2");
-        if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq,
-                        IRQ_FLG_LOCK|IRQ_FLG_FAST, "nubus", (void *) via2))
-                pr_err("Couldn't register %s interrupt\n", "nubus");
-}
-/*
 * Debugging dump, used in various places to see what's going on.
 */
@@ -446,48 +415,46 @@ void __init via_nubus_init(void)
 * via6522.c :-), disable/pending masks added.
 */
-irqreturn_t via1_irq(int irq, void *dev_id)
+void via1_irq(unsigned int irq, struct irq_desc *desc)
 {
        int irq_num;
        unsigned char irq_bit, events;
        events = via1[vIFR] & via1[vIER] & 0x7F;
        if (!events)
-                return IRQ_NONE;
+                return;
        irq_num = VIA1_SOURCE_BASE;
        irq_bit = 1;
        do {
                if (events & irq_bit) {
                        via1[vIFR] = irq_bit;
-                        m68k_handle_int(irq_num);
+                        generic_handle_irq(irq_num);
                }
                ++irq_num;
                irq_bit <<= 1;
        } while (events >= irq_bit);
-        return IRQ_HANDLED;
 }
-irqreturn_t via2_irq(int irq, void *dev_id)
+static void via2_irq(unsigned int irq, struct irq_desc *desc)
 {
        int irq_num;
        unsigned char irq_bit, events;
        events = via2[gIFR] & via2[gIER] & 0x7F;
        if (!events)
-                return IRQ_NONE;
+                return;
        irq_num = VIA2_SOURCE_BASE;
        irq_bit = 1;
        do {
                if (events & irq_bit) {
                        via2[gIFR] = irq_bit | rbv_clear;
-                        m68k_handle_int(irq_num);
+                        generic_handle_irq(irq_num);
                }
                ++irq_num;
                irq_bit <<= 1;
        } while (events >= irq_bit);
-        return IRQ_HANDLED;
 }
 /*
@@ -495,7 +462,7 @@ irqreturn_t via2_irq(int irq, void *dev_id)
 * VIA2 dispatcher as a fast interrupt handler.
 */
-irqreturn_t via_nubus_irq(int irq, void *dev_id)
+void via_nubus_irq(unsigned int irq, struct irq_desc *desc)
 {
        int slot_irq;
        unsigned char slot_bit, events;
@@ -506,7 +473,7 @@ irqreturn_t via_nubus_irq(int irq, void *dev_id)
        else
                events &= ~via2[vDirA];
        if (!events)
-                return IRQ_NONE;
+                return;
        do {
                slot_irq = IRQ_NUBUS_F;
@@ -514,7 +481,7 @@ irqreturn_t via_nubus_irq(int irq, void *dev_id)
                do {
                        if (events & slot_bit) {
                                events &= ~slot_bit;
-                                m68k_handle_int(slot_irq);
+                                generic_handle_irq(slot_irq);
                        }
                        --slot_irq;
                        slot_bit >>= 1;
@@ -528,7 +495,24 @@ irqreturn_t via_nubus_irq(int irq, void *dev_id)
                else
                        events &= ~via2[vDirA];
        } while (events);
-        return IRQ_HANDLED;
+}
+/*
+ * Register the interrupt dispatchers for VIA or RBV machines only.
+ */
+void __init via_register_interrupts(void)
+{
+        if (via_alt_mapping) {
+                /* software interrupt */
+                irq_set_chained_handler(IRQ_AUTO_1, via1_irq);
+                /* via1 interrupt */
+                irq_set_chained_handler(IRQ_AUTO_6, via1_irq);
+        } else {
+                irq_set_chained_handler(IRQ_AUTO_1, via1_irq);
+        }
+        irq_set_chained_handler(IRQ_AUTO_2, via2_irq);
+        irq_set_chained_handler(IRQ_MAC_NUBUS, via_nubus_irq);
 }
 void via_irq_enable(int irq) {
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c
index 6cb9c3a9b6c9..5de924ef42ed 100644
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
@@ -81,7 +81,7 @@ static void mvme147_get_model(char *model)
 void __init mvme147_init_IRQ(void)
 {
-        m68k_setup_user_interrupt(VEC_USER, 192, NULL);
+        m68k_setup_user_interrupt(VEC_USER, 192);
 }
 void __init config_mvme147(void)
@@ -114,8 +114,7 @@ static irqreturn_t mvme147_timer_int (int irq, void *dev_id)
 void mvme147_sched_init (irq_handler_t timer_routine)
 {
        tick_handler = timer_routine;
-        if (request_irq(PCC_IRQ_TIMER1, mvme147_timer_int, IRQ_FLG_REPLACE,
+        if (request_irq(PCC_IRQ_TIMER1, mvme147_timer_int, 0, "timer 1", NULL))
-                        "timer 1", NULL))
                pr_err("Couldn't register timer interrupt\n");
        /* Init the clock with a value */
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index 0b28e2621653..31a66d99cbca 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -117,7 +117,7 @@ static void mvme16x_get_hardware_list(struct seq_file *m)
 static void __init mvme16x_init_IRQ (void)
 {
-        m68k_setup_user_interrupt(VEC_USER, 192, NULL);
+        m68k_setup_user_interrupt(VEC_USER, 192);
 }
 #define pcc2chip        ((volatile u_char *)0xfff42000)
diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c
index 9f0e3d59bf92..2b888491f29a 100644
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
@@ -15,10 +15,10 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
-#include <asm/irq.h>
 #include <asm/traps.h>
 #include <asm/q40_master.h>
@@ -35,35 +35,36 @@
 */
 static void q40_irq_handler(unsigned int, struct pt_regs *fp);
-static void q40_enable_irq(unsigned int);
+static void q40_irq_enable(struct irq_data *data);
-static void q40_disable_irq(unsigned int);
+static void q40_irq_disable(struct irq_data *data);
 unsigned short q40_ablecount[35];
 unsigned short q40_state[35];
-static int q40_irq_startup(unsigned int irq)
+static unsigned int q40_irq_startup(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        /* test for ISA ints not implemented by HW */
        switch (irq) {
        case 1: case 2: case 8: case 9:
        case 11: case 12: case 13:
                printk("%s: ISA IRQ %d not implemented by HW\n", __func__, irq);
-                return -ENXIO;
+                /* FIXME return -ENXIO; */
        }
        return 0;
 }
-static void q40_irq_shutdown(unsigned int irq)
+static void q40_irq_shutdown(struct irq_data *data)
 {
 }
-static struct irq_controller q40_irq_controller = {
+static struct irq_chip q40_irq_chip = {
        .name           = "q40",
-        .lock           = __SPIN_LOCK_UNLOCKED(q40_irq_controller.lock),
+        .irq_startup    = q40_irq_startup,
-        .startup        = q40_irq_startup,
+        .irq_shutdown   = q40_irq_shutdown,
-        .shutdown       = q40_irq_shutdown,
+        .irq_enable     = q40_irq_enable,
-        .enable         = q40_enable_irq,
+        .irq_disable    = q40_irq_disable,
-        .disable        = q40_disable_irq,
 };
 /*
@@ -81,13 +82,14 @@ static int disabled;
 void __init q40_init_IRQ(void)
 {
-        m68k_setup_irq_controller(&q40_irq_controller, 1, Q40_IRQ_MAX);
+        m68k_setup_irq_controller(&q40_irq_chip, handle_simple_irq, 1,
+                                  Q40_IRQ_MAX);
        /* setup handler for ISA ints */
        m68k_setup_auto_interrupt(q40_irq_handler);
-        m68k_irq_startup(IRQ_AUTO_2);
+        m68k_irq_startup_irq(IRQ_AUTO_2);
-        m68k_irq_startup(IRQ_AUTO_4);
+        m68k_irq_startup_irq(IRQ_AUTO_4);
        /* now enable some ints.. */
        master_outb(1, EXT_ENABLE_REG);  /* ISA IRQ 5-15 */
@@ -218,11 +220,11 @@ static void q40_irq_handler(unsigned int irq, struct pt_regs *fp)
        switch (irq) {
        case 4:
        case 6:
-                __m68k_handle_int(Q40_IRQ_SAMPLE, fp);
+                do_IRQ(Q40_IRQ_SAMPLE, fp);
                return;
        }
        if (mir & Q40_IRQ_FRAME_MASK) {
-                __m68k_handle_int(Q40_IRQ_FRAME, fp);
+                do_IRQ(Q40_IRQ_FRAME, fp);
                master_outb(-1, FRAME_CLEAR_REG);
        }
        if ((mir & Q40_IRQ_SER_MASK) || (mir & Q40_IRQ_EXT_MASK)) {
@@ -257,7 +259,7 @@ static void q40_irq_handler(unsigned int irq, struct pt_regs *fp)
                                        goto iirq;
                                }
                                q40_state[irq] |= IRQ_INPROGRESS;
-                                __m68k_handle_int(irq, fp);
+                                do_IRQ(irq, fp);
                                q40_state[irq] &= ~IRQ_INPROGRESS;
                                /* naively enable everything, if that fails than    */
@@ -288,25 +290,29 @@ static void q40_irq_handler(unsigned int irq, struct pt_regs *fp)
        mir = master_inb(IIRQ_REG);
        /* should test whether keyboard irq is really enabled, doing it in defhand */
        if (mir & Q40_IRQ_KEYB_MASK)
-                __m68k_handle_int(Q40_IRQ_KEYBOARD, fp);
+                do_IRQ(Q40_IRQ_KEYBOARD, fp);
        return;
 }
-void q40_enable_irq(unsigned int irq)
+void q40_irq_enable(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        if (irq >= 5 && irq <= 15) {
                mext_disabled--;
                if (mext_disabled > 0)
-                        printk("q40_enable_irq : nested disable/enable\n");
+                        printk("q40_irq_enable : nested disable/enable\n");
                if (mext_disabled == 0)
                        master_outb(1, EXT_ENABLE_REG);
        }
 }
-void q40_disable_irq(unsigned int irq)
+void q40_irq_disable(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        /* disable ISA iqs : only do something if the driver has been
         * verified to be Q40 "compatible" - right now IDE, NE2K
         * Any driver should not attempt to sleep across disable_irq !!
@@ -319,13 +325,3 @@ void q40_disable_irq(unsigned int irq)
                        printk("disable_irq nesting count %d\n",mext_disabled);
        }
 }
-unsigned long q40_probe_irq_on(void)
-{
-        printk("irq probing not working - reconfigure the driver to avoid this\n");
-        return -1;
-}
-int q40_probe_irq_off(unsigned long irqs)
-{
-        return -1;
-}
diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c
index 6464ad3ae3e6..78b60f53e90a 100644
--- a/arch/m68k/sun3/sun3ints.c
+++ b/arch/m68k/sun3/sun3ints.c
@@ -51,25 +51,29 @@ void sun3_disable_irq(unsigned int irq)
 static irqreturn_t sun3_int7(int irq, void *dev_id)
 {
-        *sun3_intreg |=  (1 << irq);
+        unsigned int cnt;
-        if (!(kstat_cpu(0).irqs[irq] % 2000))
-                sun3_leds(led_pattern[(kstat_cpu(0).irqs[irq] % 16000) / 2000]);
+        cnt = kstat_irqs_cpu(irq, 0);
+        if (!(cnt % 2000))
+                sun3_leds(led_pattern[cnt % 16000 / 2000]);
        return IRQ_HANDLED;
 }
 static irqreturn_t sun3_int5(int irq, void *dev_id)
 {
+        unsigned int cnt;
 #ifdef CONFIG_SUN3
        intersil_clear();
 #endif
-        *sun3_intreg |=  (1 << irq);
 #ifdef CONFIG_SUN3
        intersil_clear();
 #endif
        xtime_update(1);
        update_process_times(user_mode(get_irq_regs()));
-        if (!(kstat_cpu(0).irqs[irq] % 20))
+        cnt = kstat_irqs_cpu(irq, 0);
-                sun3_leds(led_pattern[(kstat_cpu(0).irqs[irq] % 160) / 20]);
+        if (!(cnt % 20))
+                sun3_leds(led_pattern[cnt % 160 / 20]);
        return IRQ_HANDLED;
 }
@@ -79,29 +83,33 @@ static irqreturn_t sun3_vec255(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
-static void sun3_inthandle(unsigned int irq, struct pt_regs *fp)
+static void sun3_irq_enable(struct irq_data *data)
 {
-        *sun3_intreg &= ~(1 << irq);
+    sun3_enable_irq(data->irq);
+};
-        __m68k_handle_int(irq, fp);
+static void sun3_irq_disable(struct irq_data *data)
-}
+{
+    sun3_disable_irq(data->irq);
+};
-static struct irq_controller sun3_irq_controller = {
+static struct irq_chip sun3_irq_chip = {
        .name           = "sun3",
-        .lock           = __SPIN_LOCK_UNLOCKED(sun3_irq_controller.lock),
+        .irq_startup    = m68k_irq_startup,
-        .startup        = m68k_irq_startup,
+        .irq_shutdown   = m68k_irq_shutdown,
-        .shutdown       = m68k_irq_shutdown,
+        .irq_enable     = sun3_irq_enable,
-        .enable         = sun3_enable_irq,
+        .irq_disable    = sun3_irq_disable,
-        .disable        = sun3_disable_irq,
+        .irq_mask       = sun3_irq_disable,
+        .irq_unmask     = sun3_irq_enable,
 };
 void __init sun3_init_IRQ(void)
 {
        *sun3_intreg = 1;
-        m68k_setup_auto_interrupt(sun3_inthandle);
+        m68k_setup_irq_controller(&sun3_irq_chip, handle_level_irq, IRQ_AUTO_1,
-        m68k_setup_irq_controller(&sun3_irq_controller, IRQ_AUTO_1, 7);
+                                  7);
-        m68k_setup_user_interrupt(VEC_USER, 128, NULL);
+        m68k_setup_user_interrupt(VEC_USER, 128);
        if (request_irq(IRQ_AUTO_5, sun3_int5, 0, "int5", NULL))
                pr_err("Couldn't register %s interrupt\n", "int5");
diff --git a/arch/microblaze/include/asm/namei.h b/arch/microblaze/include/asm/namei.h
deleted file mode 100644
index 61d60b8a07d5..000000000000
--- a/arch/microblaze/include/asm/namei.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2006 Atmark Techno, Inc.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#ifndef _ASM_MICROBLAZE_NAMEI_H
-#define _ASM_MICROBLAZE_NAMEI_H
-#ifdef __KERNEL__
-/* This dummy routine maybe changed to something useful
- * for /usr/gnemul/ emulation stuff.
- * Look at asm-sparc/namei.h for details.
- */
-#define __emul_prefix() NULL
-#endif /* __KERNEL__ */
-#endif /* _ASM_MICROBLAZE_NAMEI_H */
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 9b4cb00407d7..0be318609fc6 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -286,11 +286,11 @@ CLEAN_FILES += vmlinux.32 vmlinux.64
 archprepare:
 ifdef CONFIG_MIPS32_N32
        @echo '  Checking missing-syscalls for N32'
-        $(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=n32"
+        $(Q)$(MAKE) $(build)=. missing-syscalls missing_syscalls_flags="-mabi=n32"
 endif
 ifdef CONFIG_MIPS32_O32
        @echo '  Checking missing-syscalls for O32'
-        $(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=32"
+        $(Q)$(MAKE) $(build)=. missing-syscalls missing_syscalls_flags="-mabi=32"
 endif
 install:
diff --git a/arch/mips/cavium-octeon/flash_setup.c b/arch/mips/cavium-octeon/flash_setup.c
index 975c20327bb1..0a430e06f5e5 100644
--- a/arch/mips/cavium-octeon/flash_setup.c
+++ b/arch/mips/cavium-octeon/flash_setup.c
@@ -17,8 +17,6 @@
 static struct map_info flash_map;
 static struct mtd_info *mymtd;
-static int nr_parts;
-static struct mtd_partition *parts;
 static const char *part_probe_types[] = {
        "cmdlinepart",
 #ifdef CONFIG_MTD_REDBOOT_PARTS
@@ -61,11 +59,8 @@ static int __init flash_init(void)
                mymtd = do_map_probe("cfi_probe", &flash_map);
                if (mymtd) {
                        mymtd->owner = THIS_MODULE;
+                        mtd_device_parse_register(mymtd, part_probe_types,
-                        nr_parts = parse_mtd_partitions(mymtd,
+                                                  0, NULL, 0);
-                                                        part_probe_types,
-                                                        &parts, 0);
-                        mtd_device_register(mymtd, parts, nr_parts);
                } else {
                        pr_err("Failed to register MTD device for flash\n");
                }
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 8b606423bbd7..efcfff4d4627 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -207,8 +207,9 @@ void octeon_prepare_cpus(unsigned int max_cpus)
         * the other bits alone.
         */
        cvmx_write_csr(CVMX_CIU_MBOX_CLRX(cvmx_get_core_num()), 0xffff);
-        if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt, IRQF_DISABLED,
+        if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt,
-                        "SMP-IPI", mailbox_interrupt)) {
+                        IRQF_PERCPU | IRQF_NO_THREAD, "SMP-IPI",
+                        mailbox_interrupt)) {
                panic("Cannot request_irq(OCTEON_IRQ_MBOX0)\n");
        }
 }
diff --git a/arch/mips/emma/common/prom.c b/arch/mips/emma/common/prom.c
index 708f08761406..cae42259d6da 100644
--- a/arch/mips/emma/common/prom.c
+++ b/arch/mips/emma/common/prom.c
@@ -50,7 +50,7 @@ void __init prom_init(void)
        /* arg[0] is "g", the rest is boot parameters */
        for (i = 1; i < argc; i++) {
-                if (strlen(arcs_cmdline) + strlen(arg[i] + 1)
+                if (strlen(arcs_cmdline) + strlen(arg[i]) + 1
                    >= sizeof(arcs_cmdline))
                        break;
                strcat(arcs_cmdline, arg[i]);
diff --git a/arch/mips/include/asm/mach-bcm47xx/gpio.h b/arch/mips/include/asm/mach-bcm47xx/gpio.h
index 76961cabeedf..2ef17e8df403 100644
--- a/arch/mips/include/asm/mach-bcm47xx/gpio.h
+++ b/arch/mips/include/asm/mach-bcm47xx/gpio.h
@@ -36,6 +36,8 @@ static inline int gpio_get_value(unsigned gpio)
        return -EINVAL;
 }
+#define gpio_get_value_cansleep gpio_get_value
 static inline void gpio_set_value(unsigned gpio, int value)
 {
        switch (bcm47xx_bus_type) {
@@ -54,6 +56,19 @@ static inline void gpio_set_value(unsigned gpio, int value)
        }
 }
+#define gpio_set_value_cansleep gpio_set_value
+static inline int gpio_cansleep(unsigned gpio)
+{
+        return 0;
+}
+static inline int gpio_is_valid(unsigned gpio)
+{
+        return gpio < (BCM47XX_EXTIF_GPIO_LINES + BCM47XX_CHIPCO_GPIO_LINES);
+}
 static inline int gpio_direction_input(unsigned gpio)
 {
        switch (bcm47xx_bus_type) {
@@ -137,7 +152,4 @@ static inline int gpio_polarity(unsigned gpio, int value)
 }
-/* cansleep wrappers */
-#include <asm-generic/gpio.h>
 #endif /* __BCM47XX_GPIO_H */
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h
index ecea7871dec2..d8dad5340ea3 100644
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
@@ -365,16 +365,18 @@
 #define __NR_syncfs                     (__NR_Linux + 342)
 #define __NR_sendmmsg                   (__NR_Linux + 343)
 #define __NR_setns                      (__NR_Linux + 344)
+#define __NR_process_vm_readv           (__NR_Linux + 345)
+#define __NR_process_vm_writev          (__NR_Linux + 346)
 /*
 * Offset of the last Linux o32 flavoured syscall
 */
-#define __NR_Linux_syscalls             344
+#define __NR_Linux_syscalls             346
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 #define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         344
+#define __NR_O32_Linux_syscalls         346
 #if _MIPS_SIM == _MIPS_SIM_ABI64
@@ -686,16 +688,18 @@
 #define __NR_syncfs                     (__NR_Linux + 301)
 #define __NR_sendmmsg                   (__NR_Linux + 302)
 #define __NR_setns                      (__NR_Linux + 303)
+#define __NR_process_vm_readv           (__NR_Linux + 304)
+#define __NR_process_vm_writev          (__NR_Linux + 305)
 /*
 * Offset of the last Linux 64-bit flavoured syscall
 */
-#define __NR_Linux_syscalls             303
+#define __NR_Linux_syscalls             305
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 #define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          303
+#define __NR_64_Linux_syscalls          305
 #if _MIPS_SIM == _MIPS_SIM_NABI32
@@ -1012,16 +1016,18 @@
 #define __NR_syncfs                     (__NR_Linux + 306)
 #define __NR_sendmmsg                   (__NR_Linux + 307)
 #define __NR_setns                      (__NR_Linux + 308)
+#define __NR_process_vm_readv           (__NR_Linux + 309)
+#define __NR_process_vm_writev          (__NR_Linux + 310)
 /*
 * Offset of the last N32 flavoured syscall
 */
-#define __NR_Linux_syscalls             308
+#define __NR_Linux_syscalls             310
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 #define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         308
+#define __NR_N32_Linux_syscalls         310
 #ifdef __KERNEL__
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
index 98c5a9737c14..e2d8e199be32 100644
--- a/arch/mips/kernel/cevt-r4k.c
+++ b/arch/mips/kernel/cevt-r4k.c
@@ -103,19 +103,10 @@ static int c0_compare_int_pending(void)
 /*
 * Compare interrupt can be routed and latched outside the core,
- * so a single execution hazard barrier may not be enough to give
+ * so wait up to worst case number of cycle counter ticks for timer interrupt
- * it time to clear as seen in the Cause register.  4 time the
+ * changes to propagate to the cause register.
- * pipeline depth seems reasonably conservative, and empirically
- * works better in configurations with high CPU/bus clock ratios.
 */
+#define COMPARE_INT_SEEN_TICKS 50
-#define compare_change_hazard() \
-        do { \
-                irq_disable_hazard(); \
-                irq_disable_hazard(); \
-                irq_disable_hazard(); \
-                irq_disable_hazard(); \
-        } while (0)
 int c0_compare_int_usable(void)
 {
@@ -126,8 +117,12 @@ int c0_compare_int_usable(void)
         * IP7 already pending?  Try to clear it by acking the timer.
         */
        if (c0_compare_int_pending()) {
-                write_c0_compare(read_c0_count());
+                cnt = read_c0_count();
-                compare_change_hazard();
+                write_c0_compare(cnt);
+                back_to_back_c0_hazard();
+                while (read_c0_count() < (cnt  + COMPARE_INT_SEEN_TICKS))
+                        if (!c0_compare_int_pending())
+                                break;
                if (c0_compare_int_pending())
                        return 0;
        }
@@ -136,7 +131,7 @@ int c0_compare_int_usable(void)
                cnt = read_c0_count();
                cnt += delta;
                write_c0_compare(cnt);
-                compare_change_hazard();
+                back_to_back_c0_hazard();
                if ((int)(read_c0_count() - cnt) < 0)
                    break;
                /* increase delta if the timer was already expired */
@@ -145,12 +140,17 @@ int c0_compare_int_usable(void)
        while ((int)(read_c0_count() - cnt) <= 0)
                ;       /* Wait for expiry  */
-        compare_change_hazard();
+        while (read_c0_count() < (cnt + COMPARE_INT_SEEN_TICKS))
+                if (c0_compare_int_pending())
+                        break;
        if (!c0_compare_int_pending())
                return 0;
+        cnt = read_c0_count();
-        write_c0_compare(read_c0_count());
+        write_c0_compare(cnt);
-        compare_change_hazard();
+        back_to_back_c0_hazard();
+        while (read_c0_count() < (cnt + COMPARE_INT_SEEN_TICKS))
+                if (!c0_compare_int_pending())
+                        break;
        if (c0_compare_int_pending())
                return 0;
diff --git a/arch/mips/kernel/cpufreq/loongson2_clock.c b/arch/mips/kernel/cpufreq/loongson2_clock.c
index cefc6e259baf..5426779d9fdb 100644
--- a/arch/mips/kernel/cpufreq/loongson2_clock.c
+++ b/arch/mips/kernel/cpufreq/loongson2_clock.c
@@ -7,6 +7,7 @@
 * for more details.
 */
+#include <linux/module.h>
 #include <linux/cpufreq.h>
 #include <linux/platform_device.h>
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 47920657968d..a632bc144efa 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -591,6 +591,8 @@ einval:	li	v0, -ENOSYS
        sys     sys_syncfs              1
        sys     sys_sendmmsg            4
        sys     sys_setns               2
+        sys     sys_process_vm_readv    6       /* 4345 */
+        sys     sys_process_vm_writev   6
        .endm
        /* We pre-compute the number of _instruction_ bytes needed to
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index fb7334bea731..3b5a5e9ae49c 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -430,4 +430,6 @@ sys_call_table:
        PTR     sys_syncfs
        PTR     sys_sendmmsg
        PTR     sys_setns
+        PTR     sys_process_vm_readv
+        PTR     sys_process_vm_writev           /* 5305 */
        .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 6de1f598346e..6be6f7020923 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -430,4 +430,6 @@ EXPORT(sysn32_call_table)
        PTR     sys_syncfs
        PTR     compat_sys_sendmmsg
        PTR     sys_setns
+        PTR     compat_sys_process_vm_readv
+        PTR     compat_sys_process_vm_writev    /* 6310 */
        .size   sysn32_call_table,.-sysn32_call_table
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 1d813169e453..54228553691d 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -548,4 +548,6 @@ sys_call_table:
        PTR     sys_syncfs
        PTR     compat_sys_sendmmsg
        PTR     sys_setns
+        PTR     compat_sys_process_vm_readv     /* 4345 */
+        PTR     compat_sys_process_vm_writev
        .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 261ccbc07740..5c8a49d55054 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1596,7 +1596,8 @@ void __cpuinit per_cpu_trap_init(void)
        }
 #endif /* CONFIG_MIPS_MT_SMTC */
-        cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
+        if (!cpu_data[cpu].asid_cache)
+                cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
        atomic_inc(&init_mm.mm_count);
        current->active_mm = &init_mm;
diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c
index 7e9c0ffc11a5..77ed70fc2fe5 100644
--- a/arch/mips/lantiq/clk.c
+++ b/arch/mips/lantiq/clk.c
@@ -7,7 +7,7 @@
 * Copyright (C) 2010 John Crispin <blogic@openwrt.org>
 */
 #include <linux/io.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
diff --git a/arch/mips/lantiq/devices.c b/arch/mips/lantiq/devices.c
index 44a36771c819..de1cb2bcd79a 100644
--- a/arch/mips/lantiq/devices.c
+++ b/arch/mips/lantiq/devices.c
@@ -7,7 +7,7 @@
 */
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
index 56ba007bf1e5..e34fcfd0d5ca 100644
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
@@ -6,7 +6,7 @@
 * Copyright (C) 2010 John Crispin <blogic@openwrt.org>
 */
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/clk.h>
 #include <asm/bootinfo.h>
 #include <asm/time.h>
diff --git a/arch/mips/lantiq/setup.c b/arch/mips/lantiq/setup.c
index 9b8af77ed0f9..1ff6c9d6cb93 100644
--- a/arch/mips/lantiq/setup.c
+++ b/arch/mips/lantiq/setup.c
@@ -7,7 +7,7 @@
 */
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <asm/bootinfo.h>
diff --git a/arch/mips/lantiq/xway/clk-ase.c b/arch/mips/lantiq/xway/clk-ase.c
index 22d823acd536..652258309c9c 100644
--- a/arch/mips/lantiq/xway/clk-ase.c
+++ b/arch/mips/lantiq/xway/clk-ase.c
@@ -7,7 +7,7 @@
 */
 #include <linux/io.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/clk.h>
diff --git a/arch/mips/lantiq/xway/clk-xway.c b/arch/mips/lantiq/xway/clk-xway.c
index ddd39593c581..696b1a3e0642 100644
--- a/arch/mips/lantiq/xway/clk-xway.c
+++ b/arch/mips/lantiq/xway/clk-xway.c
@@ -7,7 +7,7 @@
 */
 #include <linux/io.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/clk.h>
diff --git a/arch/mips/lantiq/xway/devices.c b/arch/mips/lantiq/xway/devices.c
index d0e32ab2ea07..d614aa7ff07f 100644
--- a/arch/mips/lantiq/xway/devices.c
+++ b/arch/mips/lantiq/xway/devices.c
@@ -7,7 +7,7 @@
 */
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c
index 4278a459d6c4..cbb6ae5747b9 100644
--- a/arch/mips/lantiq/xway/dma.c
+++ b/arch/mips/lantiq/xway/dma.c
@@ -19,6 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/dma-mapping.h>
+#include <linux/export.h>
 #include <lantiq_soc.h>
 #include <xway_dma.h>
diff --git a/arch/mips/lantiq/xway/gpio.c b/arch/mips/lantiq/xway/gpio.c
index a321451a5455..d2fa98f3c78d 100644
--- a/arch/mips/lantiq/xway/gpio.c
+++ b/arch/mips/lantiq/xway/gpio.c
@@ -7,7 +7,7 @@
 */
 #include <linux/slab.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/ioport.h>
diff --git a/arch/mips/lantiq/xway/gpio_ebu.c b/arch/mips/lantiq/xway/gpio_ebu.c
index a479355abdb9..b91c7f17f10f 100644
--- a/arch/mips/lantiq/xway/gpio_ebu.c
+++ b/arch/mips/lantiq/xway/gpio_ebu.c
@@ -7,7 +7,7 @@
 */
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
diff --git a/arch/mips/lantiq/xway/gpio_stp.c b/arch/mips/lantiq/xway/gpio_stp.c
index 67d59d690340..ff9991cddeaa 100644
--- a/arch/mips/lantiq/xway/gpio_stp.c
+++ b/arch/mips/lantiq/xway/gpio_stp.c
@@ -9,7 +9,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
diff --git a/arch/mips/lantiq/xway/prom-ase.c b/arch/mips/lantiq/xway/prom-ase.c
index abe49f4db57f..ae4959ae865c 100644
--- a/arch/mips/lantiq/xway/prom-ase.c
+++ b/arch/mips/lantiq/xway/prom-ase.c
@@ -6,7 +6,7 @@
 *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
 */
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/clk.h>
 #include <asm/bootinfo.h>
 #include <asm/time.h>
diff --git a/arch/mips/lantiq/xway/prom-xway.c b/arch/mips/lantiq/xway/prom-xway.c
index 1686692ac24d..2228133ca356 100644
--- a/arch/mips/lantiq/xway/prom-xway.c
+++ b/arch/mips/lantiq/xway/prom-xway.c
@@ -6,7 +6,7 @@
 *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
 */
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/clk.h>
 #include <asm/bootinfo.h>
 #include <asm/time.h>
diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c
index a1be36d0e490..3d41f0bb5bf7 100644
--- a/arch/mips/lantiq/xway/reset.c
+++ b/arch/mips/lantiq/xway/reset.c
@@ -10,7 +10,7 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/pm.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <asm/reboot.h>
 #include <lantiq_soc.h>
diff --git a/arch/mips/nxp/pnx8550/common/pci.c b/arch/mips/nxp/pnx8550/common/pci.c
deleted file mode 100644
index 98e86ddb86cc..000000000000
--- a/arch/mips/nxp/pnx8550/common/pci.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *
- * BRIEF MODULE DESCRIPTION
- *
- * Author: source@mvista.com
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope 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.
- */
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <pci.h>
-#include <glb.h>
-#include <nand.h>
-static struct resource pci_io_resource = {
-        .start  = PNX8550_PCIIO + 0x1000,       /* reserve regacy I/O space */
-        .end    = PNX8550_PCIIO + PNX8550_PCIIO_SIZE,
-        .name   = "pci IO space",
-        .flags  = IORESOURCE_IO
-};
-static struct resource pci_mem_resource = {
-        .start  = PNX8550_PCIMEM,
-        .end    = PNX8550_PCIMEM + PNX8550_PCIMEM_SIZE - 1,
-        .name   = "pci memory space",
-        .flags  = IORESOURCE_MEM
-};
-extern struct pci_ops pnx8550_pci_ops;
-static struct pci_controller pnx8550_controller = {
-        .pci_ops        = &pnx8550_pci_ops,
-        .io_map_base    = PNX8550_PORT_BASE,
-        .io_resource    = &pci_io_resource,
-        .mem_resource   = &pci_mem_resource,
-};
-/* Return the total size of DRAM-memory, (RANK0 + RANK1) */
-static inline unsigned long get_system_mem_size(void)
-{
-        /* Read IP2031_RANK0_ADDR_LO */
-        unsigned long dram_r0_lo = inl(PCI_BASE | 0x65010);
-        /* Read IP2031_RANK1_ADDR_HI */
-        unsigned long dram_r1_hi = inl(PCI_BASE | 0x65018);
-        return dram_r1_hi - dram_r0_lo + 1;
-}
-static int __init pnx8550_pci_setup(void)
-{
-        int pci_mem_code;
-        int mem_size = get_system_mem_size() >> 20;
-        /* Clear the Global 2 Register, PCI Inta Output Enable Registers
-           Bit 1:Enable DAC Powerdown
-          -> 0:DACs are enabled and are working normally
-             1:DACs are powerdown
-           Bit 0:Enable of PCI inta output
-          -> 0 = Disable PCI inta output
-             1 = Enable PCI inta output
-        */
-        PNX8550_GLB2_ENAB_INTA_O = 0;
-        /* Calc the PCI mem size code */
-        if (mem_size >= 128)
-                pci_mem_code = SIZE_128M;
-        else if (mem_size >= 64)
-                pci_mem_code = SIZE_64M;
-        else if (mem_size >= 32)
-                pci_mem_code = SIZE_32M;
-        else
-                pci_mem_code = SIZE_16M;
-        /* Set PCI_XIO registers */
-        outl(pci_mem_resource.start, PCI_BASE | PCI_BASE1_LO);
-        outl(pci_mem_resource.end + 1, PCI_BASE | PCI_BASE1_HI);
-        outl(pci_io_resource.start, PCI_BASE | PCI_BASE2_LO);
-        outl(pci_io_resource.end, PCI_BASE | PCI_BASE2_HI);
-        /* Send memory transaction via PCI_BASE2 */
-        outl(0x00000001, PCI_BASE | PCI_IO);
-        /* Unlock the setup register */
-        outl(0xca, PCI_BASE | PCI_UNLOCKREG);
-        /*
-         * BAR0 of PNX8550 (pci base 10) must be zero in order for ide
-         * to work, and in order for bus_to_baddr to work without any
-         * hacks.
-         */
-        outl(0x00000000, PCI_BASE | PCI_BASE10);
-        /*
-         *These two bars are set by default or the boot code.
-         * However, it's safer to set them here so we're not boot
-         * code dependent.
-         */
-        outl(0x1be00000, PCI_BASE | PCI_BASE14);  /* PNX MMIO */
-        outl(PNX8550_NAND_BASE_ADDR, PCI_BASE | PCI_BASE18);  /* XIO      */
-        outl(PCI_EN_TA |
-             PCI_EN_PCI2MMI |
-             PCI_EN_XIO |
-             PCI_SETUP_BASE18_SIZE(SIZE_32M) |
-             PCI_SETUP_BASE18_EN |
-             PCI_SETUP_BASE14_EN |
-             PCI_SETUP_BASE10_PREF |
-             PCI_SETUP_BASE10_SIZE(pci_mem_code) |
-             PCI_SETUP_CFGMANAGE_EN |
-             PCI_SETUP_PCIARB_EN,
-             PCI_BASE |
-             PCI_SETUP);        /* PCI_SETUP */
-        outl(0x00000000, PCI_BASE | PCI_CTRL);  /* PCI_CONTROL */
-        register_pci_controller(&pnx8550_controller);
-        return 0;
-}
-arch_initcall(pnx8550_pci_setup);
diff --git a/arch/mips/nxp/pnx8550/common/setup.c b/arch/mips/nxp/pnx8550/common/setup.c
deleted file mode 100644
index 71adac323323..000000000000
--- a/arch/mips/nxp/pnx8550/common/setup.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *
- * 2.6 port, Embedded Alley Solutions, Inc
- *
- *  Based on Per Hallsmark, per.hallsmark@mvista.com
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope 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.
- */
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/ioport.h>
-#include <linux/irq.h>
-#include <linux/mm.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/serial_pnx8xxx.h>
-#include <linux/pm.h>
-#include <asm/cpu.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
-#include <asm/mipsregs.h>
-#include <asm/reboot.h>
-#include <asm/pgtable.h>
-#include <asm/time.h>
-#include <glb.h>
-#include <int.h>
-#include <pci.h>
-#include <uart.h>
-#include <nand.h>
-extern void __init board_setup(void);
-extern void pnx8550_machine_restart(char *);
-extern void pnx8550_machine_halt(void);
-extern void pnx8550_machine_power_off(void);
-extern struct resource ioport_resource;
-extern struct resource iomem_resource;
-extern char *prom_getcmdline(void);
-struct resource standard_io_resources[] = {
-        {
-                .start  = 0x00,
-                .end    = 0x1f,
-                .name   = "dma1",
-                .flags  = IORESOURCE_BUSY
-        }, {
-                .start  = 0x40,
-                .end    = 0x5f,
-                .name   = "timer",
-                .flags  = IORESOURCE_BUSY
-        }, {
-                .start  = 0x80,
-                .end    = 0x8f,
-                .name   = "dma page reg",
-                .flags  = IORESOURCE_BUSY
-        }, {
-                .start  = 0xc0,
-                .end    = 0xdf,
-                .name   = "dma2",
-                .flags  = IORESOURCE_BUSY
-        },
-};
-#define STANDARD_IO_RESOURCES ARRAY_SIZE(standard_io_resources)
-extern struct resource pci_io_resource;
-extern struct resource pci_mem_resource;
-/* Return the total size of DRAM-memory, (RANK0 + RANK1) */
-unsigned long get_system_mem_size(void)
-{
-        /* Read IP2031_RANK0_ADDR_LO */
-        unsigned long dram_r0_lo = inl(PCI_BASE | 0x65010);
-        /* Read IP2031_RANK1_ADDR_HI */
-        unsigned long dram_r1_hi = inl(PCI_BASE | 0x65018);
-        return dram_r1_hi - dram_r0_lo + 1;
-}
-int pnx8550_console_port = -1;
-void __init plat_mem_setup(void)
-{
-        int i;
-        char* argptr;
-        board_setup();  /* board specific setup */
-        _machine_restart = pnx8550_machine_restart;
-        _machine_halt = pnx8550_machine_halt;
-        pm_power_off = pnx8550_machine_power_off;
-        /* Clear the Global 2 Register, PCI Inta Output Enable Registers
-           Bit 1:Enable DAC Powerdown
-          -> 0:DACs are enabled and are working normally
-             1:DACs are powerdown
-           Bit 0:Enable of PCI inta output
-          -> 0 = Disable PCI inta output
-             1 = Enable PCI inta output
-        */
-        PNX8550_GLB2_ENAB_INTA_O = 0;
-        /* IO/MEM resources. */
-        set_io_port_base(PNX8550_PORT_BASE);
-        ioport_resource.start = 0;
-        ioport_resource.end = ~0;
-        iomem_resource.start = 0;
-        iomem_resource.end = ~0;
-        /* Request I/O space for devices on this board */
-        for (i = 0; i < STANDARD_IO_RESOURCES; i++)
-                request_resource(&ioport_resource, standard_io_resources + i);
-        /* Place the Mode Control bit for GPIO pin 16 in primary function */
-        /* Pin 16 is used by UART1, UA1_TX                                */
-        outl((PNX8550_GPIO_MODE_PRIMOP << PNX8550_GPIO_MC_16_BIT) |
-                        (PNX8550_GPIO_MODE_PRIMOP << PNX8550_GPIO_MC_17_BIT),
-                        PNX8550_GPIO_MC1);
-        argptr = prom_getcmdline();
-        if ((argptr = strstr(argptr, "console=ttyS")) != NULL) {
-                argptr += strlen("console=ttyS");
-                pnx8550_console_port = *argptr == '0' ? 0 : 1;
-                /* We must initialize the UART (console) before early printk */
-                /* Set LCR to 8-bit and BAUD to 38400 (no 5)                */
-                ip3106_lcr(UART_BASE, pnx8550_console_port) =
-                        PNX8XXX_UART_LCR_8BIT;
-                ip3106_baud(UART_BASE, pnx8550_console_port) = 5;
-        }
-}
diff --git a/arch/mips/pci/pci-alchemy.c b/arch/mips/pci/pci-alchemy.c
index 4ee57104e47b..b5ce041cdafb 100644
--- a/arch/mips/pci/pci-alchemy.c
+++ b/arch/mips/pci/pci-alchemy.c
@@ -7,6 +7,7 @@
 * Support for all devices (greater than 16) added by David Gathright.
 */
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c
index 8656388b34bd..be1e1afe12c3 100644
--- a/arch/mips/pci/pci-lantiq.c
+++ b/arch/mips/pci/pci-lantiq.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 #include <linux/platform_device.h>
 #include <asm/pci.h>
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c
index cf4c868715ac..dcc926e06fce 100644
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/arch/mips/pmc-sierra/yosemite/prom.c
@@ -102,7 +102,7 @@ void __init prom_init(void)
        /* Get the boot parameters */
        for (i = 1; i < argc; i++) {
-                if (strlen(arcs_cmdline) + strlen(arg[i] + 1) >=
+                if (strlen(arcs_cmdline) + strlen(arg[i]) + 1 >=
                    sizeof(arcs_cmdline))
                        break;
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index b177caa56d95..951e18f5335b 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -345,7 +345,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
-        depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP && !47x)) && EXPERIMENTAL
+        depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP && !PPC_47x)) && EXPERIMENTAL
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 57af16edc192..70ba0c0a1223 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -255,12 +255,6 @@ checkbin:
                echo 'disable kernel modules' ; \
                false ; \
        fi
-        @if ! /bin/echo dssall | $(AS) -many -o $(TOUT) >/dev/null 2>&1 ; then \
-                echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build ' ; \
-                echo 'correctly with old versions of binutils.' ; \
-                echo '*** Please upgrade your binutils to 2.12.1 or newer' ; \
-                false ; \
-        fi
 CLEAN_FILES += $(TOUT)
diff --git a/arch/powerpc/boot/dts/charon.dts b/arch/powerpc/boot/dts/charon.dts
new file mode 100644
index 000000000000..0e00e508eaa6
--- /dev/null
+++ b/arch/powerpc/boot/dts/charon.dts
@@ -0,0 +1,236 @@
+/*
+ * charon board Device Tree Source
+ *
+ * Copyright (C) 2007 Semihalf
+ * Marian Balakowicz <m8@semihalf.com>
+ *
+ * Copyright (C) 2010 DENX Software Engineering GmbH
+ * Heiko Schocher <hs@denx.de>
+ *
+ * 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.
+ */
+/dts-v1/;
+/ {
+        model = "anon,charon";
+        compatible = "anon,charon";
+        #address-cells = <1>;
+        #size-cells = <1>;
+        interrupt-parent = <&mpc5200_pic>;
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                PowerPC,5200@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <0x4000>;        // L1, 16K
+                        i-cache-size = <0x4000>;        // L1, 16K
+                        timebase-frequency = <0>;       // from bootloader
+                        bus-frequency = <0>;            // from bootloader
+                        clock-frequency = <0>;          // from bootloader
+                };
+        };
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x08000000>;  // 128MB
+        };
+        soc5200@f0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc5200-immr";
+                ranges = <0 0xf0000000 0x0000c000>;
+                reg = <0xf0000000 0x00000100>;
+                bus-frequency = <0>;            // from bootloader
+                system-frequency = <0>;         // from bootloader
+                cdm@200 {
+                        compatible = "fsl,mpc5200-cdm";
+                        reg = <0x200 0x38>;
+                };
+                mpc5200_pic: interrupt-controller@500 {
+                        // 5200 interrupts are encoded into two levels;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        compatible = "fsl,mpc5200-pic";
+                        reg = <0x500 0x80>;
+                };
+                timer@600 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200-gpt";
+                        reg = <0x600 0x10>;
+                        interrupts = <1 9 0>;
+                        fsl,has-wdt;
+                };
+                can@900 {
+                        compatible = "fsl,mpc5200-mscan";
+                        interrupts = <2 17 0>;
+                        reg = <0x900 0x80>;
+                };
+                can@980 {
+                        compatible = "fsl,mpc5200-mscan";
+                        interrupts = <2 18 0>;
+                        reg = <0x980 0x80>;
+                };
+                gpio_simple: gpio@b00 {
+                        compatible = "fsl,mpc5200-gpio";
+                        reg = <0xb00 0x40>;
+                        interrupts = <1 7 0>;
+                        gpio-controller;
+                        #gpio-cells = <2>;
+                };
+                usb@1000 {
+                        compatible = "fsl,mpc5200-ohci","ohci-be";
+                        reg = <0x1000 0xff>;
+                        interrupts = <2 6 0>;
+                };
+                dma-controller@1200 {
+                        device_type = "dma-controller";
+                        compatible = "fsl,mpc5200-bestcomm";
+                        reg = <0x1200 0x80>;
+                        interrupts = <3 0 0  3 1 0  3 2 0  3 3 0
+                                      3 4 0  3 5 0  3 6 0  3 7 0
+                                      3 8 0  3 9 0  3 10 0  3 11 0
+                                      3 12 0  3 13 0  3 14 0  3 15 0>;
+                };
+                xlb@1f00 {
+                        compatible = "fsl,mpc5200-xlb";
+                        reg = <0x1f00 0x100>;
+                };
+                serial@2000 {           // PSC1
+                        compatible = "fsl,mpc5200-psc-uart";
+                        reg = <0x2000 0x100>;
+                        interrupts = <2 1 0>;
+                };
+                serial@2400 {           // PSC3
+                        compatible = "fsl,mpc5200-psc-uart";
+                        reg = <0x2400 0x100>;
+                        interrupts = <2 3 0>;
+                };
+                ethernet@3000 {
+                        compatible = "fsl,mpc5200-fec";
+                        reg = <0x3000 0x400>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <2 5 0>;
+                        fixed-link = <1 1 100 0 0>;
+                };
+                mdio@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5200-mdio";
+                        reg = <0x3000 0x400>;       // fec range, since we need to setup fec interrupts
+                        interrupts = <2 5 0>;   // these are for "mii command finished", not link changes & co.
+                };
+                ata@3a00 {
+                        compatible = "fsl,mpc5200-ata";
+                        reg = <0x3a00 0x100>;
+                        interrupts = <2 7 0>;
+                };
+                i2c@3d00 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5200-i2c","fsl-i2c";
+                        reg = <0x3d00 0x40>;
+                        interrupts = <2 15 0>;
+                };
+                i2c@3d40 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5200-i2c","fsl-i2c";
+                        reg = <0x3d40 0x40>;
+                        interrupts = <2 16 0>;
+                        dtt@28 {
+                                compatible = "national,lm80";
+                                reg = <0x28>;
+                        };
+                        rtc@68 {
+                                compatible = "dallas,ds1374";
+                                reg = <0x68>;
+                        };
+                };
+                sram@8000 {
+                        compatible = "fsl,mpc5200-sram";
+                        reg = <0x8000 0x4000>;
+                };
+        };
+        localbus {
+                compatible = "fsl,mpc5200-lpb","simple-bus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                ranges = <      0 0 0xfc000000 0x02000000
+                                1 0 0xe0000000 0x04000000 // CS1 range, SM501
+                                3 0 0xe8000000 0x00080000>;
+                flash@0,0 {
+                        compatible = "cfi-flash";
+                        reg = <0 0 0x02000000>;
+                        bank-width = <4>;
+                        device-width = <2>;
+                        #size-cells = <1>;
+                        #address-cells = <1>;
+                };
+                display@1,0 {
+                        compatible = "smi,sm501";
+                        reg = <1 0x00000000 0x00800000
+                               1 0x03e00000 0x00200000>;
+                        mode = "640x480-32@60";
+                        interrupts = <1 1 3>;
+                        little-endian;
+                };
+                mram0@3,0 {
+                        compatible = "mtd-ram";
+                        reg = <3 0x00000 0x80000>;
+                        bank-width = <1>;
+                };
+        };
+        pci@f0000d00 {
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                compatible = "fsl,mpc5200-pci";
+                reg = <0xf0000d00 0x100>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <0xc000 0 0 1 &mpc5200_pic 0 0 3
+                                 0xc000 0 0 2 &mpc5200_pic 0 0 3
+                                 0xc000 0 0 3 &mpc5200_pic 0 0 3
+                                 0xc000 0 0 4 &mpc5200_pic 0 0 3>;
+                clock-frequency = <0>; // From boot loader
+                interrupts = <2 8 0 2 9 0 2 10 0>;
+                bus-range = <0 0>;
+                ranges = <0x42000000 0 0x80000000 0x80000000 0 0x10000000
+                          0x02000000 0 0x90000000 0x90000000 0 0x10000000
+                          0x01000000 0 0x00000000 0xa0000000 0 0x01000000>;
+        };
+};
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig
index 959cd2cfc275..716a37be16e3 100644
--- a/arch/powerpc/configs/52xx/tqm5200_defconfig
+++ b/arch/powerpc/configs/52xx/tqm5200_defconfig
@@ -1,9 +1,10 @@
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
+CONFIG_SPARSE_IRQ=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_EXPERT=y
+CONFIG_EMBEDDED=y
 # CONFIG_SYSCTL_SYSCALL is not set
 # CONFIG_KALLSYMS is not set
 # CONFIG_EPOLL is not set
@@ -17,7 +18,6 @@ CONFIG_PPC_MPC5200_SIMPLE=y
 CONFIG_PPC_MPC5200_BUGFIX=y
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_BESTCOMM=y
-CONFIG_SPARSE_IRQ=y
 CONFIG_PM=y
 # CONFIG_PCI is not set
 CONFIG_NET=y
@@ -38,17 +38,18 @@ CONFIG_MTD=y
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_ROM=y
 CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_PLATRAM=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=32768
-# CONFIG_MISC_DEVICES is not set
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_ATA=y
@@ -56,13 +57,11 @@ CONFIG_PATA_MPC52xx=y
 CONFIG_PATA_PLATFORM=y
 CONFIG_NETDEVICES=y
 CONFIG_LXT_PHY=y
+CONFIG_FIXED_PHY=y
 CONFIG_NET_ETHERNET=y
 CONFIG_FEC_MPC52xx=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
-# CONFIG_INPUT is not set
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
 CONFIG_SERIAL_MPC52xx=y
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
@@ -70,7 +69,13 @@ CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MPC=y
+CONFIG_SENSORS_LM80=y
 CONFIG_WATCHDOG=y
+CONFIG_MFD_SM501=y
+CONFIG_FB=y
+CONFIG_FB_FOREIGN_ENDIAN=y
+CONFIG_FB_SM501=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_DEVICE_CLASS is not set
@@ -80,10 +85,10 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
 CONFIG_USB_STORAGE=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_DS1374=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-CONFIG_INOTIFY=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_PROC_KCORE=y
@@ -102,7 +107,6 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_PCBC=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 84a685a505fe..535711fcb13c 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -485,3 +485,7 @@ CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KVM_BOOK3S_64_HV=y
+CONFIG_VHOST_NET=m
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 96a58b709705..a72f2415a647 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -362,3 +362,7 @@ CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KVM_BOOK3S_64_HV=y
+CONFIG_VHOST_NET=m
diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
index e2a4c26ad377..02e41b53488d 100644
--- a/arch/powerpc/include/asm/atomic.h
+++ b/arch/powerpc/include/asm/atomic.h
@@ -49,13 +49,13 @@ static __inline__ int atomic_add_return(int a, atomic_t *v)
        int t;
        __asm__ __volatile__(
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     lwarx   %0,0,%2         # atomic_add_return\n\
        add     %0,%1,%0\n"
        PPC405_ERR77(0,%2)
 "       stwcx.  %0,0,%2 \n\
        bne-    1b"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
        : "=&r" (t)
        : "r" (a), "r" (&v->counter)
        : "cc", "memory");
@@ -85,13 +85,13 @@ static __inline__ int atomic_sub_return(int a, atomic_t *v)
        int t;
        __asm__ __volatile__(
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     lwarx   %0,0,%2         # atomic_sub_return\n\
        subf    %0,%1,%0\n"
        PPC405_ERR77(0,%2)
 "       stwcx.  %0,0,%2 \n\
        bne-    1b"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
        : "=&r" (t)
        : "r" (a), "r" (&v->counter)
        : "cc", "memory");
@@ -119,13 +119,13 @@ static __inline__ int atomic_inc_return(atomic_t *v)
        int t;
        __asm__ __volatile__(
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     lwarx   %0,0,%1         # atomic_inc_return\n\
        addic   %0,%0,1\n"
        PPC405_ERR77(0,%1)
 "       stwcx.  %0,0,%1 \n\
        bne-    1b"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
        : "=&r" (t)
        : "r" (&v->counter)
        : "cc", "xer", "memory");
@@ -163,13 +163,13 @@ static __inline__ int atomic_dec_return(atomic_t *v)
        int t;
        __asm__ __volatile__(
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     lwarx   %0,0,%1         # atomic_dec_return\n\
        addic   %0,%0,-1\n"
        PPC405_ERR77(0,%1)
 "       stwcx.  %0,0,%1\n\
        bne-    1b"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
        : "=&r" (t)
        : "r" (&v->counter)
        : "cc", "xer", "memory");
@@ -194,7 +194,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
        int t;
        __asm__ __volatile__ (
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     lwarx   %0,0,%1         # __atomic_add_unless\n\
        cmpw    0,%0,%3 \n\
        beq-    2f \n\
@@ -202,7 +202,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
        PPC405_ERR77(0,%2)
 "       stwcx.  %0,0,%1 \n\
        bne-    1b \n"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
 "       subf    %0,%2,%0 \n\
 2:"
        : "=&r" (t)
@@ -226,7 +226,7 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
        int t;
        __asm__ __volatile__(
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     lwarx   %0,0,%1         # atomic_dec_if_positive\n\
        cmpwi   %0,1\n\
        addi    %0,%0,-1\n\
@@ -234,7 +234,7 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
        PPC405_ERR77(0,%1)
 "       stwcx.  %0,0,%1\n\
        bne-    1b"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
        "\n\
 2:"     : "=&b" (t)
        : "r" (&v->counter)
@@ -285,12 +285,12 @@ static __inline__ long atomic64_add_return(long a, atomic64_t *v)
        long t;
        __asm__ __volatile__(
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     ldarx   %0,0,%2         # atomic64_add_return\n\
        add     %0,%1,%0\n\
        stdcx.  %0,0,%2 \n\
        bne-    1b"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
        : "=&r" (t)
        : "r" (a), "r" (&v->counter)
        : "cc", "memory");
@@ -319,12 +319,12 @@ static __inline__ long atomic64_sub_return(long a, atomic64_t *v)
        long t;
        __asm__ __volatile__(
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     ldarx   %0,0,%2         # atomic64_sub_return\n\
        subf    %0,%1,%0\n\
        stdcx.  %0,0,%2 \n\
        bne-    1b"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
        : "=&r" (t)
        : "r" (a), "r" (&v->counter)
        : "cc", "memory");
@@ -351,12 +351,12 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
        long t;
        __asm__ __volatile__(
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     ldarx   %0,0,%1         # atomic64_inc_return\n\
        addic   %0,%0,1\n\
        stdcx.  %0,0,%1 \n\
        bne-    1b"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
        : "=&r" (t)
        : "r" (&v->counter)
        : "cc", "xer", "memory");
@@ -393,12 +393,12 @@ static __inline__ long atomic64_dec_return(atomic64_t *v)
        long t;
        __asm__ __volatile__(
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     ldarx   %0,0,%1         # atomic64_dec_return\n\
        addic   %0,%0,-1\n\
        stdcx.  %0,0,%1\n\
        bne-    1b"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
        : "=&r" (t)
        : "r" (&v->counter)
        : "cc", "xer", "memory");
@@ -418,13 +418,13 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
        long t;
        __asm__ __volatile__(
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     ldarx   %0,0,%1         # atomic64_dec_if_positive\n\
        addic.  %0,%0,-1\n\
        blt-    2f\n\
        stdcx.  %0,0,%1\n\
        bne-    1b"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
        "\n\
 2:"     : "=&r" (t)
        : "r" (&v->counter)
@@ -450,14 +450,14 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
        long t;
        __asm__ __volatile__ (
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     ldarx   %0,0,%1         # __atomic_add_unless\n\
        cmpd    0,%0,%3 \n\
        beq-    2f \n\
        add     %0,%2,%0 \n"
 "       stdcx.  %0,0,%1 \n\
        bne-    1b \n"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
 "       subf    %0,%2,%0 \n\
 2:"
        : "=&r" (t)
diff --git a/arch/powerpc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h
index e137afcc10fa..efdc92618b38 100644
--- a/arch/powerpc/include/asm/bitops.h
+++ b/arch/powerpc/include/asm/bitops.h
@@ -124,14 +124,14 @@ static __inline__ unsigned long fn(			\
        return (old & mask);                            \
 }
-DEFINE_TESTOP(test_and_set_bits, or, PPC_RELEASE_BARRIER,
+DEFINE_TESTOP(test_and_set_bits, or, PPC_ATOMIC_ENTRY_BARRIER,
-              PPC_ACQUIRE_BARRIER, 0)
+              PPC_ATOMIC_EXIT_BARRIER, 0)
 DEFINE_TESTOP(test_and_set_bits_lock, or, "",
              PPC_ACQUIRE_BARRIER, 1)
-DEFINE_TESTOP(test_and_clear_bits, andc, PPC_RELEASE_BARRIER,
+DEFINE_TESTOP(test_and_clear_bits, andc, PPC_ATOMIC_ENTRY_BARRIER,
-              PPC_ACQUIRE_BARRIER, 0)
+              PPC_ATOMIC_EXIT_BARRIER, 0)
-DEFINE_TESTOP(test_and_change_bits, xor, PPC_RELEASE_BARRIER,
+DEFINE_TESTOP(test_and_change_bits, xor, PPC_ATOMIC_ENTRY_BARRIER,
-              PPC_ACQUIRE_BARRIER, 0)
+              PPC_ATOMIC_EXIT_BARRIER, 0)
 static __inline__ int test_and_set_bit(unsigned long nr,
                                       volatile unsigned long *addr)
diff --git a/arch/powerpc/include/asm/floppy.h b/arch/powerpc/include/asm/floppy.h
index 24bd34c57e9d..936a904ae78c 100644
--- a/arch/powerpc/include/asm/floppy.h
+++ b/arch/powerpc/include/asm/floppy.h
@@ -108,10 +108,10 @@ static int fd_request_irq(void)
 {
        if (can_use_virtual_dma)
                return request_irq(FLOPPY_IRQ, floppy_hardint,
-                                   IRQF_DISABLED, "floppy", NULL);
+                                   0, "floppy", NULL);
        else
                return request_irq(FLOPPY_IRQ, floppy_interrupt,
-                                   IRQF_DISABLED, "floppy", NULL);
+                                   0, "floppy", NULL);
 }
 static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io)
diff --git a/arch/powerpc/include/asm/futex.h b/arch/powerpc/include/asm/futex.h
index c94e4a3fe2ef..2a9cf845473b 100644
--- a/arch/powerpc/include/asm/futex.h
+++ b/arch/powerpc/include/asm/futex.h
@@ -11,12 +11,13 @@
 #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
  __asm__ __volatile ( \
-        PPC_RELEASE_BARRIER \
+        PPC_ATOMIC_ENTRY_BARRIER \
 "1:     lwarx   %0,0,%2\n" \
        insn \
        PPC405_ERR77(0, %2) \
 "2:     stwcx.  %1,0,%2\n" \
        "bne-   1b\n" \
+        PPC_ATOMIC_EXIT_BARRIER \
        "li     %1,0\n" \
 "3:     .section .fixup,\"ax\"\n" \
 "4:     li      %1,%3\n" \
@@ -92,14 +93,14 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
                return -EFAULT;
        __asm__ __volatile__ (
-        PPC_RELEASE_BARRIER
+        PPC_ATOMIC_ENTRY_BARRIER
 "1:     lwarx   %1,0,%3         # futex_atomic_cmpxchg_inatomic\n\
        cmpw    0,%1,%4\n\
        bne-    3f\n"
        PPC405_ERR77(0,%3)
 "2:     stwcx.  %5,0,%3\n\
        bne-    1b\n"
-        PPC_ACQUIRE_BARRIER
+        PPC_ATOMIC_EXIT_BARRIER
 "3:     .section .fixup,\"ax\"\n\
 4:      li      %0,%6\n\
        b       3b\n\
diff --git a/arch/powerpc/include/asm/kvm.h b/arch/powerpc/include/asm/kvm.h
index 08fe69edcd10..0ad432bc81d6 100644
--- a/arch/powerpc/include/asm/kvm.h
+++ b/arch/powerpc/include/asm/kvm.h
@@ -149,12 +149,6 @@ struct kvm_regs {
 #define KVM_SREGS_E_UPDATE_DBSR         (1 << 3)
 /*
- * Book3S special bits to indicate contents in the struct by maintaining
- * backwards compatibility with older structs. If adding a new field,
- * please make sure to add a flag for that new field */
-#define KVM_SREGS_S_HIOR                (1 << 0)
-/*
 * In KVM_SET_SREGS, reserved/pad fields must be left untouched from a
 * previous KVM_GET_REGS.
 *
@@ -179,8 +173,6 @@ struct kvm_sregs {
                                __u64 ibat[8]; 
                                __u64 dbat[8]; 
                        } ppc32;
-                        __u64 flags; /* KVM_SREGS_S_ */
-                        __u64 hior;
                } s;
                struct {
                        union {
diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index a384ffdf33de..d4df013ad779 100644
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -90,8 +90,6 @@ struct kvmppc_vcpu_book3s {
 #endif
        int context_id[SID_CONTEXTS];
-        bool hior_sregs;                /* HIOR is set by SREGS, not PVR */
        struct hlist_head hpte_hash_pte[HPTEG_HASH_NUM_PTE];
        struct hlist_head hpte_hash_pte_long[HPTEG_HASH_NUM_PTE_LONG];
        struct hlist_head hpte_hash_vpte[HPTEG_HASH_NUM_VPTE];
diff --git a/arch/powerpc/include/asm/lv1call.h b/arch/powerpc/include/asm/lv1call.h
index 9cd5fc828a37..f77c708c67a0 100644
--- a/arch/powerpc/include/asm/lv1call.h
+++ b/arch/powerpc/include/asm/lv1call.h
@@ -316,7 +316,7 @@ LV1_CALL(gpu_context_free,                              1, 0, 218 )
 LV1_CALL(gpu_context_iomap,                             5, 0, 221 )
 LV1_CALL(gpu_context_attribute,                         6, 0, 225 )
 LV1_CALL(gpu_context_intr,                              1, 1, 227 )
-LV1_CALL(gpu_attribute,                                 5, 0, 228 )
+LV1_CALL(gpu_attribute,                                 3, 0, 228 )
 LV1_CALL(get_rtc,                                       0, 2, 232 )
 LV1_CALL(set_ppe_periodic_tracer_frequency,             1, 0, 240 )
 LV1_CALL(start_ppe_periodic_tracer,                     5, 0, 241 )
diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
index 28cdbd9f399c..03c48e819c8e 100644
--- a/arch/powerpc/include/asm/reg_booke.h
+++ b/arch/powerpc/include/asm/reg_booke.h
@@ -31,7 +31,7 @@
 #define MSR_            MSR_ME | MSR_CE
 #define MSR_KERNEL      MSR_ | MSR_64BIT
-#define MSR_USER32      MSR_ | MSR_PR | MSR_EE | MSR_DE
+#define MSR_USER32      MSR_ | MSR_PR | MSR_EE
 #define MSR_USER64      MSR_USER32 | MSR_64BIT
 #elif defined (CONFIG_40x)
 #define MSR_KERNEL      (MSR_ME|MSR_RI|MSR_IR|MSR_DR|MSR_CE)
diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h
index 6fbce725c710..a0f358d4a00c 100644
--- a/arch/powerpc/include/asm/sections.h
+++ b/arch/powerpc/include/asm/sections.h
@@ -8,7 +8,7 @@
 #ifdef __powerpc64__
-extern char _end[];
+extern char __end_interrupts[];
 static inline int in_kernel_text(unsigned long addr)
 {
diff --git a/arch/powerpc/include/asm/synch.h b/arch/powerpc/include/asm/synch.h
index d7cab44643c5..e682a7143edb 100644
--- a/arch/powerpc/include/asm/synch.h
+++ b/arch/powerpc/include/asm/synch.h
@@ -13,6 +13,7 @@
 extern unsigned int __start___lwsync_fixup, __stop___lwsync_fixup;
 extern void do_lwsync_fixups(unsigned long value, void *fixup_start,
                             void *fixup_end);
+extern void do_final_fixups(void);
 static inline void eieio(void)
 {
@@ -41,11 +42,15 @@ static inline void isync(void)
        START_LWSYNC_SECTION(97);                       \
        isync;                                          \
        MAKE_LWSYNC_SECTION_ENTRY(97, __lwsync_fixup);
-#define PPC_ACQUIRE_BARRIER     "\n" stringify_in_c(__PPC_ACQUIRE_BARRIER)
+#define PPC_ACQUIRE_BARRIER      "\n" stringify_in_c(__PPC_ACQUIRE_BARRIER)
-#define PPC_RELEASE_BARRIER     stringify_in_c(LWSYNC) "\n"
+#define PPC_RELEASE_BARRIER      stringify_in_c(LWSYNC) "\n"
+#define PPC_ATOMIC_ENTRY_BARRIER "\n" stringify_in_c(LWSYNC) "\n"
+#define PPC_ATOMIC_EXIT_BARRIER  "\n" stringify_in_c(sync) "\n"
 #else
 #define PPC_ACQUIRE_BARRIER
 #define PPC_RELEASE_BARRIER
+#define PPC_ATOMIC_ENTRY_BARRIER
+#define PPC_ATOMIC_EXIT_BARRIER
 #endif
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/xics.h b/arch/powerpc/include/asm/xics.h
index bd6c401c0ee5..c48de98ba94e 100644
--- a/arch/powerpc/include/asm/xics.h
+++ b/arch/powerpc/include/asm/xics.h
@@ -15,8 +15,8 @@
 #define DEFAULT_PRIORITY        5
 /*
- * Mark IPIs as higher priority so we can take them inside interrupts that
+ * Mark IPIs as higher priority so we can take them inside interrupts
- * arent marked IRQF_DISABLED
+ * FIXME: still true now?
 */
 #define IPI_PRIORITY            4
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 56212bc0ab08..4f80cf1ce77b 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -215,7 +215,22 @@ reenable_mmu:				/* re-enable mmu so we can */
        stw     r9,8(r1)
        stw     r11,12(r1)
        stw     r3,ORIG_GPR3(r1)
+        /*
+         * The trace_hardirqs_off will use CALLER_ADDR0 and CALLER_ADDR1.
+         * If from user mode there is only one stack frame on the stack, and
+         * accessing CALLER_ADDR1 will cause oops. So we need create a dummy
+         * stack frame to make trace_hardirqs_off happy.
+         */
+        andi.   r12,r12,MSR_PR
+        beq     11f
+        stwu    r1,-16(r1)
+        bl      trace_hardirqs_off
+        addi    r1,r1,16
+        b       12f
+11:
        bl      trace_hardirqs_off
+12:
        lwz     r0,GPR0(r1)
        lwz     r3,ORIG_GPR3(r1)
        lwz     r4,GPR4(r1)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index a54d92fec612..cf9c69b9189c 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -267,7 +267,7 @@ vsx_unavailable_pSeries_1:
 #ifdef CONFIG_CBE_RAS
        STD_EXCEPTION_HV(0x1200, 0x1202, cbe_system_error)
-        KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1202)
+        KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1202)
 #endif /* CONFIG_CBE_RAS */
        STD_EXCEPTION_PSERIES(0x1300, 0x1300, instruction_breakpoint)
@@ -275,7 +275,7 @@ vsx_unavailable_pSeries_1:
 #ifdef CONFIG_CBE_RAS
        STD_EXCEPTION_HV(0x1600, 0x1602, cbe_maintenance)
-        KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1602)
+        KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1602)
 #endif /* CONFIG_CBE_RAS */
        STD_EXCEPTION_PSERIES(0x1700, 0x1700, altivec_assist)
@@ -283,7 +283,7 @@ vsx_unavailable_pSeries_1:
 #ifdef CONFIG_CBE_RAS
        STD_EXCEPTION_HV(0x1800, 0x1802, cbe_thermal)
-        KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1802)
+        KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1802)
 #endif /* CONFIG_CBE_RAS */
        . = 0x3000
diff --git a/arch/powerpc/kernel/jump_label.c b/arch/powerpc/kernel/jump_label.c
index 368d158d665d..a1ed8a8c7cb4 100644
--- a/arch/powerpc/kernel/jump_label.c
+++ b/arch/powerpc/kernel/jump_label.c
@@ -11,6 +11,7 @@
 #include <linux/jump_label.h>
 #include <asm/code-patching.h>
+#ifdef HAVE_JUMP_LABEL
 void arch_jump_label_transform(struct jump_entry *entry,
                               enum jump_label_type type)
 {
@@ -21,3 +22,4 @@ void arch_jump_label_transform(struct jump_entry *entry,
        else
                patch_instruction(addr, PPC_INST_NOP);
 }
+#endif
diff --git a/arch/powerpc/kernel/kvm.c b/arch/powerpc/kernel/kvm.c
index 35f27646c4ff..2985338d0e10 100644
--- a/arch/powerpc/kernel/kvm.c
+++ b/arch/powerpc/kernel/kvm.c
@@ -132,7 +132,6 @@ static void kvm_patch_ins_b(u32 *inst, int addr)
        /* On relocatable kernels interrupts handlers and our code
           can be in different regions, so we don't patch them */
-        extern u32 __end_interrupts;
        if ((ulong)inst < (ulong)&__end_interrupts)
                return;
 #endif
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index f7d760ab5ca1..7cd07b42ca1a 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -738,7 +738,7 @@ relocate_new_kernel:
        mr      r5, r31
        li      r0, 0
-#elif defined(CONFIG_44x)  && !defined(CONFIG_47x)
+#elif defined(CONFIG_44x)  && !defined(CONFIG_PPC_47x)
 /*
 * Code for setting up 1:1 mapping for PPC440x for KEXEC
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 9054ca9ab4f9..6457574c0b2f 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -486,28 +486,6 @@ struct task_struct *__switch_to(struct task_struct *prev,
        new_thread = &new->thread;
        old_thread = &current->thread;
-#if defined(CONFIG_PPC_BOOK3E_64)
-        /* XXX Current Book3E code doesn't deal with kernel side DBCR0,
-         * we always hold the user values, so we set it now.
-         *
-         * However, we ensure the kernel MSR:DE is appropriately cleared too
-         * to avoid spurrious single step exceptions in the kernel.
-         *
-         * This will have to change to merge with the ppc32 code at some point,
-         * but I don't like much what ppc32 is doing today so there's some
-         * thinking needed there
-         */
-        if ((new_thread->dbcr0 | old_thread->dbcr0) & DBCR0_IDM) {
-                u32 dbcr0;
-                mtmsr(mfmsr() & ~MSR_DE);
-                isync();
-                dbcr0 = mfspr(SPRN_DBCR0);
-                dbcr0 = (dbcr0 & DBCR0_EDM) | new_thread->dbcr0;
-                mtspr(SPRN_DBCR0, dbcr0);
-        }
-#endif /* CONFIG_PPC64_BOOK3E */
 #ifdef CONFIG_PPC64
        /*
         * Collect processor utilization data per process
@@ -657,7 +635,7 @@ void show_regs(struct pt_regs * regs)
        if ((regs->trap != 0xc00) && cpu_has_feature(CPU_FTR_CFAR))
                printk("CFAR: "REG"\n", regs->orig_gpr3);
        if (trap == 0x300 || trap == 0x600)
-#ifdef CONFIG_PPC_ADV_DEBUG_REGS
+#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
                printk("DEAR: "REG", ESR: "REG"\n", regs->dar, regs->dsisr);
 #else
                printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index b4fa66127495..cc584865b3df 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -1579,10 +1579,8 @@ static void __init prom_instantiate_rtas(void)
                return;
        base = alloc_down(size, PAGE_SIZE, 0);
-        if (base == 0) {
+        if (base == 0)
-                prom_printf("RTAS allocation failed !\n");
+                prom_panic("Could not allocate memory for RTAS\n");
-                return;
-        }
        rtas_inst = call_prom("open", 1, 1, ADDR("/rtas"));
        if (!IHANDLE_VALID(rtas_inst)) {
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index c1ce86357ecb..ac7610815113 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -107,6 +107,8 @@ notrace unsigned long __init early_init(unsigned long dt_ptr)
                         PTRRELOC(&__start___lwsync_fixup),
                         PTRRELOC(&__stop___lwsync_fixup));
+        do_final_fixups();
        return KERNELBASE + offset;
 }
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 1a9dea80a69b..fb9bb46e7e88 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -359,6 +359,7 @@ void __init setup_system(void)
                          &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);
        do_lwsync_fixups(cur_cpu_spec->cpu_features,
                         &__start___lwsync_fixup, &__stop___lwsync_fixup);
+        do_final_fixups();
        /*
         * Unflatten the device-tree passed by prom_init or kexec
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 78b76dc54dfb..836a5a19eb2c 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -97,7 +97,7 @@ static inline int put_sigset_t(compat_sigset_t __user *uset, sigset_t *set)
        compat_sigset_t cset;
        switch (_NSIG_WORDS) {
-        case 4: cset.sig[5] = set->sig[3] & 0xffffffffull;
+        case 4: cset.sig[6] = set->sig[3] & 0xffffffffull;
                cset.sig[7] = set->sig[3] >> 32;
        case 3: cset.sig[4] = set->sig[2] & 0xffffffffull;
                cset.sig[5] = set->sig[2] >> 32;
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 25ddbfc7dd36..6df70907d60a 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -187,7 +187,7 @@ int smp_request_message_ipi(int virq, int msg)
                return 1;
        }
 #endif
-        err = request_irq(virq, smp_ipi_action[msg], IRQF_DISABLED|IRQF_PERCPU,
+        err = request_irq(virq, smp_ipi_action[msg], IRQF_PERCPU,
                          smp_ipi_name[msg], 0);
        WARN(err < 0, "unable to request_irq %d for %s (rc %d)\n",
                virq, smp_ipi_name[msg], err);
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 4e5908264d1a..5459d148a0f6 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1298,14 +1298,12 @@ void __kprobes DebugException(struct pt_regs *regs, unsigned long debug_status)
                if (user_mode(regs)) {
                        current->thread.dbcr0 &= ~DBCR0_IC;
-#ifdef CONFIG_PPC_ADV_DEBUG_REGS
                        if (DBCR_ACTIVE_EVENTS(current->thread.dbcr0,
                                               current->thread.dbcr1))
                                regs->msr |= MSR_DE;
                        else
                                /* Make sure the IDM bit is off */
                                current->thread.dbcr0 &= ~DBCR0_IDM;
-#endif
                }
                _exception(SIGTRAP, regs, TRAP_TRACE, regs->nip);
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 0cdbc07cec14..0cb137a9b038 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -44,6 +44,7 @@
 #include <asm/processor.h>
 #include <asm/cputhreads.h>
 #include <asm/page.h>
+#include <asm/hvcall.h>
 #include <linux/gfp.h>
 #include <linux/sched.h>
 #include <linux/vmalloc.h>
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index f422231d9235..44d8829334ab 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -1263,7 +1263,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_206)
        addi    r6,r5,VCORE_NAPPING_THREADS
 31:     lwarx   r4,0,r6
        or      r4,r4,r0
-        popcntw r7,r4
+        PPC_POPCNTW(r7,r4)
        cmpw    r7,r8
        bge     2f
        stwcx.  r4,0,r6
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index bc4d50dec78b..3c791e1eb675 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -151,16 +151,14 @@ void kvmppc_set_pvr(struct kvm_vcpu *vcpu, u32 pvr)
 #ifdef CONFIG_PPC_BOOK3S_64
        if ((pvr >= 0x330000) && (pvr < 0x70330000)) {
                kvmppc_mmu_book3s_64_init(vcpu);
-                if (!to_book3s(vcpu)->hior_sregs)
+                to_book3s(vcpu)->hior = 0xfff00000;
-                        to_book3s(vcpu)->hior = 0xfff00000;
                to_book3s(vcpu)->msr_mask = 0xffffffffffffffffULL;
                vcpu->arch.cpu_type = KVM_CPU_3S_64;
        } else
 #endif
        {
                kvmppc_mmu_book3s_32_init(vcpu);
-                if (!to_book3s(vcpu)->hior_sregs)
+                to_book3s(vcpu)->hior = 0;
-                        to_book3s(vcpu)->hior = 0;
                to_book3s(vcpu)->msr_mask = 0xffffffffULL;
                vcpu->arch.cpu_type = KVM_CPU_3S_32;
        }
@@ -797,9 +795,6 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
                }
        }
-        if (sregs->u.s.flags & KVM_SREGS_S_HIOR)
-                sregs->u.s.hior = to_book3s(vcpu)->hior;
        return 0;
 }
@@ -836,11 +831,6 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
        /* Flush the MMU after messing with the segments */
        kvmppc_mmu_pte_flush(vcpu, 0, 0);
-        if (sregs->u.s.flags & KVM_SREGS_S_HIOR) {
-                to_book3s(vcpu)->hior_sregs = true;
-                to_book3s(vcpu)->hior = sregs->u.s.hior;
-        }
        return 0;
 }
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index efbf9ad87203..607fbdf24b84 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -208,7 +208,6 @@ int kvm_dev_ioctl_check_extension(long ext)
        case KVM_CAP_PPC_BOOKE_SREGS:
 #else
        case KVM_CAP_PPC_SEGSTATE:
-        case KVM_CAP_PPC_HIOR:
        case KVM_CAP_PPC_PAPR:
 #endif
        case KVM_CAP_PPC_UNSET_IRQ:
diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c
index 0d08d0171392..7a8a7487cee8 100644
--- a/arch/powerpc/lib/feature-fixups.c
+++ b/arch/powerpc/lib/feature-fixups.c
@@ -18,6 +18,8 @@
 #include <linux/init.h>
 #include <asm/cputable.h>
 #include <asm/code-patching.h>
+#include <asm/page.h>
+#include <asm/sections.h>
 struct fixup_entry {
@@ -128,6 +130,27 @@ void do_lwsync_fixups(unsigned long value, void *fixup_start, void *fixup_end)
        }
 }
+void do_final_fixups(void)
+{
+#if defined(CONFIG_PPC64) && defined(CONFIG_RELOCATABLE)
+        int *src, *dest;
+        unsigned long length;
+        if (PHYSICAL_START == 0)
+                return;
+        src = (int *)(KERNELBASE + PHYSICAL_START);
+        dest = (int *)KERNELBASE;
+        length = (__end_interrupts - _stext) / sizeof(int);
+        while (length--) {
+                patch_instruction(dest, *src);
+                src++;
+                dest++;
+        }
+#endif
+}
 #ifdef CONFIG_FTR_FIXUP_SELFTEST
 #define check(x)        \
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 16da595ff402..2dd6bdd31fe1 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -34,6 +34,7 @@
 #include <linux/suspend.h>
 #include <linux/memblock.h>
 #include <linux/hugetlb.h>
+#include <linux/slab.h>
 #include <asm/pgalloc.h>
 #include <asm/prom.h>
@@ -555,3 +556,32 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
                book3e_hugetlb_preload(vma->vm_mm, address, *ptep);
 #endif
 }
+/*
+ * System memory should not be in /proc/iomem but various tools expect it
+ * (eg kdump).
+ */
+static int add_system_ram_resources(void)
+{
+        struct memblock_region *reg;
+        for_each_memblock(memory, reg) {
+                struct resource *res;
+                unsigned long base = reg->base;
+                unsigned long size = reg->size;
+                res = kzalloc(sizeof(struct resource), GFP_KERNEL);
+                WARN_ON(!res);
+                if (res) {
+                        res->name = "System RAM";
+                        res->start = base;
+                        res->end = base + size - 1;
+                        res->flags = IORESOURCE_MEM;
+                        WARN_ON(request_resource(&iomem_resource, res) < 0);
+                }
+        }
+        return 0;
+}
+subsys_initcall(add_system_ram_resources);
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index c7dd4dec4df8..b22a83a91cb8 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -315,7 +315,10 @@ static int __init find_min_common_depth(void)
        struct device_node *root;
        const char *vec5;
-        root = of_find_node_by_path("/rtas");
+        if (firmware_has_feature(FW_FEATURE_OPAL))
+                root = of_find_node_by_path("/ibm,opal");
+        else
+                root = of_find_node_by_path("/rtas");
        if (!root)
                root = of_find_node_by_path("/");
@@ -344,12 +347,19 @@ static int __init find_min_common_depth(void)
 #define VEC5_AFFINITY_BYTE      5
 #define VEC5_AFFINITY           0x80
-        chosen = of_find_node_by_path("/chosen");
-        if (chosen) {
+        if (firmware_has_feature(FW_FEATURE_OPAL))
-                vec5 = of_get_property(chosen, "ibm,architecture-vec-5", NULL);
+                form1_affinity = 1;
-                if (vec5 && (vec5[VEC5_AFFINITY_BYTE] & VEC5_AFFINITY)) {
+        else {
-                        dbg("Using form 1 affinity\n");
+                chosen = of_find_node_by_path("/chosen");
-                        form1_affinity = 1;
+                if (chosen) {
+                        vec5 = of_get_property(chosen,
+                                               "ibm,architecture-vec-5", NULL);
+                        if (vec5 && (vec5[VEC5_AFFINITY_BYTE] &
+                                                        VEC5_AFFINITY)) {
+                                dbg("Using form 1 affinity\n");
+                                form1_affinity = 1;
+                        }
                }
        }
diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index e36d6e232ae6..846b789fb195 100644
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -50,6 +50,7 @@ static void __init mpc5200_simple_setup_arch(void)
 /* list of the supported boards */
 static const char *board[] __initdata = {
+        "anon,charon",
        "intercontrol,digsy-mtc",
        "manroland,mucmc52",
        "manroland,uc101",
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index e4588721ef34..3fe6d927ad70 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -347,7 +347,7 @@ config SIMPLE_GPIO
 config MCU_MPC8349EMITX
        bool "MPC8349E-mITX MCU driver"
-        depends on I2C && PPC_83xx
+        depends on I2C=y && PPC_83xx
        select GENERIC_GPIO
        select ARCH_REQUIRE_GPIOLIB
        help
diff --git a/arch/powerpc/platforms/cell/beat.c b/arch/powerpc/platforms/cell/beat.c
index 232fc384e855..852592b2b712 100644
--- a/arch/powerpc/platforms/cell/beat.c
+++ b/arch/powerpc/platforms/cell/beat.c
@@ -230,7 +230,7 @@ static int __init beat_register_event(void)
                }
                ev->virq = virq;
-                rc = request_irq(virq, ev->handler, IRQF_DISABLED,
+                rc = request_irq(virq, ev->handler, 0,
                                      ev->typecode, NULL);
                if (rc != 0) {
                        printk(KERN_ERR "Beat: failed to request virtual IRQ"
diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
index ae790ac4a589..14be2bd358b8 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
@@ -514,7 +514,7 @@ static __init int celleb_setup_pciex(struct device_node *node,
        virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
                                     oirq.size);
        if (request_irq(virq, pciex_handle_internal_irq,
-                        IRQF_DISABLED, "pciex", (void *)phb)) {
+                        0, "pciex", (void *)phb)) {
                pr_err("PCIEXC:Failed to request irq\n");
                goto error;
        }
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index fc46fcac3921..592c3d51b817 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -412,8 +412,7 @@ static void cell_iommu_enable_hardware(struct cbe_iommu *iommu)
                        IIC_IRQ_IOEX_ATI | (iommu->nid << IIC_IRQ_NODE_SHIFT));
        BUG_ON(virq == NO_IRQ);
-        ret = request_irq(virq, ioc_interrupt, IRQF_DISABLED,
+        ret = request_irq(virq, ioc_interrupt, 0, iommu->name, iommu);
-                        iommu->name, iommu);
        BUG_ON(ret);
        /* set the IOC segment table origin register (and turn on the iommu) */
diff --git a/arch/powerpc/platforms/cell/pmu.c b/arch/powerpc/platforms/cell/pmu.c
index 1acf36010423..59c1a1694104 100644
--- a/arch/powerpc/platforms/cell/pmu.c
+++ b/arch/powerpc/platforms/cell/pmu.c
@@ -392,7 +392,7 @@ static int __init cbe_init_pm_irq(void)
                }
                rc = request_irq(irq, cbe_pm_irq,
-                                 IRQF_DISABLED, "cbe-pmu-0", NULL);
+                                 0, "cbe-pmu-0", NULL);
                if (rc) {
                        printk("ERROR: Request for irq on node %d failed\n",
                               node);
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 3675da73623f..e94d3ecdd8bb 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -442,8 +442,7 @@ static int spu_request_irqs(struct spu *spu)
                snprintf(spu->irq_c0, sizeof (spu->irq_c0), "spe%02d.0",
                         spu->number);
                ret = request_irq(spu->irqs[0], spu_irq_class_0,
-                                  IRQF_DISABLED,
+                                  0, spu->irq_c0, spu);
-                                  spu->irq_c0, spu);
                if (ret)
                        goto bail0;
        }
@@ -451,8 +450,7 @@ static int spu_request_irqs(struct spu *spu)
                snprintf(spu->irq_c1, sizeof (spu->irq_c1), "spe%02d.1",
                         spu->number);
                ret = request_irq(spu->irqs[1], spu_irq_class_1,
-                                  IRQF_DISABLED,
+                                  0, spu->irq_c1, spu);
-                                  spu->irq_c1, spu);
                if (ret)
                        goto bail1;
        }
@@ -460,8 +458,7 @@ static int spu_request_irqs(struct spu *spu)
                snprintf(spu->irq_c2, sizeof (spu->irq_c2), "spe%02d.2",
                         spu->number);
                ret = request_irq(spu->irqs[2], spu_irq_class_2,
-                                  IRQF_DISABLED,
+                                  0, spu->irq_c2, spu);
-                                  spu->irq_c2, spu);
                if (ret)
                        goto bail2;
        }
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index cb40e921a565..901bfbddc3dd 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -272,7 +272,6 @@ static struct irqaction xmon_action = {
 static struct irqaction gatwick_cascade_action = {
        .handler        = gatwick_action,
-        .flags          = IRQF_DISABLED,
        .name           = "cascade",
 };
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 9a521dc8e485..9b6a820bdd7d 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -200,7 +200,7 @@ static int psurge_secondary_ipi_init(void)
        if (psurge_secondary_virq)
                rc = request_irq(psurge_secondary_virq, psurge_ipi_intr,
-                        IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
+                        IRQF_PERCPU, "IPI", NULL);
        if (rc)
                pr_err("Failed to setup secondary cpu IPI\n");
@@ -408,7 +408,7 @@ static int __init smp_psurge_kick_cpu(int nr)
 static struct irqaction psurge_irqaction = {
        .handler = psurge_ipi_intr,
-        .flags = IRQF_DISABLED|IRQF_PERCPU,
+        .flags = IRQF_PERCPU,
        .name = "primary IPI",
 };
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index 6c4b5837fc8a..3f175e8aedb4 100644
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -825,7 +825,7 @@ static int ps3_probe_thread(void *data)
        spin_lock_init(&dev.lock);
-        res = request_irq(irq, ps3_notification_interrupt, IRQF_DISABLED,
+        res = request_irq(irq, ps3_notification_interrupt, 0,
                          "ps3_notification", &dev);
        if (res) {
                pr_err("%s:%u: request_irq failed %d\n", __func__, __LINE__,
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index 404bc52b7806..1d6f4f478fe2 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -88,6 +88,7 @@ struct ps3_private {
        struct ps3_bmp bmp __attribute__ ((aligned (PS3_BMP_MINALIGN)));
        u64 ppe_id;
        u64 thread_id;
+        unsigned long ipi_mask;
 };
 static DEFINE_PER_CPU(struct ps3_private, ps3_private);
@@ -144,7 +145,11 @@ static void ps3_chip_unmask(struct irq_data *d)
 static void ps3_chip_eoi(struct irq_data *d)
 {
        const struct ps3_private *pd = irq_data_get_irq_chip_data(d);
-        lv1_end_of_interrupt_ext(pd->ppe_id, pd->thread_id, d->irq);
+        /* non-IPIs are EOIed here. */
+        if (!test_bit(63 - d->irq, &pd->ipi_mask))
+                lv1_end_of_interrupt_ext(pd->ppe_id, pd->thread_id, d->irq);
 }
 /**
@@ -691,6 +696,16 @@ void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq)
                cpu, virq, pd->bmp.ipi_debug_brk_mask);
 }
+void __init ps3_register_ipi_irq(unsigned int cpu, unsigned int virq)
+{
+        struct ps3_private *pd = &per_cpu(ps3_private, cpu);
+        set_bit(63 - virq, &pd->ipi_mask);
+        DBG("%s:%d: cpu %u, virq %u, ipi_mask %lxh\n", __func__, __LINE__,
+                cpu, virq, pd->ipi_mask);
+}
 static unsigned int ps3_get_irq(void)
 {
        struct ps3_private *pd = &__get_cpu_var(ps3_private);
@@ -720,6 +735,12 @@ static unsigned int ps3_get_irq(void)
                BUG();
        }
 #endif
+        /* IPIs are EOIed here. */
+        if (test_bit(63 - plug, &pd->ipi_mask))
+                lv1_end_of_interrupt_ext(pd->ppe_id, pd->thread_id, plug);
        return plug;
 }
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 9a196a88eda7..1a633ed0fe98 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -43,6 +43,7 @@ void ps3_mm_shutdown(void);
 void ps3_init_IRQ(void);
 void ps3_shutdown_IRQ(int cpu);
 void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq);
+void __init ps3_register_ipi_irq(unsigned int cpu, unsigned int virq);
 /* smp */
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
index 5e304c292f68..ca40f6afd35d 100644
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -184,7 +184,7 @@ int ps3_repository_read_bus_type(unsigned int bus_index,
        enum ps3_bus_type *bus_type)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_PME,
                make_first_field("bus", bus_index),
@@ -199,7 +199,7 @@ int ps3_repository_read_bus_num_dev(unsigned int bus_index,
        unsigned int *num_dev)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_PME,
                make_first_field("bus", bus_index),
@@ -239,7 +239,7 @@ int ps3_repository_read_dev_type(unsigned int bus_index,
        unsigned int dev_index, enum ps3_dev_type *dev_type)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_PME,
                make_first_field("bus", bus_index),
@@ -256,8 +256,8 @@ int ps3_repository_read_dev_intr(unsigned int bus_index,
        enum ps3_interrupt_type *intr_type, unsigned int *interrupt_id)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
-        u64 v2;
+        u64 v2 = 0;
        result = read_node(PS3_LPAR_ID_PME,
                make_first_field("bus", bus_index),
@@ -275,7 +275,7 @@ int ps3_repository_read_dev_reg_type(unsigned int bus_index,
        enum ps3_reg_type *reg_type)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_PME,
                make_first_field("bus", bus_index),
@@ -615,7 +615,7 @@ int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
        unsigned int dev_index, unsigned int *num_regions)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_PME,
                make_first_field("bus", bus_index),
@@ -631,7 +631,7 @@ int ps3_repository_read_stor_dev_region_id(unsigned int bus_index,
        unsigned int *region_id)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_PME,
            make_first_field("bus", bus_index),
@@ -786,7 +786,7 @@ int ps3_repository_read_mm_info(u64 *rm_base, u64 *rm_size, u64 *region_total)
 int ps3_repository_read_num_spu_reserved(unsigned int *num_spu_reserved)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_CURRENT,
                make_first_field("bi", 0),
@@ -805,7 +805,7 @@ int ps3_repository_read_num_spu_reserved(unsigned int *num_spu_reserved)
 int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_CURRENT,
                make_first_field("bi", 0),
@@ -827,8 +827,8 @@ int ps3_repository_read_spu_resource_id(unsigned int res_index,
        enum ps3_spu_resource_type *resource_type, unsigned int *resource_id)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
-        u64 v2;
+        u64 v2 = 0;
        result = read_node(PS3_LPAR_ID_CURRENT,
                make_first_field("bi", 0),
@@ -854,7 +854,7 @@ static int ps3_repository_read_boot_dat_address(u64 *address)
 int ps3_repository_read_boot_dat_size(unsigned int *size)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_CURRENT,
                make_first_field("bi", 0),
@@ -869,7 +869,7 @@ int ps3_repository_read_boot_dat_size(unsigned int *size)
 int ps3_repository_read_vuart_av_port(unsigned int *port)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_CURRENT,
                make_first_field("bi", 0),
@@ -884,7 +884,7 @@ int ps3_repository_read_vuart_av_port(unsigned int *port)
 int ps3_repository_read_vuart_sysmgr_port(unsigned int *port)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_CURRENT,
                make_first_field("bi", 0),
@@ -919,7 +919,7 @@ int ps3_repository_read_boot_dat_info(u64 *lpar_addr, unsigned int *size)
 int ps3_repository_read_num_be(unsigned int *num_be)
 {
        int result;
-        u64 v1;
+        u64 v1 = 0;
        result = read_node(PS3_LPAR_ID_PME,
                make_first_field("ben", 0),
diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c
index 4c44794faac0..efc1cd8c034a 100644
--- a/arch/powerpc/platforms/ps3/smp.c
+++ b/arch/powerpc/platforms/ps3/smp.c
@@ -59,46 +59,49 @@ static void ps3_smp_message_pass(int cpu, int msg)
 static int ps3_smp_probe(void)
 {
-        return 2;
+        int cpu;
-}
-static void __init ps3_smp_setup_cpu(int cpu)
+        for (cpu = 0; cpu < 2; cpu++) {
-{
+                int result;
-        int result;
+                unsigned int *virqs = per_cpu(ps3_ipi_virqs, cpu);
-        unsigned int *virqs = per_cpu(ps3_ipi_virqs, cpu);
+                int i;
-        int i;
-        DBG(" -> %s:%d: (%d)\n", __func__, __LINE__, cpu);
+                DBG(" -> %s:%d: (%d)\n", __func__, __LINE__, cpu);
-        /*
+                /*
-         * Check assumptions on ps3_ipi_virqs[] indexing. If this
+                * Check assumptions on ps3_ipi_virqs[] indexing. If this
-         * check fails, then a different mapping of PPC_MSG_
+                * check fails, then a different mapping of PPC_MSG_
-         * to index needs to be setup.
+                * to index needs to be setup.
-         */
+                */
-        BUILD_BUG_ON(PPC_MSG_CALL_FUNCTION    != 0);
+                BUILD_BUG_ON(PPC_MSG_CALL_FUNCTION    != 0);
-        BUILD_BUG_ON(PPC_MSG_RESCHEDULE       != 1);
+                BUILD_BUG_ON(PPC_MSG_RESCHEDULE       != 1);
-        BUILD_BUG_ON(PPC_MSG_CALL_FUNC_SINGLE != 2);
+                BUILD_BUG_ON(PPC_MSG_CALL_FUNC_SINGLE != 2);
-        BUILD_BUG_ON(PPC_MSG_DEBUGGER_BREAK   != 3);
+                BUILD_BUG_ON(PPC_MSG_DEBUGGER_BREAK   != 3);
-        for (i = 0; i < MSG_COUNT; i++) {
+                for (i = 0; i < MSG_COUNT; i++) {
-                result = ps3_event_receive_port_setup(cpu, &virqs[i]);
+                        result = ps3_event_receive_port_setup(cpu, &virqs[i]);
-                if (result)
+                        if (result)
-                        continue;
+                                continue;
-                DBG("%s:%d: (%d, %d) => virq %u\n",
+                        DBG("%s:%d: (%d, %d) => virq %u\n",
-                        __func__, __LINE__, cpu, i, virqs[i]);
+                                __func__, __LINE__, cpu, i, virqs[i]);
-                result = smp_request_message_ipi(virqs[i], i);
+                        result = smp_request_message_ipi(virqs[i], i);
-                if (result)
+                        if (result)
-                        virqs[i] = NO_IRQ;
+                                virqs[i] = NO_IRQ;
-        }
+                        else
+                                ps3_register_ipi_irq(cpu, virqs[i]);
+                }
-        ps3_register_ipi_debug_brk(cpu, virqs[PPC_MSG_DEBUGGER_BREAK]);
+                ps3_register_ipi_debug_brk(cpu, virqs[PPC_MSG_DEBUGGER_BREAK]);
-        DBG(" <- %s:%d: (%d)\n", __func__, __LINE__, cpu);
+                DBG(" <- %s:%d: (%d)\n", __func__, __LINE__, cpu);
+        }
+        return 2;
 }
 void ps3_smp_cleanup_cpu(int cpu)
@@ -121,7 +124,6 @@ static struct smp_ops_t ps3_smp_ops = {
        .probe          = ps3_smp_probe,
        .message_pass   = ps3_smp_message_pass,
        .kick_cpu       = smp_generic_kick_cpu,
-        .setup_cpu      = ps3_smp_setup_cpu,
 };
 void smp_init_ps3(void)
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index de170fd5ba4e..22ffccd8bef5 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -23,7 +23,7 @@
 */
 #include <linux/init.h>
-#include <linux/export.h>
+#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 0842c6f8a3e6..8c7e8528e7c4 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -800,8 +800,6 @@ static void mpic_end_ipi(struct irq_data *d)
         * IPIs are marked IRQ_PER_CPU. This has the side effect of
         * preventing the IRQ_PENDING/IRQ_INPROGRESS logic from
         * applying to them. We EOI them late to avoid re-entering.
-         * We mark IPI's with IRQF_DISABLED as they must run with
-         * irqs disabled.
         */
        mpic_eoi(mpic);
 }
diff --git a/arch/powerpc/sysdev/ppc4xx_soc.c b/arch/powerpc/sysdev/ppc4xx_soc.c
index d3d6ce3c33b4..0debcc31ad70 100644
--- a/arch/powerpc/sysdev/ppc4xx_soc.c
+++ b/arch/powerpc/sysdev/ppc4xx_soc.c
@@ -115,7 +115,7 @@ static int __init ppc4xx_l2c_probe(void)
        }
        /* Install error handler */
-        if (request_irq(irq, l2c_error_handler, IRQF_DISABLED, "L2C", 0) < 0) {
+        if (request_irq(irq, l2c_error_handler, 0, "L2C", 0) < 0) {
                printk(KERN_ERR "Cannot install L2C error handler"
                       ", cache is not enabled\n");
                of_node_put(np);
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
index 3d93a8ded0f8..63762c672a03 100644
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -134,11 +134,10 @@ static void xics_request_ipi(void)
        BUG_ON(ipi == NO_IRQ);
        /*
-         * IPIs are marked IRQF_DISABLED as they must run with irqs
+         * IPIs are marked IRQF_PERCPU. The handler was set in map.
-         * disabled, and PERCPU.  The handler was set in map.
         */
        BUG_ON(request_irq(ipi, icp_ops->ipi_action,
-                           IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL));
+                           IRQF_PERCPU, "IPI", NULL));
 }
 int __init xics_smp_probe(void)
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index a9fbd43395f7..373679b3744a 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -572,6 +572,7 @@ config KEXEC
 config CRASH_DUMP
        bool "kernel crash dumps"
        depends on 64BIT
+        select KEXEC
        help
          Generate crash dump after being started by kexec.
          Crash dump kernels are loaded in the main kernel with kexec-tools
diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h
index 49676771bd66..ffd1ac255f19 100644
--- a/arch/s390/crypto/crypt_s390.h
+++ b/arch/s390/crypto/crypt_s390.h
@@ -368,9 +368,12 @@ static inline int crypt_s390_func_available(int func,
        if (facility_mask & CRYPT_S390_MSA && !test_facility(17))
                return 0;
-        if (facility_mask & CRYPT_S390_MSA3 && !test_facility(76))
+        if (facility_mask & CRYPT_S390_MSA3 &&
+            (!test_facility(2) || !test_facility(76)))
                return 0;
-        if (facility_mask & CRYPT_S390_MSA4 && !test_facility(77))
+        if (facility_mask & CRYPT_S390_MSA4 &&
+            (!test_facility(2) || !test_facility(77)))
                return 0;
        switch (func & CRYPT_S390_OP_MASK) {
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 24e18473d926..b0c235cb6ad5 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -47,7 +47,7 @@ struct sca_block {
 #define KVM_HPAGE_MASK(x)       (~(KVM_HPAGE_SIZE(x) - 1))
 #define KVM_PAGES_PER_HPAGE(x)  (KVM_HPAGE_SIZE(x) / PAGE_SIZE)
-#define CPUSTAT_HOST       0x80000000
+#define CPUSTAT_STOPPED    0x80000000
 #define CPUSTAT_WAIT       0x10000000
 #define CPUSTAT_ECALL_PEND 0x08000000
 #define CPUSTAT_STOP_INT   0x04000000
@@ -139,6 +139,7 @@ struct kvm_vcpu_stat {
        u32 instruction_stfl;
        u32 instruction_tprot;
        u32 instruction_sigp_sense;
+        u32 instruction_sigp_sense_running;
        u32 instruction_sigp_external_call;
        u32 instruction_sigp_emergency;
        u32 instruction_sigp_stop;
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 34ede0ea85a9..524d23b8610c 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -593,6 +593,8 @@ static inline pgste_t pgste_update_all(pte_t *ptep, pgste_t pgste)
        unsigned long address, bits;
        unsigned char skey;
+        if (!pte_present(*ptep))
+                return pgste;
        address = pte_val(*ptep) & PAGE_MASK;
        skey = page_get_storage_key(address);
        bits = skey & (_PAGE_CHANGED | _PAGE_REFERENCED);
@@ -625,6 +627,8 @@ static inline pgste_t pgste_update_young(pte_t *ptep, pgste_t pgste)
 #ifdef CONFIG_PGSTE
        int young;
+        if (!pte_present(*ptep))
+                return pgste;
        young = page_reset_referenced(pte_val(*ptep) & PAGE_MASK);
        /* Transfer page referenced bit to pte software bit (host view) */
        if (young || (pgste_val(pgste) & RCP_HR_BIT))
@@ -638,13 +642,15 @@ static inline pgste_t pgste_update_young(pte_t *ptep, pgste_t pgste)
 }
-static inline void pgste_set_pte(pte_t *ptep, pgste_t pgste)
+static inline void pgste_set_pte(pte_t *ptep, pgste_t pgste, pte_t entry)
 {
 #ifdef CONFIG_PGSTE
        unsigned long address;
        unsigned long okey, nkey;
-        address = pte_val(*ptep) & PAGE_MASK;
+        if (!pte_present(entry))
+                return;
+        address = pte_val(entry) & PAGE_MASK;
        okey = nkey = page_get_storage_key(address);
        nkey &= ~(_PAGE_ACC_BITS | _PAGE_FP_BIT);
        /* Set page access key and fetch protection bit from pgste */
@@ -712,7 +718,7 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
        if (mm_has_pgste(mm)) {
                pgste = pgste_get_lock(ptep);
-                pgste_set_pte(ptep, pgste);
+                pgste_set_pte(ptep, pgste, entry);
                *ptep = entry;
                pgste_set_unlock(ptep, pgste);
        } else
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index 5a099714df04..097183c70407 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -82,6 +82,7 @@ extern unsigned int user_mode;
 #define MACHINE_FLAG_LPAR       (1UL << 12)
 #define MACHINE_FLAG_SPP        (1UL << 13)
 #define MACHINE_FLAG_TOPOLOGY   (1UL << 14)
+#define MACHINE_FLAG_STCKF      (1UL << 15)
 #define MACHINE_IS_VM           (S390_lowcore.machine_flags & MACHINE_FLAG_VM)
 #define MACHINE_IS_KVM          (S390_lowcore.machine_flags & MACHINE_FLAG_KVM)
@@ -100,6 +101,7 @@ extern unsigned int user_mode;
 #define MACHINE_HAS_PFMF        (0)
 #define MACHINE_HAS_SPP         (0)
 #define MACHINE_HAS_TOPOLOGY    (0)
+#define MACHINE_HAS_STCKF       (0)
 #else /* __s390x__ */
 #define MACHINE_HAS_IEEE        (1)
 #define MACHINE_HAS_CSP         (1)
@@ -111,6 +113,7 @@ extern unsigned int user_mode;
 #define MACHINE_HAS_PFMF        (S390_lowcore.machine_flags & MACHINE_FLAG_PFMF)
 #define MACHINE_HAS_SPP         (S390_lowcore.machine_flags & MACHINE_FLAG_SPP)
 #define MACHINE_HAS_TOPOLOGY    (S390_lowcore.machine_flags & MACHINE_FLAG_TOPOLOGY)
+#define MACHINE_HAS_STCKF       (S390_lowcore.machine_flags & MACHINE_FLAG_STCKF)
 #endif /* __s390x__ */
 #define ZFCPDUMP_HSA_SIZE       (32UL<<20)
diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h
index d610bef9c5e9..c447a27a7fdb 100644
--- a/arch/s390/include/asm/timex.h
+++ b/arch/s390/include/asm/timex.h
@@ -90,7 +90,7 @@ static inline unsigned long long get_clock_fast(void)
 {
        unsigned long long clk;
-        if (test_facility(25))
+        if (MACHINE_HAS_STCKF)
                asm volatile(".insn     s,0xb27c0000,%0" : "=Q" (clk) : : "cc");
        else
                clk = get_clock();
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
index 404bdb9671b4..58de4c91c333 100644
--- a/arch/s390/include/asm/unistd.h
+++ b/arch/s390/include/asm/unistd.h
@@ -277,7 +277,9 @@
 #define __NR_clock_adjtime      337
 #define __NR_syncfs             338
 #define __NR_setns              339
-#define NR_syscalls 340
+#define __NR_process_vm_readv   340
+#define __NR_process_vm_writev  341
+#define NR_syscalls 342
 /* 
 * There are some system calls that are not present on 64 bit, some
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 5006a1d9f5d0..18c51df9fe06 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -1627,3 +1627,23 @@ ENTRY(sys_setns_wrapper)
        lgfr    %r2,%r2                 # int
        lgfr    %r3,%r3                 # int
        jg      sys_setns
+ENTRY(compat_sys_process_vm_readv_wrapper)
+        lgfr    %r2,%r2                 # compat_pid_t
+        llgtr   %r3,%r3                 # struct compat_iovec __user *
+        llgfr   %r4,%r4                 # unsigned long
+        llgtr   %r5,%r5                 # struct compat_iovec __user *
+        llgfr   %r6,%r6                 # unsigned long
+        llgf    %r0,164(%r15)           # unsigned long
+        stg     %r0,160(%r15)
+        jg      sys_process_vm_readv
+ENTRY(compat_sys_process_vm_writev_wrapper)
+        lgfr    %r2,%r2                 # compat_pid_t
+        llgtr   %r3,%r3                 # struct compat_iovec __user *
+        llgfr   %r4,%r4                 # unsigned long
+        llgtr   %r5,%r5                 # struct compat_iovec __user *
+        llgfr   %r6,%r6                 # unsigned long
+        llgf    %r0,164(%r15)           # unsigned long
+        stg     %r0,160(%r15)
+        jg      sys_process_vm_writev
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 37394b3413e2..c9ffe0025197 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -390,6 +390,8 @@ static __init void detect_machine_facilities(void)
                S390_lowcore.machine_flags |= MACHINE_FLAG_MVCOS;
        if (test_facility(40))
                S390_lowcore.machine_flags |= MACHINE_FLAG_SPP;
+        if (test_facility(25))
+                S390_lowcore.machine_flags |= MACHINE_FLAG_STCKF;
 #endif
 }
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 8ac6bfa2786c..e58a462949b1 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -211,6 +211,8 @@ static void __init setup_zfcpdump(unsigned int console_devno)
        if (ipl_info.type != IPL_TYPE_FCP_DUMP)
                return;
+        if (OLDMEM_BASE)
+                return;
        if (console_devno != -1)
                sprintf(str, " cio_ignore=all,!0.0.%04x,!0.0.%04x",
                        ipl_info.data.fcp.dev_id.devno, console_devno);
@@ -482,7 +484,7 @@ static void __init setup_memory_end(void)
 #ifdef CONFIG_ZFCPDUMP
-        if (ipl_info.type == IPL_TYPE_FCP_DUMP) {
+        if (ipl_info.type == IPL_TYPE_FCP_DUMP && !OLDMEM_BASE) {
                memory_end = ZFCPDUMP_HSA_SIZE;
                memory_end_set = 1;
        }
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 73eb08c874fb..bcab2f04ba58 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -348,3 +348,5 @@ SYSCALL(sys_open_by_handle_at,sys_open_by_handle_at,compat_sys_open_by_handle_at
 SYSCALL(sys_clock_adjtime,sys_clock_adjtime,compat_sys_clock_adjtime_wrapper)
 SYSCALL(sys_syncfs,sys_syncfs,sys_syncfs_wrapper)
 SYSCALL(sys_setns,sys_setns,sys_setns_wrapper)
+SYSCALL(sys_process_vm_readv,sys_process_vm_readv,compat_sys_process_vm_readv_wrapper) /* 340 */
+SYSCALL(sys_process_vm_writev,sys_process_vm_writev,compat_sys_process_vm_writev_wrapper)
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 77b8942b9a15..fdb5b8cb260f 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -68,8 +68,10 @@ static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)
        return mask;
 }
-static void add_cpus_to_mask(struct topology_cpu *tl_cpu,
+static struct mask_info *add_cpus_to_mask(struct topology_cpu *tl_cpu,
-                             struct mask_info *book, struct mask_info *core)
+                                          struct mask_info *book,
+                                          struct mask_info *core,
+                                          int z10)
 {
        unsigned int cpu;
@@ -88,10 +90,16 @@ static void add_cpus_to_mask(struct topology_cpu *tl_cpu,
                        cpu_book_id[lcpu] = book->id;
 #endif
                        cpumask_set_cpu(lcpu, &core->mask);
-                        cpu_core_id[lcpu] = core->id;
+                        if (z10) {
+                                cpu_core_id[lcpu] = rcpu;
+                                core = core->next;
+                        } else {
+                                cpu_core_id[lcpu] = core->id;
+                        }
                        smp_cpu_polarization[lcpu] = tl_cpu->pp;
                }
        }
+        return core;
 }
 static void clear_masks(void)
@@ -123,18 +131,41 @@ static void tl_to_cores(struct sysinfo_15_1_x *info)
 {
 #ifdef CONFIG_SCHED_BOOK
        struct mask_info *book = &book_info;
+        struct cpuid cpu_id;
 #else
        struct mask_info *book = NULL;
 #endif
        struct mask_info *core = &core_info;
        union topology_entry *tle, *end;
+        int z10 = 0;
+#ifdef CONFIG_SCHED_BOOK
+        get_cpu_id(&cpu_id);
+        z10 = cpu_id.machine == 0x2097 || cpu_id.machine == 0x2098;
+#endif
        spin_lock_irq(&topology_lock);
        clear_masks();
        tle = info->tle;
        end = (union topology_entry *)((unsigned long)info + info->length);
        while (tle < end) {
+#ifdef CONFIG_SCHED_BOOK
+                if (z10) {
+                        switch (tle->nl) {
+                        case 1:
+                                book = book->next;
+                                book->id = tle->container.id;
+                                break;
+                        case 0:
+                                core = add_cpus_to_mask(&tle->cpu, book, core, z10);
+                                break;
+                        default:
+                                clear_masks();
+                                goto out;
+                        }
+                        tle = next_tle(tle);
+                        continue;
+                }
+#endif
                switch (tle->nl) {
 #ifdef CONFIG_SCHED_BOOK
                case 2:
@@ -147,7 +178,7 @@ static void tl_to_cores(struct sysinfo_15_1_x *info)
                        core->id = tle->container.id;
                        break;
                case 0:
-                        add_cpus_to_mask(&tle->cpu, book, core);
+                        add_cpus_to_mask(&tle->cpu, book, core, z10);
                        break;
                default:
                        clear_masks();
@@ -328,8 +359,8 @@ void __init s390_init_cpu_topology(void)
        for (i = 0; i < TOPOLOGY_NR_MAG; i++)
                printk(" %d", info->mag[i]);
        printk(" / %d\n", info->mnest);
-        alloc_masks(info, &core_info, 2);
+        alloc_masks(info, &core_info, 1);
 #ifdef CONFIG_SCHED_BOOK
-        alloc_masks(info, &book_info, 3);
+        alloc_masks(info, &book_info, 2);
 #endif
 }
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 56fe6bc81fee..e4c79ebb40e6 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -43,6 +43,8 @@ SECTIONS
        NOTES :text :note
+        .dummy : { *(.dummy) } :data
        RODATA
 #ifdef CONFIG_SHARED_KERNEL
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
index 87cedd61be04..8943e82cd4d9 100644
--- a/arch/s390/kvm/diag.c
+++ b/arch/s390/kvm/diag.c
@@ -70,7 +70,7 @@ static int __diag_ipl_functions(struct kvm_vcpu *vcpu)
                return -EOPNOTSUPP;
        }
-        atomic_clear_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
+        atomic_set_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);
        vcpu->run->s390_reset_flags |= KVM_S390_RESET_SUBSYSTEM;
        vcpu->run->s390_reset_flags |= KVM_S390_RESET_IPL;
        vcpu->run->s390_reset_flags |= KVM_S390_RESET_CPU_INIT;
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index c7c51898984e..02434543eabb 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -132,7 +132,6 @@ static int handle_stop(struct kvm_vcpu *vcpu)
        int rc = 0;
        vcpu->stat.exit_stop_request++;
-        atomic_clear_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
        spin_lock_bh(&vcpu->arch.local_int.lock);
        if (vcpu->arch.local_int.action_bits & ACTION_STORE_ON_STOP) {
                vcpu->arch.local_int.action_bits &= ~ACTION_STORE_ON_STOP;
@@ -149,6 +148,8 @@ static int handle_stop(struct kvm_vcpu *vcpu)
        }
        if (vcpu->arch.local_int.action_bits & ACTION_STOP_ON_STOP) {
+                atomic_set_mask(CPUSTAT_STOPPED,
+                                &vcpu->arch.sie_block->cpuflags);
                vcpu->arch.local_int.action_bits &= ~ACTION_STOP_ON_STOP;
                VCPU_EVENT(vcpu, 3, "%s", "cpu stopped");
                rc = -EOPNOTSUPP;
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 87c16705b381..278ee009ce65 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -252,6 +252,7 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu,
                        offsetof(struct _lowcore, restart_psw), sizeof(psw_t));
                if (rc == -EFAULT)
                        exception = 1;
+                atomic_clear_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);
                break;
        case KVM_S390_PROGRAM_INT:
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 0bd3bea1e4cd..d1c445732451 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -65,6 +65,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
        { "instruction_stfl", VCPU_STAT(instruction_stfl) },
        { "instruction_tprot", VCPU_STAT(instruction_tprot) },
        { "instruction_sigp_sense", VCPU_STAT(instruction_sigp_sense) },
+        { "instruction_sigp_sense_running", VCPU_STAT(instruction_sigp_sense_running) },
        { "instruction_sigp_external_call", VCPU_STAT(instruction_sigp_external_call) },
        { "instruction_sigp_emergency", VCPU_STAT(instruction_sigp_emergency) },
        { "instruction_sigp_stop", VCPU_STAT(instruction_sigp_stop) },
@@ -127,6 +128,7 @@ int kvm_dev_ioctl_check_extension(long ext)
        switch (ext) {
        case KVM_CAP_S390_PSW:
        case KVM_CAP_S390_GMAP:
+        case KVM_CAP_SYNC_MMU:
                r = 1;
                break;
        default:
@@ -270,10 +272,12 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
        restore_fp_regs(&vcpu->arch.guest_fpregs);
        restore_access_regs(vcpu->arch.guest_acrs);
        gmap_enable(vcpu->arch.gmap);
+        atomic_set_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
 }
 void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 {
+        atomic_clear_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
        gmap_disable(vcpu->arch.gmap);
        save_fp_regs(&vcpu->arch.guest_fpregs);
        save_access_regs(vcpu->arch.guest_acrs);
@@ -301,7 +305,9 @@ static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu)
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 {
-        atomic_set(&vcpu->arch.sie_block->cpuflags, CPUSTAT_ZARCH | CPUSTAT_SM);
+        atomic_set(&vcpu->arch.sie_block->cpuflags, CPUSTAT_ZARCH |
+                                                    CPUSTAT_SM |
+                                                    CPUSTAT_STOPPED);
        vcpu->arch.sie_block->ecb   = 6;
        vcpu->arch.sie_block->eca   = 0xC1002001U;
        vcpu->arch.sie_block->fac   = (int) (long) facilities;
@@ -428,7 +434,7 @@ static int kvm_arch_vcpu_ioctl_set_initial_psw(struct kvm_vcpu *vcpu, psw_t psw)
 {
        int rc = 0;
-        if (atomic_read(&vcpu->arch.sie_block->cpuflags) & CPUSTAT_RUNNING)
+        if (!(atomic_read(&vcpu->arch.sie_block->cpuflags) & CPUSTAT_STOPPED))
                rc = -EBUSY;
        else {
                vcpu->run->psw_mask = psw.mask;
@@ -501,7 +507,7 @@ rerun_vcpu:
        if (vcpu->sigset_active)
                sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
-        atomic_set_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
+        atomic_clear_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);
        BUG_ON(vcpu->kvm->arch.float_int.local_int[vcpu->vcpu_id] == NULL);
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 391626361084..d02638959922 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -336,6 +336,7 @@ static int handle_tprot(struct kvm_vcpu *vcpu)
        u64 address1 = disp1 + base1 ? vcpu->arch.guest_gprs[base1] : 0;
        u64 address2 = disp2 + base2 ? vcpu->arch.guest_gprs[base2] : 0;
        struct vm_area_struct *vma;
+        unsigned long user_address;
        vcpu->stat.instruction_tprot++;
@@ -349,9 +350,14 @@ static int handle_tprot(struct kvm_vcpu *vcpu)
                return -EOPNOTSUPP;
+        /* we must resolve the address without holding the mmap semaphore.
+         * This is ok since the userspace hypervisor is not supposed to change
+         * the mapping while the guest queries the memory. Otherwise the guest
+         * might crash or get wrong info anyway. */
+        user_address = (unsigned long) __guestaddr_to_user(vcpu, address1);
        down_read(&current->mm->mmap_sem);
-        vma = find_vma(current->mm,
+        vma = find_vma(current->mm, user_address);
-                        (unsigned long) __guestaddr_to_user(vcpu, address1));
        if (!vma) {
                up_read(&current->mm->mmap_sem);
                return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c
index f815118835f3..0a7941d74bc6 100644
--- a/arch/s390/kvm/sigp.c
+++ b/arch/s390/kvm/sigp.c
@@ -31,9 +31,11 @@
 #define SIGP_SET_PREFIX        0x0d
 #define SIGP_STORE_STATUS_ADDR 0x0e
 #define SIGP_SET_ARCH          0x12
+#define SIGP_SENSE_RUNNING     0x15
 /* cpu status bits */
 #define SIGP_STAT_EQUIPMENT_CHECK   0x80000000UL
+#define SIGP_STAT_NOT_RUNNING       0x00000400UL
 #define SIGP_STAT_INCORRECT_STATE   0x00000200UL
 #define SIGP_STAT_INVALID_PARAMETER 0x00000100UL
 #define SIGP_STAT_EXT_CALL_PENDING  0x00000080UL
@@ -57,8 +59,8 @@ static int __sigp_sense(struct kvm_vcpu *vcpu, u16 cpu_addr,
        spin_lock(&fi->lock);
        if (fi->local_int[cpu_addr] == NULL)
                rc = 3; /* not operational */
-        else if (atomic_read(fi->local_int[cpu_addr]->cpuflags)
+        else if (!(atomic_read(fi->local_int[cpu_addr]->cpuflags)
-                 & CPUSTAT_RUNNING) {
+                  & CPUSTAT_STOPPED)) {
                *reg &= 0xffffffff00000000UL;
                rc = 1; /* status stored */
        } else {
@@ -251,7 +253,7 @@ static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address,
        spin_lock_bh(&li->lock);
        /* cpu must be in stopped state */
-        if (atomic_read(li->cpuflags) & CPUSTAT_RUNNING) {
+        if (!(atomic_read(li->cpuflags) & CPUSTAT_STOPPED)) {
                rc = 1; /* incorrect state */
                *reg &= SIGP_STAT_INCORRECT_STATE;
                kfree(inti);
@@ -275,6 +277,38 @@ out_fi:
        return rc;
 }
+static int __sigp_sense_running(struct kvm_vcpu *vcpu, u16 cpu_addr,
+                                unsigned long *reg)
+{
+        int rc;
+        struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int;
+        if (cpu_addr >= KVM_MAX_VCPUS)
+                return 3; /* not operational */
+        spin_lock(&fi->lock);
+        if (fi->local_int[cpu_addr] == NULL)
+                rc = 3; /* not operational */
+        else {
+                if (atomic_read(fi->local_int[cpu_addr]->cpuflags)
+                    & CPUSTAT_RUNNING) {
+                        /* running */
+                        rc = 1;
+                } else {
+                        /* not running */
+                        *reg &= 0xffffffff00000000UL;
+                        *reg |= SIGP_STAT_NOT_RUNNING;
+                        rc = 0;
+                }
+        }
+        spin_unlock(&fi->lock);
+        VCPU_EVENT(vcpu, 4, "sensed running status of cpu %x rc %x", cpu_addr,
+                   rc);
+        return rc;
+}
 int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu)
 {
        int r1 = (vcpu->arch.sie_block->ipa & 0x00f0) >> 4;
@@ -331,6 +365,11 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu)
                rc = __sigp_set_prefix(vcpu, cpu_addr, parameter,
                                       &vcpu->arch.guest_gprs[r1]);
                break;
+        case SIGP_SENSE_RUNNING:
+                vcpu->stat.instruction_sigp_sense_running++;
+                rc = __sigp_sense_running(vcpu, cpu_addr,
+                                          &vcpu->arch.guest_gprs[r1]);
+                break;
        case SIGP_RESTART:
                vcpu->stat.instruction_sigp_restart++;
                /* user space must know about restart */
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 1766def5bc3f..a9a301866b3c 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -587,8 +587,13 @@ static void pfault_interrupt(unsigned int ext_int_code,
                } else {
                        /* Completion interrupt was faster than initial
                         * interrupt. Set pfault_wait to -1 so the initial
-                         * interrupt doesn't put the task to sleep. */
+                         * interrupt doesn't put the task to sleep.
-                        tsk->thread.pfault_wait = -1;
+                         * If the task is not running, ignore the completion
+                         * interrupt since it must be a leftover of a PFAULT
+                         * CANCEL operation which didn't remove all pending
+                         * completion interrupts. */
+                        if (tsk->state == TASK_RUNNING)
+                                tsk->thread.pfault_wait = -1;
                }
                put_task_struct(tsk);
        } else {
diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h
index 0dca9a5c6be6..15d970328f71 100644
--- a/arch/sh/include/asm/page.h
+++ b/arch/sh/include/asm/page.h
@@ -151,8 +151,13 @@ typedef struct page *pgtable_t;
 #endif /* !__ASSEMBLY__ */
 #ifdef CONFIG_UNCACHED_MAPPING
+#if defined(CONFIG_29BIT)
+#define UNCAC_ADDR(addr)        P2SEGADDR(addr)
+#define CAC_ADDR(addr)          P1SEGADDR(addr)
+#else
 #define UNCAC_ADDR(addr)        ((addr) - PAGE_OFFSET + uncached_start)
 #define CAC_ADDR(addr)          ((addr) - uncached_start + PAGE_OFFSET)
+#endif
 #else
 #define UNCAC_ADDR(addr)        ((addr))
 #define CAC_ADDR(addr)          ((addr))
diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h
index 3432008d2888..152b8627a184 100644
--- a/arch/sh/include/asm/unistd_32.h
+++ b/arch/sh/include/asm/unistd_32.h
@@ -375,8 +375,10 @@
 #define __NR_syncfs             362
 #define __NR_sendmmsg           363
 #define __NR_setns              364
+#define __NR_process_vm_readv   365
+#define __NR_process_vm_writev  366
-#define NR_syscalls 365
+#define NR_syscalls 367
 #ifdef __KERNEL__
diff --git a/arch/sh/include/asm/unistd_64.h b/arch/sh/include/asm/unistd_64.h
index ec9898665f23..c330c23db5a0 100644
--- a/arch/sh/include/asm/unistd_64.h
+++ b/arch/sh/include/asm/unistd_64.h
@@ -396,10 +396,12 @@
 #define __NR_syncfs             373
 #define __NR_sendmmsg           374
 #define __NR_setns              375
+#define __NR_process_vm_readv   376
+#define __NR_process_vm_writev  377
 #ifdef __KERNEL__
-#define NR_syscalls 376
+#define NR_syscalls 378
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
index a43124e608c3..0bd744f9a3b7 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
@@ -176,10 +176,12 @@ static DECLARE_INTC_DESC(intc_desc, "sh7203", vectors, groups,
 static struct plat_sci_port scif0_platform_data = {
        .mapbase        = 0xfffe8000,
        .flags          = UPF_BOOT_AUTOCONF,
-        .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
+        .scscr          = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |
+                          SCSCR_REIE,
        .scbrr_algo_id  = SCBRR_ALGO_2,
        .type           = PORT_SCIF,
        .irqs           =  { 192, 192, 192, 192 },
+        .regtype        = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
 };
 static struct platform_device scif0_device = {
@@ -193,10 +195,12 @@ static struct platform_device scif0_device = {
 static struct plat_sci_port scif1_platform_data = {
        .mapbase        = 0xfffe8800,
        .flags          = UPF_BOOT_AUTOCONF,
-        .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
+        .scscr          = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |
+                          SCSCR_REIE,
        .scbrr_algo_id  = SCBRR_ALGO_2,
        .type           = PORT_SCIF,
        .irqs           =  { 196, 196, 196, 196 },
+        .regtype        = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
 };
 static struct platform_device scif1_device = {
@@ -210,10 +214,12 @@ static struct platform_device scif1_device = {
 static struct plat_sci_port scif2_platform_data = {
        .mapbase        = 0xfffe9000,
        .flags          = UPF_BOOT_AUTOCONF,
-        .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
+        .scscr          = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |
+                          SCSCR_REIE,
        .scbrr_algo_id  = SCBRR_ALGO_2,
        .type           = PORT_SCIF,
        .irqs           =  { 200, 200, 200, 200 },
+        .regtype        = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
 };
 static struct platform_device scif2_device = {
@@ -227,10 +233,12 @@ static struct platform_device scif2_device = {
 static struct plat_sci_port scif3_platform_data = {
        .mapbase        = 0xfffe9800,
        .flags          = UPF_BOOT_AUTOCONF,
-        .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
+        .scscr          = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE |
+                          SCSCR_REIE,
        .scbrr_algo_id  = SCBRR_ALGO_2,
        .type           = PORT_SCIF,
        .irqs           =  { 204, 204, 204, 204 },
+        .regtype        = SCIx_SH2_SCIF_FIFODATA_REGTYPE,
 };
 static struct platform_device scif3_device = {
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S
index 293e39c59c00..ee56a9b1a981 100644
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@ -382,3 +382,5 @@ ENTRY(sys_call_table)
        .long sys_syncfs
        .long sys_sendmmsg
        .long sys_setns
+        .long sys_process_vm_readv      /* 365 */
+        .long sys_process_vm_writev
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S
index ceb34b94afa9..9af7de26fb71 100644
--- a/arch/sh/kernel/syscalls_64.S
+++ b/arch/sh/kernel/syscalls_64.S
@@ -402,3 +402,5 @@ sys_call_table:
        .long sys_syncfs
        .long sys_sendmmsg
        .long sys_setns                 /* 375 */
+        .long sys_process_vm_readv
+        .long sys_process_vm_writev
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
index 5b31a8e89823..a790cc657476 100644
--- a/arch/sparc/include/asm/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
@@ -431,10 +431,6 @@ extern unsigned long *sparc_valid_addr_bitmap;
 #define kern_addr_valid(addr) \
        (test_bit(__pa((unsigned long)(addr))>>20, sparc_valid_addr_bitmap))
-extern int io_remap_pfn_range(struct vm_area_struct *vma,
-                              unsigned long from, unsigned long pfn,
-                              unsigned long size, pgprot_t prot);
 /*
 * For sparc32&64, the pfn in io_remap_pfn_range() carries <iospace> in
 * its high 4 bits.  These macros/functions put it there or get it from there.
@@ -443,6 +439,22 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma,
 #define GET_IOSPACE(pfn)                (pfn >> (BITS_PER_LONG - 4))
 #define GET_PFN(pfn)                    (pfn & 0x0fffffffUL)
+extern int remap_pfn_range(struct vm_area_struct *, unsigned long, unsigned long,
+                           unsigned long, pgprot_t);
+static inline int io_remap_pfn_range(struct vm_area_struct *vma,
+                                     unsigned long from, unsigned long pfn,
+                                     unsigned long size, pgprot_t prot)
+{
+        unsigned long long offset, space, phys_base;
+        offset = ((unsigned long long) GET_PFN(pfn)) << PAGE_SHIFT;
+        space = GET_IOSPACE(pfn);
+        phys_base = offset | (space << 32ULL);
+        return remap_pfn_range(vma, from, phys_base >> PAGE_SHIFT, size, prot);
+}
 #define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
 #define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) \
 ({                                                                        \
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
index adf89329af59..38ebb2c60137 100644
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
@@ -757,10 +757,6 @@ static inline bool kern_addr_valid(unsigned long addr)
 extern int page_in_phys_avail(unsigned long paddr);
-extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
-                               unsigned long pfn,
-                               unsigned long size, pgprot_t prot);
 /*
 * For sparc32&64, the pfn in io_remap_pfn_range() carries <iospace> in
 * its high 4 bits.  These macros/functions put it there or get it from there.
@@ -769,6 +765,22 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
 #define GET_IOSPACE(pfn)                (pfn >> (BITS_PER_LONG - 4))
 #define GET_PFN(pfn)                    (pfn & 0x0fffffffffffffffUL)
+extern int remap_pfn_range(struct vm_area_struct *, unsigned long, unsigned long,
+                           unsigned long, pgprot_t);
+static inline int io_remap_pfn_range(struct vm_area_struct *vma,
+                                     unsigned long from, unsigned long pfn,
+                                     unsigned long size, pgprot_t prot)
+{
+        unsigned long offset = GET_PFN(pfn) << PAGE_SHIFT;
+        int space = GET_IOSPACE(pfn);
+        unsigned long phys_base;
+        phys_base = offset | (((unsigned long) space) << 32UL);
+        return remap_pfn_range(vma, from, phys_base >> PAGE_SHIFT, size, prot);
+}
 #include <asm-generic/pgtable.h>
 /* We provide our own get_unmapped_area to cope with VA holes and
diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h
index 6260d5deeabc..c7cb0af0eb59 100644
--- a/arch/sparc/include/asm/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@ -406,8 +406,10 @@
 #define __NR_syncfs             335
 #define __NR_sendmmsg           336
 #define __NR_setns              337
+#define __NR_process_vm_readv   338
+#define __NR_process_vm_writev  339
-#define NR_syscalls             338
+#define NR_syscalls             340
 #ifdef __32bit_syscall_numbers__
 /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,
diff --git a/arch/sparc/kernel/entry.h b/arch/sparc/kernel/entry.h
index e27f8ea8656e..0c218e4c0881 100644
--- a/arch/sparc/kernel/entry.h
+++ b/arch/sparc/kernel/entry.h
@@ -42,6 +42,9 @@ extern void fpsave(unsigned long *fpregs, unsigned long *fsr,
 extern void fpload(unsigned long *fpregs, unsigned long *fsr);
 #else /* CONFIG_SPARC32 */
+#include <asm/trap_block.h>
 struct popc_3insn_patch_entry {
        unsigned int    addr;
        unsigned int    insns[3];
@@ -57,6 +60,10 @@ extern struct popc_6insn_patch_entry __popc_6insn_patch,
        __popc_6insn_patch_end;
 extern void __init per_cpu_patch(void);
+extern void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *,
+                                    struct sun4v_1insn_patch_entry *);
+extern void sun4v_patch_2insn_range(struct sun4v_2insn_patch_entry *,
+                                    struct sun4v_2insn_patch_entry *);
 extern void __init sun4v_patch(void);
 extern void __init boot_cpu_id_too_large(int cpu);
 extern unsigned int dcache_parity_tl1_occurred;
diff --git a/arch/sparc/kernel/module.c b/arch/sparc/kernel/module.c
index da0c6c70ccb2..e5519870c3d9 100644
--- a/arch/sparc/kernel/module.c
+++ b/arch/sparc/kernel/module.c
@@ -17,6 +17,8 @@
 #include <asm/processor.h>
 #include <asm/spitfire.h>
+#include "entry.h"
 #ifdef CONFIG_SPARC64
 #include <linux/jump_label.h>
@@ -203,6 +205,29 @@ int apply_relocate_add(Elf_Shdr *sechdrs,
 }
 #ifdef CONFIG_SPARC64
+static void do_patch_sections(const Elf_Ehdr *hdr,
+                              const Elf_Shdr *sechdrs)
+{
+        const Elf_Shdr *s, *sun4v_1insn = NULL, *sun4v_2insn = NULL;
+        char *secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
+        for (s = sechdrs; s < sechdrs + hdr->e_shnum; s++) {
+                if (!strcmp(".sun4v_1insn_patch", secstrings + s->sh_name))
+                        sun4v_1insn = s;
+                if (!strcmp(".sun4v_2insn_patch", secstrings + s->sh_name))
+                        sun4v_2insn = s;
+        }
+        if (sun4v_1insn && tlb_type == hypervisor) {
+                void *p = (void *) sun4v_1insn->sh_addr;
+                sun4v_patch_1insn_range(p, p + sun4v_1insn->sh_size);
+        }
+        if (sun4v_2insn && tlb_type == hypervisor) {
+                void *p = (void *) sun4v_2insn->sh_addr;
+                sun4v_patch_2insn_range(p, p + sun4v_2insn->sh_size);
+        }
+}
 int module_finalize(const Elf_Ehdr *hdr,
                    const Elf_Shdr *sechdrs,
                    struct module *me)
@@ -210,6 +235,8 @@ int module_finalize(const Elf_Ehdr *hdr,
        /* make jump label nops */
        jump_label_apply_nops(me);
+        do_patch_sections(hdr, sechdrs);
        /* Cheetah's I-cache is fully coherent.  */
        if (tlb_type == spitfire) {
                unsigned long va;
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index c965595aa7e9..a854a1c240ff 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -234,40 +234,50 @@ void __init per_cpu_patch(void)
        }
 }
-void __init sun4v_patch(void)
+void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *start,
+                             struct sun4v_1insn_patch_entry *end)
 {
-        extern void sun4v_hvapi_init(void);
+        while (start < end) {
-        struct sun4v_1insn_patch_entry *p1;
+                unsigned long addr = start->addr;
-        struct sun4v_2insn_patch_entry *p2;
-        if (tlb_type != hypervisor)
-                return;
-        p1 = &__sun4v_1insn_patch;
+                *(unsigned int *) (addr +  0) = start->insn;
-        while (p1 < &__sun4v_1insn_patch_end) {
-                unsigned long addr = p1->addr;
-                *(unsigned int *) (addr +  0) = p1->insn;
                wmb();
                __asm__ __volatile__("flush     %0" : : "r" (addr +  0));
-                p1++;
+                start++;
        }
+}
-        p2 = &__sun4v_2insn_patch;
+void sun4v_patch_2insn_range(struct sun4v_2insn_patch_entry *start,
-        while (p2 < &__sun4v_2insn_patch_end) {
+                             struct sun4v_2insn_patch_entry *end)
-                unsigned long addr = p2->addr;
+{
+        while (start < end) {
+                unsigned long addr = start->addr;
-                *(unsigned int *) (addr +  0) = p2->insns[0];
+                *(unsigned int *) (addr +  0) = start->insns[0];
                wmb();
                __asm__ __volatile__("flush     %0" : : "r" (addr +  0));
-                *(unsigned int *) (addr +  4) = p2->insns[1];
+                *(unsigned int *) (addr +  4) = start->insns[1];
                wmb();
                __asm__ __volatile__("flush     %0" : : "r" (addr +  4));
-                p2++;
+                start++;
        }
+}
+void __init sun4v_patch(void)
+{
+        extern void sun4v_hvapi_init(void);
+        if (tlb_type != hypervisor)
+                return;
+        sun4v_patch_1insn_range(&__sun4v_1insn_patch,
+                                &__sun4v_1insn_patch_end);
+        sun4v_patch_2insn_range(&__sun4v_2insn_patch,
+                                &__sun4v_2insn_patch_end);
        sun4v_hvapi_init();
 }
diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c
index 2caa556db86d..023b8860dc97 100644
--- a/arch/sparc/kernel/signal32.c
+++ b/arch/sparc/kernel/signal32.c
@@ -822,21 +822,23 @@ static inline void syscall_restart32(unsigned long orig_i0, struct pt_regs *regs
 * want to handle. Thus you cannot kill init even with a SIGKILL even by
 * mistake.
 */
-void do_signal32(sigset_t *oldset, struct pt_regs * regs,
+void do_signal32(sigset_t *oldset, struct pt_regs * regs)
-                 int restart_syscall, unsigned long orig_i0)
 {
        struct k_sigaction ka;
+        unsigned long orig_i0;
+        int restart_syscall;
        siginfo_t info;
        int signr;
        
        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        /* If the debugger messes with the program counter, it clears
+        restart_syscall = 0;
-         * the "in syscall" bit, directing us to not perform a syscall
+        orig_i0 = 0;
-         * restart.
+        if (pt_regs_is_syscall(regs) &&
-         */
+            (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY))) {
-        if (restart_syscall && !pt_regs_is_syscall(regs))
+                restart_syscall = 1;
-                restart_syscall = 0;
+                orig_i0 = regs->u_regs[UREG_G6];
+        }
        if (signr > 0) {
                if (restart_syscall)
diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
index 8ce247ac04cc..d54c6e53aba0 100644
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -519,10 +519,26 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
        siginfo_t info;
        int signr;
+        /* It's a lot of work and synchronization to add a new ptrace
+         * register for GDB to save and restore in order to get
+         * orig_i0 correct for syscall restarts when debugging.
+         *
+         * Although it should be the case that most of the global
+         * registers are volatile across a system call, glibc already
+         * depends upon that fact that we preserve them.  So we can't
+         * just use any global register to save away the orig_i0 value.
+         *
+         * In particular %g2, %g3, %g4, and %g5 are all assumed to be
+         * preserved across a system call trap by various pieces of
+         * code in glibc.
+         *
+         * %g7 is used as the "thread register".   %g6 is not used in
+         * any fixed manner.  %g6 is used as a scratch register and
+         * a compiler temporary, but it's value is never used across
+         * a system call.  Therefore %g6 is usable for orig_i0 storage.
+         */
        if (pt_regs_is_syscall(regs) && (regs->psr & PSR_C))
-                restart_syscall = 1;
+                regs->u_regs[UREG_G6] = orig_i0;
-        else
-                restart_syscall = 0;
        if (test_thread_flag(TIF_RESTORE_SIGMASK))
                oldset = &current->saved_sigmask;
@@ -535,8 +551,12 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
         * the software "in syscall" bit, directing us to not perform
         * a syscall restart.
         */
-        if (restart_syscall && !pt_regs_is_syscall(regs))
+        restart_syscall = 0;
-                restart_syscall = 0;
+        if (pt_regs_is_syscall(regs) && (regs->psr & PSR_C)) {
+                restart_syscall = 1;
+                orig_i0 = regs->u_regs[UREG_G6];
+        }
        if (signr > 0) {
                if (restart_syscall)
diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c
index a2b81598d905..f0836cd0e2f2 100644
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
@@ -529,11 +529,27 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
        siginfo_t info;
        int signr;
        
+        /* It's a lot of work and synchronization to add a new ptrace
+         * register for GDB to save and restore in order to get
+         * orig_i0 correct for syscall restarts when debugging.
+         *
+         * Although it should be the case that most of the global
+         * registers are volatile across a system call, glibc already
+         * depends upon that fact that we preserve them.  So we can't
+         * just use any global register to save away the orig_i0 value.
+         *
+         * In particular %g2, %g3, %g4, and %g5 are all assumed to be
+         * preserved across a system call trap by various pieces of
+         * code in glibc.
+         *
+         * %g7 is used as the "thread register".   %g6 is not used in
+         * any fixed manner.  %g6 is used as a scratch register and
+         * a compiler temporary, but it's value is never used across
+         * a system call.  Therefore %g6 is usable for orig_i0 storage.
+         */
        if (pt_regs_is_syscall(regs) &&
-            (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY))) {
+            (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY)))
-                restart_syscall = 1;
+                regs->u_regs[UREG_G6] = orig_i0;
-        } else
-                restart_syscall = 0;
        if (current_thread_info()->status & TS_RESTORE_SIGMASK)
                oldset = &current->saved_sigmask;
@@ -542,22 +558,20 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
 #ifdef CONFIG_COMPAT
        if (test_thread_flag(TIF_32BIT)) {
-                extern void do_signal32(sigset_t *, struct pt_regs *,
+                extern void do_signal32(sigset_t *, struct pt_regs *);
-                                        int restart_syscall,
+                do_signal32(oldset, regs);
-                                        unsigned long orig_i0);
-                do_signal32(oldset, regs, restart_syscall, orig_i0);
                return;
        }
 #endif  
        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        /* If the debugger messes with the program counter, it clears
+        restart_syscall = 0;
-         * the software "in syscall" bit, directing us to not perform
+        if (pt_regs_is_syscall(regs) &&
-         * a syscall restart.
+            (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY))) {
-         */
+                restart_syscall = 1;
-        if (restart_syscall && !pt_regs_is_syscall(regs))
+                orig_i0 = regs->u_regs[UREG_G6];
-                restart_syscall = 0;
+        }
        if (signr > 0) {
                if (restart_syscall)
diff --git a/arch/sparc/kernel/sigutil_64.c b/arch/sparc/kernel/sigutil_64.c
index e7dc508c38eb..b19570d41a39 100644
--- a/arch/sparc/kernel/sigutil_64.c
+++ b/arch/sparc/kernel/sigutil_64.c
@@ -2,6 +2,7 @@
 #include <linux/types.h>
 #include <linux/thread_info.h>
 #include <linux/uaccess.h>
+#include <linux/errno.h>
 #include <asm/sigcontext.h>
 #include <asm/fpumacro.h>
diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S
index 09d8ec454450..63402f9e9f51 100644
--- a/arch/sparc/kernel/systbls_32.S
+++ b/arch/sparc/kernel/systbls_32.S
@@ -84,4 +84,4 @@ sys_call_table:
 /*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv
 /*325*/ .long sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init
 /*330*/ .long sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime
-/*335*/ .long sys_syncfs, sys_sendmmsg, sys_setns
+/*335*/ .long sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev
diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S
index edbec45d4688..db86b1a0e9a9 100644
--- a/arch/sparc/kernel/systbls_64.S
+++ b/arch/sparc/kernel/systbls_64.S
@@ -85,7 +85,7 @@ sys_call_table32:
 /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, compat_sys_preadv
        .word compat_sys_pwritev, compat_sys_rt_tgsigqueueinfo, sys_perf_event_open, compat_sys_recvmmsg, sys_fanotify_init
 /*330*/ .word sys32_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, compat_sys_open_by_handle_at, compat_sys_clock_adjtime
-        .word sys_syncfs, compat_sys_sendmmsg, sys_setns
+        .word sys_syncfs, compat_sys_sendmmsg, sys_setns, compat_sys_process_vm_readv, compat_sys_process_vm_writev
 #endif /* CONFIG_COMPAT */
@@ -162,4 +162,4 @@ sys_call_table:
 /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv
        .word sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init
 /*330*/ .word sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime
-        .word sys_syncfs, sys_sendmmsg, sys_setns
+        .word sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev
diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
index e3cda21b5ee9..301421c11291 100644
--- a/arch/sparc/mm/Makefile
+++ b/arch/sparc/mm/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o gup.o
 obj-y                   += fault_$(BITS).o
 obj-y                   += init_$(BITS).o
 obj-$(CONFIG_SPARC32)   += loadmmu.o
-obj-y                   += generic_$(BITS).o
 obj-$(CONFIG_SPARC32)   += extable.o btfixup.o srmmu.o iommu.o io-unit.o
 obj-$(CONFIG_SPARC32)   += hypersparc.o viking.o tsunami.o swift.o
 obj-$(CONFIG_SPARC_LEON)+= leon_mm.o
diff --git a/arch/sparc/mm/generic_32.c b/arch/sparc/mm/generic_32.c
deleted file mode 100644
index 6ca39a60a196..000000000000
--- a/arch/sparc/mm/generic_32.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * generic.c: Generic Sparc mm routines that are not dependent upon
- *            MMU type but are Sparc specific.
- *
- * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
- */
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <linux/pagemap.h>
-#include <linux/export.h>
-#include <asm/pgalloc.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/cacheflush.h>
-#include <asm/tlbflush.h>
-/* Remap IO memory, the same way as remap_pfn_range(), but use
- * the obio memory space.
- *
- * They use a pgprot that sets PAGE_IO and does not check the
- * mem_map table as this is independent of normal memory.
- */
-static inline void io_remap_pte_range(struct mm_struct *mm, pte_t * pte, unsigned long address, unsigned long size,
-        unsigned long offset, pgprot_t prot, int space)
-{
-        unsigned long end;
-        address &= ~PMD_MASK;
-        end = address + size;
-        if (end > PMD_SIZE)
-                end = PMD_SIZE;
-        do {
-                set_pte_at(mm, address, pte, mk_pte_io(offset, prot, space));
-                address += PAGE_SIZE;
-                offset += PAGE_SIZE;
-                pte++;
-        } while (address < end);
-}
-static inline int io_remap_pmd_range(struct mm_struct *mm, pmd_t * pmd, unsigned long address, unsigned long size,
-        unsigned long offset, pgprot_t prot, int space)
-{
-        unsigned long end;
-        address &= ~PGDIR_MASK;
-        end = address + size;
-        if (end > PGDIR_SIZE)
-                end = PGDIR_SIZE;
-        offset -= address;
-        do {
-                pte_t *pte = pte_alloc_map(mm, NULL, pmd, address);
-                if (!pte)
-                        return -ENOMEM;
-                io_remap_pte_range(mm, pte, address, end - address, address + offset, prot, space);
-                address = (address + PMD_SIZE) & PMD_MASK;
-                pmd++;
-        } while (address < end);
-        return 0;
-}
-int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
-                       unsigned long pfn, unsigned long size, pgprot_t prot)
-{
-        int error = 0;
-        pgd_t * dir;
-        unsigned long beg = from;
-        unsigned long end = from + size;
-        struct mm_struct *mm = vma->vm_mm;
-        int space = GET_IOSPACE(pfn);
-        unsigned long offset = GET_PFN(pfn) << PAGE_SHIFT;
-        /* See comment in mm/memory.c remap_pfn_range */
-        vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
-        vma->vm_pgoff = (offset >> PAGE_SHIFT) |
-                ((unsigned long)space << 28UL);
-        offset -= from;
-        dir = pgd_offset(mm, from);
-        flush_cache_range(vma, beg, end);
-        while (from < end) {
-                pmd_t *pmd = pmd_alloc(mm, dir, from);
-                error = -ENOMEM;
-                if (!pmd)
-                        break;
-                error = io_remap_pmd_range(mm, pmd, from, end - from, offset + from, prot, space);
-                if (error)
-                        break;
-                from = (from + PGDIR_SIZE) & PGDIR_MASK;
-                dir++;
-        }
-        flush_tlb_range(vma, beg, end);
-        return error;
-}
-EXPORT_SYMBOL(io_remap_pfn_range);
diff --git a/arch/sparc/mm/generic_64.c b/arch/sparc/mm/generic_64.c
deleted file mode 100644
index 9b357ddae39d..000000000000
--- a/arch/sparc/mm/generic_64.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * generic.c: Generic Sparc mm routines that are not dependent upon
- *            MMU type but are Sparc specific.
- *
- * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
- */
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
-#include <linux/export.h>
-#include <linux/pagemap.h>
-#include <asm/pgalloc.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/tlbflush.h>
-/* Remap IO memory, the same way as remap_pfn_range(), but use
- * the obio memory space.
- *
- * They use a pgprot that sets PAGE_IO and does not check the
- * mem_map table as this is independent of normal memory.
- */
-static inline void io_remap_pte_range(struct mm_struct *mm, pte_t * pte,
-                                      unsigned long address,
-                                      unsigned long size,
-                                      unsigned long offset, pgprot_t prot,
-                                      int space)
-{
-        unsigned long end;
-        /* clear hack bit that was used as a write_combine side-effect flag */
-        offset &= ~0x1UL;
-        address &= ~PMD_MASK;
-        end = address + size;
-        if (end > PMD_SIZE)
-                end = PMD_SIZE;
-        do {
-                pte_t entry;
-                unsigned long curend = address + PAGE_SIZE;
-                
-                entry = mk_pte_io(offset, prot, space, PAGE_SIZE);
-                if (!(address & 0xffff)) {
-                        if (PAGE_SIZE < (4 * 1024 * 1024) &&
-                            !(address & 0x3fffff) &&
-                            !(offset & 0x3ffffe) &&
-                            end >= address + 0x400000) {
-                                entry = mk_pte_io(offset, prot, space,
-                                                  4 * 1024 * 1024);
-                                curend = address + 0x400000;
-                                offset += 0x400000;
-                        } else if (PAGE_SIZE < (512 * 1024) &&
-                                   !(address & 0x7ffff) &&
-                                   !(offset & 0x7fffe) &&
-                                   end >= address + 0x80000) {
-                                entry = mk_pte_io(offset, prot, space,
-                                                  512 * 1024 * 1024);
-                                curend = address + 0x80000;
-                                offset += 0x80000;
-                        } else if (PAGE_SIZE < (64 * 1024) &&
-                                   !(offset & 0xfffe) &&
-                                   end >= address + 0x10000) {
-                                entry = mk_pte_io(offset, prot, space,
-                                                  64 * 1024);
-                                curend = address + 0x10000;
-                                offset += 0x10000;
-                        } else
-                                offset += PAGE_SIZE;
-                } else
-                        offset += PAGE_SIZE;
-                if (pte_write(entry))
-                        entry = pte_mkdirty(entry);
-                do {
-                        BUG_ON(!pte_none(*pte));
-                        set_pte_at(mm, address, pte, entry);
-                        address += PAGE_SIZE;
-                        pte_val(entry) += PAGE_SIZE;
-                        pte++;
-                } while (address < curend);
-        } while (address < end);
-}
-static inline int io_remap_pmd_range(struct mm_struct *mm, pmd_t * pmd, unsigned long address, unsigned long size,
-        unsigned long offset, pgprot_t prot, int space)
-{
-        unsigned long end;
-        address &= ~PGDIR_MASK;
-        end = address + size;
-        if (end > PGDIR_SIZE)
-                end = PGDIR_SIZE;
-        offset -= address;
-        do {
-                pte_t *pte = pte_alloc_map(mm, NULL, pmd, address);
-                if (!pte)
-                        return -ENOMEM;
-                io_remap_pte_range(mm, pte, address, end - address, address + offset, prot, space);
-                pte_unmap(pte);
-                address = (address + PMD_SIZE) & PMD_MASK;
-                pmd++;
-        } while (address < end);
-        return 0;
-}
-static inline int io_remap_pud_range(struct mm_struct *mm, pud_t * pud, unsigned long address, unsigned long size,
-        unsigned long offset, pgprot_t prot, int space)
-{
-        unsigned long end;
-        address &= ~PUD_MASK;
-        end = address + size;
-        if (end > PUD_SIZE)
-                end = PUD_SIZE;
-        offset -= address;
-        do {
-                pmd_t *pmd = pmd_alloc(mm, pud, address);
-                if (!pud)
-                        return -ENOMEM;
-                io_remap_pmd_range(mm, pmd, address, end - address, address + offset, prot, space);
-                address = (address + PUD_SIZE) & PUD_MASK;
-                pud++;
-        } while (address < end);
-        return 0;
-}
-int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
-                unsigned long pfn, unsigned long size, pgprot_t prot)
-{
-        int error = 0;
-        pgd_t * dir;
-        unsigned long beg = from;
-        unsigned long end = from + size;
-        struct mm_struct *mm = vma->vm_mm;
-        int space = GET_IOSPACE(pfn);
-        unsigned long offset = GET_PFN(pfn) << PAGE_SHIFT;
-        unsigned long phys_base;
-        phys_base = offset | (((unsigned long) space) << 32UL);
-        /* See comment in mm/memory.c remap_pfn_range */
-        vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
-        vma->vm_pgoff = phys_base >> PAGE_SHIFT;
-        offset -= from;
-        dir = pgd_offset(mm, from);
-        flush_cache_range(vma, beg, end);
-        while (from < end) {
-                pud_t *pud = pud_alloc(mm, dir, from);
-                error = -ENOMEM;
-                if (!pud)
-                        break;
-                error = io_remap_pud_range(mm, pud, from, end - from, offset + from, prot, space);
-                if (error)
-                        break;
-                from = (from + PGDIR_SIZE) & PGDIR_MASK;
-                dir++;
-        }
-        flush_tlb_range(vma, beg, end);
-        return error;
-}
-EXPORT_SYMBOL(io_remap_pfn_range);
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index e57dcce9bfda..942ed6174f1d 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -237,13 +237,13 @@ menu "PKUnity NetBook-0916 Features"
 config I2C_BATTERY_BQ27200
        tristate "I2C Battery BQ27200 Support"
-        select PUV3_I2C
+        select I2C_PUV3
        select POWER_SUPPLY
        select BATTERY_BQ27x00
 config I2C_EEPROM_AT24
        tristate "I2C EEPROMs AT24 support"
-        select PUV3_I2C
+        select I2C_PUV3
        select MISC_DEVICES
        select EEPROM_AT24
diff --git a/arch/unicore32/Kconfig.debug b/arch/unicore32/Kconfig.debug
index ae2ec334c3c6..1a3626239843 100644
--- a/arch/unicore32/Kconfig.debug
+++ b/arch/unicore32/Kconfig.debug
@@ -44,18 +44,4 @@ config DEBUG_OCD
          Say Y here if you want the debug print routines to direct their
          output to the UniCore On-Chip-Debugger channel using CP #1.
-config DEBUG_OCD_BREAKPOINT
-        bool "Breakpoint support via On-Chip-Debugger"
-        depends on DEBUG_OCD
-config DEBUG_UART
-        int "Kernel low-level debugging messages via serial port"
-        depends on DEBUG_LL
-        range 0 1
-        default "0"
-        help
-          Choice for UART for kernel low-level using PKUnity UARTS,
-          should be between zero and one. The port must have been
-          initialised by the boot-loader before use.
 endmenu
diff --git a/arch/unicore32/boot/compressed/Makefile b/arch/unicore32/boot/compressed/Makefile
index b0954a2d23cf..950a9afa38f8 100644
--- a/arch/unicore32/boot/compressed/Makefile
+++ b/arch/unicore32/boot/compressed/Makefile
@@ -10,8 +10,8 @@
 # Copyright (C) 2001~2010 GUAN Xue-tao
 #
-EXTRA_CFLAGS    := -fpic -fno-builtin
+ccflags-y       := -fpic -fno-builtin
-EXTRA_AFLAGS    := -Wa,-march=all
+asflags-y       := -Wa,-march=all
 OBJS            := misc.o
diff --git a/arch/unicore32/include/asm/bitops.h b/arch/unicore32/include/asm/bitops.h
index 1628a6328994..401f597bc38c 100644
--- a/arch/unicore32/include/asm/bitops.h
+++ b/arch/unicore32/include/asm/bitops.h
@@ -13,12 +13,6 @@
 #ifndef __UNICORE_BITOPS_H__
 #define __UNICORE_BITOPS_H__
-#define find_next_bit           __uc32_find_next_bit
-#define find_next_zero_bit      __uc32_find_next_zero_bit
-#define find_first_bit          __uc32_find_first_bit
-#define find_first_zero_bit     __uc32_find_first_zero_bit
 #define _ASM_GENERIC_BITOPS_FLS_H_
 #define _ASM_GENERIC_BITOPS___FLS_H_
 #define _ASM_GENERIC_BITOPS_FFS_H_
@@ -44,4 +38,10 @@ static inline int fls(int x)
 #include <asm-generic/bitops.h>
+/* following definitions: to avoid using codes in lib/find_*.c */
+#define find_next_bit           find_next_bit
+#define find_next_zero_bit      find_next_zero_bit
+#define find_first_bit          find_first_bit
+#define find_first_zero_bit     find_first_zero_bit
 #endif /* __UNICORE_BITOPS_H__ */
diff --git a/arch/unicore32/include/asm/processor.h b/arch/unicore32/include/asm/processor.h
index e11cb0786578..f0d780a51f9b 100644
--- a/arch/unicore32/include/asm/processor.h
+++ b/arch/unicore32/include/asm/processor.h
@@ -53,7 +53,6 @@ struct thread_struct {
 #define start_thread(regs, pc, sp)                                      \
 ({                                                                      \
        unsigned long *stack = (unsigned long *)sp;                     \
-        set_fs(USER_DS);                                                \
        memset(regs->uregs, 0, sizeof(regs->uregs));                    \
        regs->UCreg_asr = USER_MODE;                                    \
        regs->UCreg_pc = pc & ~1;       /* pc */                        \
diff --git a/arch/unicore32/kernel/ksyms.c b/arch/unicore32/kernel/ksyms.c
index a8970809428a..d98bd812cae1 100644
--- a/arch/unicore32/kernel/ksyms.c
+++ b/arch/unicore32/kernel/ksyms.c
@@ -24,8 +24,8 @@
 #include "ksyms.h"
-EXPORT_SYMBOL(__uc32_find_next_zero_bit);
+EXPORT_SYMBOL(find_next_zero_bit);
-EXPORT_SYMBOL(__uc32_find_next_bit);
+EXPORT_SYMBOL(find_next_bit);
 EXPORT_SYMBOL(__backtrace);
diff --git a/arch/unicore32/lib/findbit.S b/arch/unicore32/lib/findbit.S
index c360ce905d8b..c77746247d36 100644
--- a/arch/unicore32/lib/findbit.S
+++ b/arch/unicore32/lib/findbit.S
@@ -17,7 +17,7 @@
 * Purpose  : Find a 'zero' bit
 * Prototype: int find_first_zero_bit(void *addr, unsigned int maxbit);
 */
-__uc32_find_first_zero_bit:
+ENTRY(find_first_zero_bit)
                cxor.a  r1, #0
                beq     3f
                mov     r2, #0
@@ -29,13 +29,14 @@ __uc32_find_first_zero_bit:
                bub     1b
 3:              mov     r0, r1                  @ no free bits
                mov     pc, lr
+ENDPROC(find_first_zero_bit)
 /*
 * Purpose  : Find next 'zero' bit
 * Prototype: int find_next_zero_bit
 *              (void *addr, unsigned int maxbit, int offset)
 */
-ENTRY(__uc32_find_next_zero_bit)
+ENTRY(find_next_zero_bit)
                cxor.a  r1, #0
                beq     3b
                and.a   ip, r2, #7
@@ -47,14 +48,14 @@ ENTRY(__uc32_find_next_zero_bit)
                or      r2, r2, #7              @ if zero, then no bits here
                add     r2, r2, #1              @ align bit pointer
                b       2b                      @ loop for next bit
-ENDPROC(__uc32_find_next_zero_bit)
+ENDPROC(find_next_zero_bit)
 /*
 * Purpose  : Find a 'one' bit
 * Prototype: int find_first_bit
 *              (const unsigned long *addr, unsigned int maxbit);
 */
-__uc32_find_first_bit:
+ENTRY(find_first_bit)
                cxor.a  r1, #0
                beq     3f
                mov     r2, #0
@@ -66,13 +67,14 @@ __uc32_find_first_bit:
                bub     1b
 3:              mov     r0, r1                  @ no free bits
                mov     pc, lr
+ENDPROC(find_first_bit)
 /*
 * Purpose  : Find next 'one' bit
 * Prototype: int find_next_zero_bit
 *              (void *addr, unsigned int maxbit, int offset)
 */
-ENTRY(__uc32_find_next_bit)
+ENTRY(find_next_bit)
                cxor.a  r1, #0
                beq     3b
                and.a   ip, r2, #7
@@ -83,7 +85,7 @@ ENTRY(__uc32_find_next_bit)
                or      r2, r2, #7              @ if zero, then no bits here
                add     r2, r2, #1              @ align bit pointer
                b       2b                      @ loop for next bit
-ENDPROC(__uc32_find_next_bit)
+ENDPROC(find_next_bit)
 /*
 * One or more bits in the LSB of r3 are assumed to be set.
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 9b7273cb2193..1a6c09af048f 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -49,6 +49,7 @@ extern unsigned int apic_verbosity;
 extern int local_apic_timer_c2_ok;
 extern int disable_apic;
+extern unsigned int lapic_timer_frequency;
 #ifdef CONFIG_SMP
 extern void __inquire_remote_apic(int apicid);
diff --git a/arch/x86/include/asm/mach_traps.h b/arch/x86/include/asm/mach_traps.h
index 72a8b52e7dfd..a01e7ec7d237 100644
--- a/arch/x86/include/asm/mach_traps.h
+++ b/arch/x86/include/asm/mach_traps.h
@@ -17,7 +17,7 @@
 #define NMI_REASON_CLEAR_IOCHK  0x08
 #define NMI_REASON_CLEAR_MASK   0x0f
-static inline unsigned char get_nmi_reason(void)
+static inline unsigned char default_get_nmi_reason(void)
 {
        return inb(NMI_REASON_PORT);
 }
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index c9321f34e55b..0e8ae57d3656 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -201,7 +201,10 @@ int mce_notify_irq(void);
 void mce_notify_process(void);
 DECLARE_PER_CPU(struct mce, injectm);
-extern struct file_operations mce_chrdev_ops;
+extern void register_mce_write_callback(ssize_t (*)(struct file *filp,
+                                    const char __user *ubuf,
+                                    size_t usize, loff_t *off));
 /*
 * Exception handler
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h
index 719f00b28ff5..e6283129c821 100644
--- a/arch/x86/include/asm/mrst.h
+++ b/arch/x86/include/asm/mrst.h
@@ -44,6 +44,13 @@ enum mrst_timer_options {
 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
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index d3d859035af9..1971e652d24b 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -152,6 +152,7 @@ struct x86_cpuinit_ops {
 /**
 * struct x86_platform_ops - platform specific runtime functions
 * @calibrate_tsc:              calibrate TSC
+ * @wallclock_init:             init the wallclock device
 * @get_wallclock:              get time from HW clock like RTC etc.
 * @set_wallclock:              set time back to HW clock
 * @is_untracked_pat_range      exclude from PAT logic
@@ -160,11 +161,13 @@ struct x86_cpuinit_ops {
 */
 struct x86_platform_ops {
        unsigned long (*calibrate_tsc)(void);
+        void (*wallclock_init)(void);
        unsigned long (*get_wallclock)(void);
        int (*set_wallclock)(unsigned long nowtime);
        void (*iommu_shutdown)(void);
        bool (*is_untracked_pat_range)(u64 start, u64 end);
        void (*nmi_init)(void);
+        unsigned char (*get_nmi_reason)(void);
        int (*i8042_detect)(void);
 };
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index c63822816249..1f84794f0759 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -738,5 +738,5 @@ void __kprobes text_poke_smp_batch(struct text_poke_param *params, int n)
        atomic_set(&stop_machine_first, 1);
        wrote_text = 0;
-        __stop_machine(stop_machine_text_poke, (void *)&tpp, NULL);
+        __stop_machine(stop_machine_text_poke, (void *)&tpp, cpu_online_mask);
 }
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index a2fd72e0ab35..f98d84caf94c 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -186,7 +186,7 @@ static struct resource lapic_resource = {
        .flags = IORESOURCE_MEM | IORESOURCE_BUSY,
 };
-static unsigned int calibration_result;
+unsigned int lapic_timer_frequency = 0;
 static void apic_pm_activate(void);
@@ -454,7 +454,7 @@ static void lapic_timer_setup(enum clock_event_mode mode,
        switch (mode) {
        case CLOCK_EVT_MODE_PERIODIC:
        case CLOCK_EVT_MODE_ONESHOT:
-                __setup_APIC_LVTT(calibration_result,
+                __setup_APIC_LVTT(lapic_timer_frequency,
                                  mode != CLOCK_EVT_MODE_PERIODIC, 1);
                break;
        case CLOCK_EVT_MODE_UNUSED:
@@ -638,6 +638,25 @@ static int __init calibrate_APIC_clock(void)
        long delta, deltatsc;
        int pm_referenced = 0;
+        /**
+         * check if lapic timer has already been calibrated by platform
+         * specific routine, such as tsc calibration code. if so, we just fill
+         * in the clockevent structure and return.
+         */
+        if (lapic_timer_frequency) {
+                apic_printk(APIC_VERBOSE, "lapic timer already calibrated %d\n",
+                                lapic_timer_frequency);
+                lapic_clockevent.mult = div_sc(lapic_timer_frequency/APIC_DIVISOR,
+                                        TICK_NSEC, lapic_clockevent.shift);
+                lapic_clockevent.max_delta_ns =
+                        clockevent_delta2ns(0x7FFFFF, &lapic_clockevent);
+                lapic_clockevent.min_delta_ns =
+                        clockevent_delta2ns(0xF, &lapic_clockevent);
+                lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
+                return 0;
+        }
        local_irq_disable();
        /* Replace the global interrupt handler */
@@ -679,12 +698,12 @@ static int __init calibrate_APIC_clock(void)
        lapic_clockevent.min_delta_ns =
                clockevent_delta2ns(0xF, &lapic_clockevent);
-        calibration_result = (delta * APIC_DIVISOR) / LAPIC_CAL_LOOPS;
+        lapic_timer_frequency = (delta * APIC_DIVISOR) / LAPIC_CAL_LOOPS;
        apic_printk(APIC_VERBOSE, "..... delta %ld\n", delta);
        apic_printk(APIC_VERBOSE, "..... mult: %u\n", lapic_clockevent.mult);
        apic_printk(APIC_VERBOSE, "..... calibration result: %u\n",
-                    calibration_result);
+                    lapic_timer_frequency);
        if (cpu_has_tsc) {
                apic_printk(APIC_VERBOSE, "..... CPU clock speed is "
@@ -695,13 +714,13 @@ static int __init calibrate_APIC_clock(void)
        apic_printk(APIC_VERBOSE, "..... host bus clock speed is "
                    "%u.%04u MHz.\n",
-                    calibration_result / (1000000 / HZ),
+                    lapic_timer_frequency / (1000000 / HZ),
-                    calibration_result % (1000000 / HZ));
+                    lapic_timer_frequency % (1000000 / HZ));
        /*
         * Do a sanity check on the APIC calibration result
         */
-        if (calibration_result < (1000000 / HZ)) {
+        if (lapic_timer_frequency < (1000000 / HZ)) {
                local_irq_enable();
                pr_warning("APIC frequency too slow, disabling apic timer\n");
                return -1;
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 3c31fa98af6d..6d939d7847e2 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -193,10 +193,8 @@ int __init arch_early_irq_init(void)
        struct irq_cfg *cfg;
        int count, node, i;
-        if (!legacy_pic->nr_legacy_irqs) {
+        if (!legacy_pic->nr_legacy_irqs)
-                nr_irqs_gsi = 0;
                io_apic_irqs = ~0UL;
-        }
        for (i = 0; i < nr_ioapics; i++) {
                ioapics[i].saved_registers =
@@ -1696,6 +1694,7 @@ __apicdebuginit(void) print_IO_APICs(void)
        int ioapic_idx;
        struct irq_cfg *cfg;
        unsigned int irq;
+        struct irq_chip *chip;
        printk(KERN_DEBUG "number of MP IRQ sources: %d.\n", mp_irq_entries);
        for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++)
@@ -1716,6 +1715,10 @@ __apicdebuginit(void) print_IO_APICs(void)
        for_each_active_irq(irq) {
                struct irq_pin_list *entry;
+                chip = irq_get_chip(irq);
+                if (chip != &ioapic_chip)
+                        continue;
                cfg = irq_get_chip_data(irq);
                if (!cfg)
                        continue;
diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
index 6199232161cf..319882ef848d 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
@@ -208,7 +208,7 @@ static int inject_init(void)
        if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL))
                return -ENOMEM;
        printk(KERN_INFO "Machine check injector initialized\n");
-        mce_chrdev_ops.write = mce_write;
+        register_mce_write_callback(mce_write);
        register_nmi_handler(NMI_LOCAL, mce_raise_notify, 0,
                                "mce_notify");
        return 0;
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 362056aefeb4..2af127d4c3d1 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1634,16 +1634,35 @@ static long mce_chrdev_ioctl(struct file *f, unsigned int cmd,
        }
 }
-/* Modified in mce-inject.c, so not static or const */
+static ssize_t (*mce_write)(struct file *filp, const char __user *ubuf,
-struct file_operations mce_chrdev_ops = {
+                            size_t usize, loff_t *off);
+void register_mce_write_callback(ssize_t (*fn)(struct file *filp,
+                             const char __user *ubuf,
+                             size_t usize, loff_t *off))
+{
+        mce_write = fn;
+}
+EXPORT_SYMBOL_GPL(register_mce_write_callback);
+ssize_t mce_chrdev_write(struct file *filp, const char __user *ubuf,
+                         size_t usize, loff_t *off)
+{
+        if (mce_write)
+                return mce_write(filp, ubuf, usize, off);
+        else
+                return -EINVAL;
+}
+static const struct file_operations mce_chrdev_ops = {
        .open                   = mce_chrdev_open,
        .release                = mce_chrdev_release,
        .read                   = mce_chrdev_read,
+        .write                  = mce_chrdev_write,
        .poll                   = mce_chrdev_poll,
        .unlocked_ioctl         = mce_chrdev_ioctl,
        .llseek                 = no_llseek,
 };
-EXPORT_SYMBOL_GPL(mce_chrdev_ops);
 static struct miscdevice mce_chrdev_device = {
        MISC_MCELOG_MINOR,
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index c1a0188e29ae..44842d756b29 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -74,9 +74,10 @@ static cycle_t kvm_clock_read(void)
        struct pvclock_vcpu_time_info *src;
        cycle_t ret;
-        src = &get_cpu_var(hv_clock);
+        preempt_disable_notrace();
+        src = &__get_cpu_var(hv_clock);
        ret = pvclock_clocksource_read(src);
-        put_cpu_var(hv_clock);
+        preempt_enable_notrace();
        return ret;
 }
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index b9c8628974af..e88f37b58ddd 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -29,6 +29,7 @@
 #include <asm/traps.h>
 #include <asm/mach_traps.h>
 #include <asm/nmi.h>
+#include <asm/x86_init.h>
 #define NMI_MAX_NAMELEN 16
 struct nmiaction {
@@ -348,7 +349,7 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
        /* Non-CPU-specific NMI: NMI sources can be processed on any CPU */
        raw_spin_lock(&nmi_reason_lock);
-        reason = get_nmi_reason();
+        reason = x86_platform.get_nmi_reason();
        if (reason & NMI_REASON_MASK) {
                if (reason & NMI_REASON_SERR)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index afaf38447ef5..cf0ef986cb6d 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1045,6 +1045,8 @@ void __init setup_arch(char **cmdline_p)
        x86_init.timers.wallclock_init();
+        x86_platform.wallclock_init();
        mcheck_init();
        arch_init_ideal_nops();
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 6f164bd5e14d..c1d6cd549397 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -21,12 +21,14 @@
 #include <asm/pat.h>
 #include <asm/tsc.h>
 #include <asm/iommu.h>
+#include <asm/mach_traps.h>
 void __cpuinit x86_init_noop(void) { }
 void __init x86_init_uint_noop(unsigned int unused) { }
 void __init x86_init_pgd_noop(pgd_t *unused) { }
 int __init iommu_init_noop(void) { return 0; }
 void iommu_shutdown_noop(void) { }
+void wallclock_init_noop(void) { }
 /*
 * The platform setup functions are preset with the default functions
@@ -97,11 +99,13 @@ static int default_i8042_detect(void) { return 1; };
 struct x86_platform_ops x86_platform = {
        .calibrate_tsc                  = native_calibrate_tsc,
+        .wallclock_init                 = wallclock_init_noop,
        .get_wallclock                  = mach_get_cmos_time,
        .set_wallclock                  = mach_set_rtc_mmss,
        .iommu_shutdown                 = iommu_shutdown_noop,
        .is_untracked_pat_range         = is_ISA_range,
        .nmi_init                       = default_nmi_init,
+        .get_nmi_reason                 = default_get_nmi_reason,
        .i8042_detect                   = default_i8042_detect
 };
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index a0d6bd9ad442..579a0b51696a 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -39,6 +39,7 @@
 #include <asm/mce.h>
 #include <asm/i387.h>
 #include <asm/xcr.h>
+#include <asm/perf_event.h>
 #include "trace.h"
@@ -118,7 +119,7 @@ module_param(ple_gap, int, S_IRUGO);
 static int ple_window = KVM_VMX_DEFAULT_PLE_WINDOW;
 module_param(ple_window, int, S_IRUGO);
-#define NR_AUTOLOAD_MSRS 1
+#define NR_AUTOLOAD_MSRS 8
 #define VMCS02_POOL_SIZE 1
 struct vmcs {
@@ -622,6 +623,7 @@ static unsigned long *vmx_msr_bitmap_legacy;
 static unsigned long *vmx_msr_bitmap_longmode;
 static bool cpu_has_load_ia32_efer;
+static bool cpu_has_load_perf_global_ctrl;
 static DECLARE_BITMAP(vmx_vpid_bitmap, VMX_NR_VPIDS);
 static DEFINE_SPINLOCK(vmx_vpid_lock);
@@ -1191,15 +1193,34 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu)
        vmcs_write32(EXCEPTION_BITMAP, eb);
 }
+static void clear_atomic_switch_msr_special(unsigned long entry,
+                unsigned long exit)
+{
+        vmcs_clear_bits(VM_ENTRY_CONTROLS, entry);
+        vmcs_clear_bits(VM_EXIT_CONTROLS, exit);
+}
 static void clear_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr)
 {
        unsigned i;
        struct msr_autoload *m = &vmx->msr_autoload;
-        if (msr == MSR_EFER && cpu_has_load_ia32_efer) {
+        switch (msr) {
-                vmcs_clear_bits(VM_ENTRY_CONTROLS, VM_ENTRY_LOAD_IA32_EFER);
+        case MSR_EFER:
-                vmcs_clear_bits(VM_EXIT_CONTROLS, VM_EXIT_LOAD_IA32_EFER);
+                if (cpu_has_load_ia32_efer) {
-                return;
+                        clear_atomic_switch_msr_special(VM_ENTRY_LOAD_IA32_EFER,
+                                        VM_EXIT_LOAD_IA32_EFER);
+                        return;
+                }
+                break;
+        case MSR_CORE_PERF_GLOBAL_CTRL:
+                if (cpu_has_load_perf_global_ctrl) {
+                        clear_atomic_switch_msr_special(
+                                        VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL,
+                                        VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL);
+                        return;
+                }
+                break;
        }
        for (i = 0; i < m->nr; ++i)
@@ -1215,25 +1236,55 @@ static void clear_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr)
        vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, m->nr);
 }
+static void add_atomic_switch_msr_special(unsigned long entry,
+                unsigned long exit, unsigned long guest_val_vmcs,
+                unsigned long host_val_vmcs, u64 guest_val, u64 host_val)
+{
+        vmcs_write64(guest_val_vmcs, guest_val);
+        vmcs_write64(host_val_vmcs, host_val);
+        vmcs_set_bits(VM_ENTRY_CONTROLS, entry);
+        vmcs_set_bits(VM_EXIT_CONTROLS, exit);
+}
 static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr,
                                  u64 guest_val, u64 host_val)
 {
        unsigned i;
        struct msr_autoload *m = &vmx->msr_autoload;
-        if (msr == MSR_EFER && cpu_has_load_ia32_efer) {
+        switch (msr) {
-                vmcs_write64(GUEST_IA32_EFER, guest_val);
+        case MSR_EFER:
-                vmcs_write64(HOST_IA32_EFER, host_val);
+                if (cpu_has_load_ia32_efer) {
-                vmcs_set_bits(VM_ENTRY_CONTROLS, VM_ENTRY_LOAD_IA32_EFER);
+                        add_atomic_switch_msr_special(VM_ENTRY_LOAD_IA32_EFER,
-                vmcs_set_bits(VM_EXIT_CONTROLS, VM_EXIT_LOAD_IA32_EFER);
+                                        VM_EXIT_LOAD_IA32_EFER,
-                return;
+                                        GUEST_IA32_EFER,
+                                        HOST_IA32_EFER,
+                                        guest_val, host_val);
+                        return;
+                }
+                break;
+        case MSR_CORE_PERF_GLOBAL_CTRL:
+                if (cpu_has_load_perf_global_ctrl) {
+                        add_atomic_switch_msr_special(
+                                        VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL,
+                                        VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL,
+                                        GUEST_IA32_PERF_GLOBAL_CTRL,
+                                        HOST_IA32_PERF_GLOBAL_CTRL,
+                                        guest_val, host_val);
+                        return;
+                }
+                break;
        }
        for (i = 0; i < m->nr; ++i)
                if (m->guest[i].index == msr)
                        break;
-        if (i == m->nr) {
+        if (i == NR_AUTOLOAD_MSRS) {
+                printk_once(KERN_WARNING"Not enough mst switch entries. "
+                                "Can't add msr %x\n", msr);
+                return;
+        } else if (i == m->nr) {
                ++m->nr;
                vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, m->nr);
                vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, m->nr);
@@ -2455,6 +2506,42 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)
                && allow_1_setting(MSR_IA32_VMX_EXIT_CTLS,
                                   VM_EXIT_LOAD_IA32_EFER);
+        cpu_has_load_perf_global_ctrl =
+                allow_1_setting(MSR_IA32_VMX_ENTRY_CTLS,
+                                VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL)
+                && allow_1_setting(MSR_IA32_VMX_EXIT_CTLS,
+                                   VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL);
+        /*
+         * Some cpus support VM_ENTRY_(LOAD|SAVE)_IA32_PERF_GLOBAL_CTRL
+         * but due to arrata below it can't be used. Workaround is to use
+         * msr load mechanism to switch IA32_PERF_GLOBAL_CTRL.
+         *
+         * VM Exit May Incorrectly Clear IA32_PERF_GLOBAL_CTRL [34:32]
+         *
+         * AAK155             (model 26)
+         * AAP115             (model 30)
+         * AAT100             (model 37)
+         * BC86,AAY89,BD102   (model 44)
+         * BA97               (model 46)
+         *
+         */
+        if (cpu_has_load_perf_global_ctrl && boot_cpu_data.x86 == 0x6) {
+                switch (boot_cpu_data.x86_model) {
+                case 26:
+                case 30:
+                case 37:
+                case 44:
+                case 46:
+                        cpu_has_load_perf_global_ctrl = false;
+                        printk_once(KERN_WARNING"kvm: VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL "
+                                        "does not work properly. Using workaround\n");
+                        break;
+                default:
+                        break;
+                }
+        }
        return 0;
 }
@@ -5968,6 +6055,24 @@ static void vmx_cancel_injection(struct kvm_vcpu *vcpu)
        vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, 0);
 }
+static void atomic_switch_perf_msrs(struct vcpu_vmx *vmx)
+{
+        int i, nr_msrs;
+        struct perf_guest_switch_msr *msrs;
+        msrs = perf_guest_get_msrs(&nr_msrs);
+        if (!msrs)
+                return;
+        for (i = 0; i < nr_msrs; i++)
+                if (msrs[i].host == msrs[i].guest)
+                        clear_atomic_switch_msr(vmx, msrs[i].msr);
+                else
+                        add_atomic_switch_msr(vmx, msrs[i].msr, msrs[i].guest,
+                                        msrs[i].host);
+}
 #ifdef CONFIG_X86_64
 #define R "r"
 #define Q "q"
@@ -6017,6 +6122,8 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
        if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)
                vmx_set_interrupt_shadow(vcpu, 0);
+        atomic_switch_perf_msrs(vmx);
        vmx->__launched = vmx->loaded_vmcs->launched;
        asm(
                /* Store host registers */
diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c
index 28071bb31db7..4c61b52191eb 100644
--- a/arch/x86/platform/ce4100/ce4100.c
+++ b/arch/x86/platform/ce4100/ce4100.c
@@ -109,7 +109,7 @@ static __init void sdv_serial_fixup(void)
 }
 #else
-static inline void sdv_serial_fixup(void);
+static inline void sdv_serial_fixup(void) {};
 #endif
 static void __init sdv_arch_setup(void)
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index 6ed7afdaf4af..b1489a06a49d 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -187,11 +187,34 @@ int __init sfi_parse_mrtc(struct sfi_table_header *table)
 static unsigned long __init mrst_calibrate_tsc(void)
 {
        unsigned long flags, fast_calibrate;
+        if (__mrst_cpu_chip == MRST_CPU_CHIP_PENWELL) {
-        local_irq_save(flags);
+                u32 lo, hi, ratio, fsb;
-        fast_calibrate = apbt_quick_calibrate();
-        local_irq_restore(flags);
+                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);
+        } else {
+                local_irq_save(flags);
+                fast_calibrate = apbt_quick_calibrate();
+                local_irq_restore(flags);
+        }
+        
        if (fast_calibrate)
                return fast_calibrate;
@@ -254,6 +277,17 @@ static void mrst_reboot(void)
 }
 /*
+ * 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.
 */
@@ -274,6 +308,8 @@ void __init x86_mrst_early_setup(void)
        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;
@@ -608,6 +644,7 @@ static void *msic_ocd_platform_data(void *info)
 }
 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},
        {"spi_max3111", SFI_DEV_TYPE_SPI, 0, &max3111_platform_data},
        {"i2c_max7315", SFI_DEV_TYPE_I2C, 1, &max7315_platform_data},
diff --git a/arch/x86/platform/mrst/vrtc.c b/arch/x86/platform/mrst/vrtc.c
index a8ac6f1eb66d..225bd0f0f675 100644
--- a/arch/x86/platform/mrst/vrtc.c
+++ b/arch/x86/platform/mrst/vrtc.c
@@ -76,8 +76,8 @@ unsigned long vrtc_get_time(void)
        spin_unlock_irqrestore(&rtc_lock, flags);
-        /* vRTC YEAR reg contains the offset to 1960 */
+        /* vRTC YEAR reg contains the offset to 1972 */
-        year += 1960;
+        year += 1972;
        printk(KERN_INFO "vRTC: sec: %d min: %d hour: %d day: %d "
                "mon: %d year: %d\n", sec, min, hour, mday, mon, year);
diff --git a/arch/x86/um/asm/processor.h b/arch/x86/um/asm/processor.h
index 118c143a9cb4..2c32df6fe231 100644
--- a/arch/x86/um/asm/processor.h
+++ b/arch/x86/um/asm/processor.h
@@ -11,7 +11,7 @@
 #endif
 #define KSTK_EIP(tsk) KSTK_REG(tsk, HOST_IP)
-#define KSTK_ESP(tsk) KSTK_REG(tsk, HOST_IP)
+#define KSTK_ESP(tsk) KSTK_REG(tsk, HOST_SP)
 #define KSTK_EBP(tsk) KSTK_REG(tsk, HOST_BP)
 #define ARCH_IS_STACKGROW(address) \
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index da8afd576a6b..1f928659c338 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1356,7 +1356,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
        int cpu = (long)hcpu;
        switch (action) {
        case CPU_UP_PREPARE:
-                per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu];
+                xen_vcpu_setup(cpu);
                if (xen_have_vector_callback)
                        xen_init_lock_cpu(cpu);
                break;
@@ -1386,7 +1386,6 @@ static void __init xen_hvm_guest_init(void)
        xen_hvm_smp_init();
        register_cpu_notifier(&xen_hvm_cpu_notifier);
        xen_unplug_emulated_devices();
-        have_vcpu_info_placement = 0;
        x86_init.irqs.intr_init = xen_init_IRQ;
        xen_hvm_init_time_ops();
        xen_hvm_init_mmu_ops();
diff --git a/arch/x86/xen/grant-table.c b/arch/x86/xen/grant-table.c
index 6bbfd7ac5e81..5a40d24ba331 100644
--- a/arch/x86/xen/grant-table.c
+++ b/arch/x86/xen/grant-table.c
@@ -71,7 +71,7 @@ int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
        if (shared == NULL) {
                struct vm_struct *area =
-                        alloc_vm_area(PAGE_SIZE * max_nr_gframes);
+                        alloc_vm_area(PAGE_SIZE * max_nr_gframes, NULL);
                BUG_ON(area == NULL);
                shared = area->addr;
                *__shared = shared;