376 files changed, 3177 insertions, 3622 deletions
diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h
index c1d3d2da1191..b3c750979aa1 100644
--- a/arch/arc/include/asm/cache.h
+++ b/arch/arc/include/asm/cache.h
@@ -60,7 +60,7 @@ extern void read_decode_cache_bcr(void);
 #define ARC_REG_IC_IVIC         0x10
 #define ARC_REG_IC_CTRL         0x11
 #define ARC_REG_IC_IVIL         0x19
-#if defined(CONFIG_ARC_MMU_V3) || defined (CONFIG_ARC_MMU_V4)
+#if defined(CONFIG_ARC_MMU_V3)
 #define ARC_REG_IC_PTAG         0x1E
 #endif
@@ -74,7 +74,7 @@ extern void read_decode_cache_bcr(void);
 #define ARC_REG_DC_IVDL         0x4A
 #define ARC_REG_DC_FLSH         0x4B
 #define ARC_REG_DC_FLDL         0x4C
-#if defined(CONFIG_ARC_MMU_V3) || defined (CONFIG_ARC_MMU_V4)
+#if defined(CONFIG_ARC_MMU_V3)
 #define ARC_REG_DC_PTAG         0x5C
 #endif
diff --git a/arch/arc/include/uapi/asm/ptrace.h b/arch/arc/include/uapi/asm/ptrace.h
index 2618cc13ba75..76a7739aab1c 100644
--- a/arch/arc/include/uapi/asm/ptrace.h
+++ b/arch/arc/include/uapi/asm/ptrace.h
@@ -11,6 +11,7 @@
 #ifndef _UAPI__ASM_ARC_PTRACE_H
 #define _UAPI__ASM_ARC_PTRACE_H
+#define PTRACE_GET_THREAD_AREA  25
 #ifndef __ASSEMBLY__
 /*
diff --git a/arch/arc/kernel/ctx_sw_asm.S b/arch/arc/kernel/ctx_sw_asm.S
index 2ff0347a2fd7..e248594097e7 100644
--- a/arch/arc/kernel/ctx_sw_asm.S
+++ b/arch/arc/kernel/ctx_sw_asm.S
@@ -10,9 +10,9 @@
 *  -This is the more "natural" hand written assembler
 */
+#include <linux/linkage.h>
 #include <asm/entry.h>       /* For the SAVE_* macros */
 #include <asm/asm-offsets.h>
-#include <asm/linkage.h>
 #define KSP_WORD_OFF    ((TASK_THREAD + THREAD_KSP) / 4)
diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c
index 0b3ef4025d89..fffdb5e41b20 100644
--- a/arch/arc/kernel/devtree.c
+++ b/arch/arc/kernel/devtree.c
@@ -41,7 +41,7 @@ const struct machine_desc * __init setup_machine_fdt(void *dt)
 {
        const struct machine_desc *mdesc;
        unsigned long dt_root;
-        void *clk;
+        const void *clk;
        int len;
        if (!early_init_dt_scan(dt))
diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S
index 07a58f2d3077..4d2481bd8b98 100644
--- a/arch/arc/kernel/head.S
+++ b/arch/arc/kernel/head.S
@@ -77,10 +77,11 @@ stext:
        ; Clear BSS before updating any globals
        ; XXX: use ZOL here
        mov     r5, __bss_start
-        mov     r6, __bss_stop
+        sub     r6, __bss_stop, r5
+        lsr.f   lp_count, r6, 2
+        lpnz    1f
+        st.ab   0, [r5, 4]
 1:
-        st.ab   0, [r5,4]
-        brlt    r5, r6, 1b
        ; Uboot - kernel ABI
        ;    r0 = [0] No uboot interaction, [1] cmdline in r2, [2] DTB in r2
diff --git a/arch/arc/kernel/ptrace.c b/arch/arc/kernel/ptrace.c
index 5d76706139dd..13b3ffb27a38 100644
--- a/arch/arc/kernel/ptrace.c
+++ b/arch/arc/kernel/ptrace.c
@@ -146,6 +146,10 @@ long arch_ptrace(struct task_struct *child, long request,
        pr_debug("REQ=%ld: ADDR =0x%lx, DATA=0x%lx)\n", request, addr, data);
        switch (request) {
+        case PTRACE_GET_THREAD_AREA:
+                ret = put_user(task_thread_info(child)->thr_ptr,
+                               (unsigned long __user *)data);
+                break;
        default:
                ret = ptrace_request(child, request, addr, data);
                break;
diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c
index cf90b6f4d3e0..c802bb500602 100644
--- a/arch/arc/kernel/smp.c
+++ b/arch/arc/kernel/smp.c
@@ -337,8 +337,19 @@ irqreturn_t do_IPI(int irq, void *dev_id)
 * API called by platform code to hookup arch-common ISR to their IPI IRQ
 */
 static DEFINE_PER_CPU(int, ipi_dev);
+static struct irqaction arc_ipi_irq = {
+        .name    = "IPI Interrupt",
+        .flags   = IRQF_PERCPU,
+        .handler = do_IPI,
+};
 int smp_ipi_irq_setup(int cpu, int irq)
 {
-        int *dev_id = &per_cpu(ipi_dev, smp_processor_id());
+        if (!cpu)
-        return request_percpu_irq(irq, do_IPI, "IPI Interrupt", dev_id);
+                return setup_irq(irq, &arc_ipi_irq);
+        else
+                arch_unmask_irq(irq);
+        return 0;
 }
diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S
index 2555f5886af6..dd35bde39f69 100644
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@@ -116,7 +116,7 @@ SECTIONS
        _edata = .;
-        BSS_SECTION(0, 0, 0)
+        BSS_SECTION(4, 4, 4)
 #ifdef CONFIG_ARC_DW2_UNWIND
        . = ALIGN(PAGE_SIZE);
diff --git a/arch/arc/mm/cache_arc700.c b/arch/arc/mm/cache_arc700.c
index 1f676c4794e0..353b202c37c9 100644
--- a/arch/arc/mm/cache_arc700.c
+++ b/arch/arc/mm/cache_arc700.c
@@ -389,7 +389,7 @@ static inline void __dc_line_op(unsigned long paddr, unsigned long vaddr,
 /***********************************************************
 * Machine specific helper for per line I-Cache invalidate.
 */
-static void __ic_line_inv_vaddr(unsigned long paddr, unsigned long vaddr,
+static void __ic_line_inv_vaddr_local(unsigned long paddr, unsigned long vaddr,
                                unsigned long sz)
 {
        unsigned long flags;
@@ -405,6 +405,23 @@ static inline void __ic_entire_inv(void)
        read_aux_reg(ARC_REG_IC_CTRL);  /* blocks */
 }
+struct ic_line_inv_vaddr_ipi {
+        unsigned long paddr, vaddr;
+        int sz;
+};
+static void __ic_line_inv_vaddr_helper(void *info)
+{
+        struct ic_line_inv_vaddr_ipi *ic_inv = (struct ic_line_inv_vaddr_ipi*) info;
+        __ic_line_inv_vaddr_local(ic_inv->paddr, ic_inv->vaddr, ic_inv->sz);
+}
+static void __ic_line_inv_vaddr(unsigned long paddr, unsigned long vaddr,
+                                unsigned long sz)
+{
+        struct ic_line_inv_vaddr_ipi ic_inv = { paddr, vaddr , sz};
+        on_each_cpu(__ic_line_inv_vaddr_helper, &ic_inv, 1);
+}
 #else
 #define __ic_entire_inv()
@@ -553,12 +570,8 @@ void flush_icache_range(unsigned long kstart, unsigned long kend)
 */
 void __sync_icache_dcache(unsigned long paddr, unsigned long vaddr, int len)
 {
-        unsigned long flags;
-        local_irq_save(flags);
-        __ic_line_inv_vaddr(paddr, vaddr, len);
        __dc_line_op(paddr, vaddr, len, OP_FLUSH_N_INV);
-        local_irq_restore(flags);
+        __ic_line_inv_vaddr(paddr, vaddr, len);
 }
 /* wrapper to compile time eliminate alignment checks in flush loop */
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 87b63fde06d7..245058b3b0ef 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -175,13 +175,6 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
        bool
-config ARCH_HAS_CPUFREQ
-        bool
-        help
-          Internal node to signify that the ARCH has CPUFREQ support
-          and that the relevant menu configurations are displayed for
-          it.
 config ARCH_HAS_BANDGAP
        bool
@@ -318,7 +311,6 @@ config ARCH_MULTIPLATFORM
 config ARCH_INTEGRATOR
        bool "ARM Ltd. Integrator family"
-        select ARCH_HAS_CPUFREQ
        select ARM_AMBA
        select ARM_PATCH_PHYS_VIRT
        select AUTO_ZRELADDR
@@ -538,7 +530,6 @@ config ARCH_DOVE
 config ARCH_KIRKWOOD
        bool "Marvell Kirkwood"
-        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select CPU_FEROCEON
        select GENERIC_CLOCKEVENTS
@@ -637,7 +628,6 @@ config ARCH_LPC32XX
 config ARCH_PXA
        bool "PXA2xx/PXA3xx-based"
        depends on MMU
-        select ARCH_HAS_CPUFREQ
        select ARCH_MTD_XIP
        select ARCH_REQUIRE_GPIOLIB
        select ARM_CPU_SUSPEND if PM
@@ -707,7 +697,6 @@ config ARCH_RPC
 config ARCH_SA1100
        bool "SA1100-based"
-        select ARCH_HAS_CPUFREQ
        select ARCH_MTD_XIP
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_SPARSEMEM_ENABLE
@@ -725,7 +714,6 @@ config ARCH_SA1100
 config ARCH_S3C24XX
        bool "Samsung S3C24XX SoCs"
-        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select ATAGS
        select CLKDEV_LOOKUP
@@ -746,7 +734,6 @@ config ARCH_S3C24XX
 config ARCH_S3C64XX
        bool "Samsung S3C64XX"
-        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select ARM_VIC
@@ -809,7 +796,6 @@ config ARCH_S5PC100
 config ARCH_S5PV210
        bool "Samsung S5PV210/S5PC110"
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_SPARSEMEM_ENABLE
        select ATAGS
@@ -845,7 +831,6 @@ config ARCH_DAVINCI
 config ARCH_OMAP1
        bool "TI OMAP1"
        depends on MMU
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_OMAP
        select ARCH_REQUIRE_GPIOLIB
@@ -1009,8 +994,6 @@ source "arch/arm/mach-rockchip/Kconfig"
 source "arch/arm/mach-sa1100/Kconfig"
-source "arch/arm/plat-samsung/Kconfig"
 source "arch/arm/mach-socfpga/Kconfig"
 source "arch/arm/mach-spear/Kconfig"
@@ -1028,6 +1011,7 @@ source "arch/arm/mach-s5pc100/Kconfig"
 source "arch/arm/mach-s5pv210/Kconfig"
 source "arch/arm/mach-exynos/Kconfig"
+source "arch/arm/plat-samsung/Kconfig"
 source "arch/arm/mach-shmobile/Kconfig"
@@ -2109,9 +2093,7 @@ endmenu
 menu "CPU Power Management"
-if ARCH_HAS_CPUFREQ
 source "drivers/cpufreq/Kconfig"
-endif
 source "drivers/cpuidle/Kconfig"
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5986ff63b901..adb5ed9e269e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -357,7 +357,7 @@ dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
        stih415-b2020.dtb \
        stih416-b2000.dtb \
        stih416-b2020.dtb \
-        stih416-b2020-revE.dtb
+        stih416-b2020e.dtb
 dtb-$(CONFIG_MACH_SUN4I) += \
        sun4i-a10-a1000.dtb \
        sun4i-a10-cubieboard.dtb \
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 19f1f7e87597..90098f98a5c8 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -319,6 +319,10 @@
        phy-mode = "rmii";
 };
+&phy_sel {
+        rmii-clock-ext;
+};
 &i2c0 {
        status = "okay";
        pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts
index 772fec2d26ce..1e2919d43d78 100644
--- a/arch/arm/boot/dts/armada-375-db.dts
+++ b/arch/arm/boot/dts/armada-375-db.dts
@@ -91,6 +91,8 @@
                                marvell,nand-keep-config;
                                marvell,nand-enable-arbiter;
                                nand-on-flash-bbt;
+                                nand-ecc-strength = <4>;
+                                nand-ecc-step-size = <512>;
                                partition@0 {
                                        label = "U-Boot";
diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi
index e69bc6759c39..4173a8ab34e7 100644
--- a/arch/arm/boot/dts/armada-380.dtsi
+++ b/arch/arm/boot/dts/armada-380.dtsi
@@ -16,7 +16,7 @@
 / {
        model = "Marvell Armada 380 family SoC";
-        compatible = "marvell,armada380", "marvell,armada38x";
+        compatible = "marvell,armada380";
        cpus {
                #address-cells = <1>;
diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
index ff9637dd8d0f..1af886f1e486 100644
--- a/arch/arm/boot/dts/armada-385-db.dts
+++ b/arch/arm/boot/dts/armada-385-db.dts
@@ -16,7 +16,7 @@
 / {
        model = "Marvell Armada 385 Development Board";
-        compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada38x";
+        compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada380";
        chosen {
                bootargs = "console=ttyS0,115200 earlyprintk";
@@ -98,6 +98,8 @@
                                marvell,nand-keep-config;
                                marvell,nand-enable-arbiter;
                                nand-on-flash-bbt;
+                                nand-ecc-strength = <4>;
+                                nand-ecc-step-size = <512>;
                                partition@0 {
                                        label = "U-Boot";
diff --git a/arch/arm/boot/dts/armada-385-rd.dts b/arch/arm/boot/dts/armada-385-rd.dts
index 40893255a3f0..aaca2861dc87 100644
--- a/arch/arm/boot/dts/armada-385-rd.dts
+++ b/arch/arm/boot/dts/armada-385-rd.dts
@@ -17,7 +17,7 @@
 / {
        model = "Marvell Armada 385 Reference Design";
-        compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada38x";
+        compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";
        chosen {
                bootargs = "console=ttyS0,115200 earlyprintk";
diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi
index f011009bf4cf..6283d7912f71 100644
--- a/arch/arm/boot/dts/armada-385.dtsi
+++ b/arch/arm/boot/dts/armada-385.dtsi
@@ -16,7 +16,7 @@
 / {
        model = "Marvell Armada 385 family SoC";
-        compatible = "marvell,armada385", "marvell,armada38x";
+        compatible = "marvell,armada385", "marvell,armada380";
        cpus {
                #address-cells = <1>;
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 3de364e81b52..689fa1a46728 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -20,7 +20,7 @@
 / {
        model = "Marvell Armada 38x family SoC";
-        compatible = "marvell,armada38x";
+        compatible = "marvell,armada380";
        aliases {
                gpio0 = &gpio0;
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index e5c6a0492ca0..4e5a59ee1501 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -25,7 +25,7 @@
        memory {
                device_type = "memory";
-                reg = <0 0x00000000 0 0xC0000000>; /* 3 GB */
+                reg = <0 0x00000000 0 0x40000000>; /* 1 GB soldered on */
        };
        soc {
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index b309c1c6e848..04927db1d6bf 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -568,24 +568,17 @@
                                #size-cells = <0>;
                                #interrupt-cells = <1>;
-                                slow_rc_osc: slow_rc_osc {
+                                main_osc: main_osc {
-                                        compatible = "fixed-clock";
+                                        compatible = "atmel,at91rm9200-clk-main-osc";
                                        #clock-cells = <0>;
-                                        clock-frequency = <32768>;
+                                        interrupts-extended = <&pmc AT91_PMC_MOSCS>;
-                                        clock-accuracy = <50000000>;
+                                        clocks = <&main_xtal>;
-                                };
-                                clk32k: slck {
-                                        compatible = "atmel,at91sam9260-clk-slow";
-                                        #clock-cells = <0>;
-                                        clocks = <&slow_rc_osc &slow_xtal>;
                                };
                                main: mainck {
                                        compatible = "atmel,at91rm9200-clk-main";
                                        #clock-cells = <0>;
-                                        interrupts-extended = <&pmc AT91_PMC_MOSCS>;
+                                        clocks = <&main_osc>;
-                                        clocks = <&main_xtal>;
                                };
                                plla: pllack {
@@ -615,7 +608,7 @@
                                        compatible = "atmel,at91rm9200-clk-master";
                                        #clock-cells = <0>;
                                        interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
-                                        clocks = <&clk32k>, <&main>, <&plla>, <&pllb>;
+                                        clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
                                        atmel,clk-output-range = <0 94000000>;
                                        atmel,clk-divisors = <1 2 4 0>;
                                };
@@ -632,7 +625,7 @@
                                        #address-cells = <1>;
                                        #size-cells = <0>;
                                        interrupt-parent = <&pmc>;
-                                        clocks = <&clk32k>, <&main>, <&plla>, <&pllb>;
+                                        clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
                                        prog0: prog0 {
                                                #clock-cells = <0>;
diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts
index c6683ea8b743..aa35a7aec9a8 100644
--- a/arch/arm/boot/dts/at91sam9261ek.dts
+++ b/arch/arm/boot/dts/at91sam9261ek.dts
@@ -20,6 +20,10 @@
                reg = <0x20000000 0x4000000>;
        };
+        slow_xtal {
+                clock-frequency = <32768>;
+        };
        main_xtal {
                clock-frequency = <18432000>;
        };
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index d1b82e6635d5..287795985e32 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -132,8 +132,8 @@
                                                                      <595000000 650000000 3 0>,
                                                                      <545000000 600000000 0 1>,
                                                                      <495000000 555000000 1 1>,
-                                                                      <445000000 500000000 1 2>,
+                                                                      <445000000 500000000 2 1>,
-                                                                      <400000000 450000000 1 3>;
+                                                                      <400000000 450000000 3 1>;
                                };
                                plladiv: plladivck {
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 1a57298636a5..d6133f497207 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -140,8 +140,8 @@
                                                                       595000000 650000000 3 0
                                                                       545000000 600000000 0 1
                                                                       495000000 555000000 1 1
-                                                                       445000000 500000000 1 2
+                                                                       445000000 500000000 2 1
-                                                                       400000000 450000000 1 3>;
+                                                                       400000000 450000000 3 1>;
                                };
                                plladiv: plladivck {
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index c29945e07c5a..80127638b379 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -773,7 +773,6 @@
                        clocks = <&qspi_gfclk_div>;
                        clock-names = "fck";
                        num-cs = <4>;
-                        interrupts = <0 343 0x4>;
                        status = "disabled";
                };
@@ -984,6 +983,17 @@
                        #size-cells = <1>;
                        status = "disabled";
                };
+                atl: atl@4843c000 {
+                        compatible = "ti,dra7-atl";
+                        reg = <0x4843c000 0x3ff>;
+                        ti,hwmods = "atl";
+                        ti,provided-clocks = <&atl_clkin0_ck>, <&atl_clkin1_ck>,
+                                             <&atl_clkin2_ck>, <&atl_clkin3_ck>;
+                        clocks = <&atl_gfclk_mux>;
+                        clock-names = "fck";
+                        status = "disabled";
+                };
        };
 };
diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index b03cfe49d22b..c90c76de84d6 100644
--- a/arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi
@@ -10,26 +10,26 @@
 &cm_core_aon_clocks {
        atl_clkin0_ck: atl_clkin0_ck {
                #clock-cells = <0>;
-                compatible = "fixed-clock";
+                compatible = "ti,dra7-atl-clock";
-                clock-frequency = <0>;
+                clocks = <&atl_gfclk_mux>;
        };
        atl_clkin1_ck: atl_clkin1_ck {
                #clock-cells = <0>;
-                compatible = "fixed-clock";
+                compatible = "ti,dra7-atl-clock";
-                clock-frequency = <0>;
+                clocks = <&atl_gfclk_mux>;
        };
        atl_clkin2_ck: atl_clkin2_ck {
                #clock-cells = <0>;
-                compatible = "fixed-clock";
+                compatible = "ti,dra7-atl-clock";
-                clock-frequency = <0>;
+                clocks = <&atl_gfclk_mux>;
        };
        atl_clkin3_ck: atl_clkin3_ck {
                #clock-cells = <0>;
-                compatible = "fixed-clock";
+                compatible = "ti,dra7-atl-clock";
-                clock-frequency = <0>;
+                clocks = <&atl_gfclk_mux>;
        };
        hdmi_clkin_ck: hdmi_clkin_ck {
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index b8ece4be41ca..fbaf426d2daa 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -113,7 +113,7 @@
                compatible = "arm,cortex-a9-gic";
                #interrupt-cells = <3>;
                interrupt-controller;
-                reg = <0x10490000 0x1000>, <0x10480000 0x100>;
+                reg = <0x10490000 0x10000>, <0x10480000 0x10000>;
        };
        combiner: interrupt-controller@10440000 {
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 6bc3243a80d3..181d77fa2fa6 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -315,15 +315,15 @@
 &esdhc1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_esdhc1>;
-        fsl,cd-controller;
+        cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
-        fsl,wp-controller;
+        wp-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };
 &esdhc2 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_esdhc2>;
-        cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
+        cd-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
        wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };
@@ -468,8 +468,8 @@
                                MX51_PAD_SD1_DATA1__SD1_DATA1           0x20d5
                                MX51_PAD_SD1_DATA2__SD1_DATA2           0x20d5
                                MX51_PAD_SD1_DATA3__SD1_DATA3           0x20d5
-                                MX51_PAD_GPIO1_0__SD1_CD                0x20d5
+                                MX51_PAD_GPIO1_0__GPIO1_0               0x100
-                                MX51_PAD_GPIO1_1__SD1_WP                0x20d5
+                                MX51_PAD_GPIO1_1__GPIO1_1               0x100
                        >;
                };
diff --git a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
index 75e66c9c6144..31cfb7f2b02e 100644
--- a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
+++ b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
@@ -107,7 +107,7 @@
 &esdhc1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_esdhc1 &pinctrl_esdhc1_cd>;
-        fsl,cd-controller;
+        cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
        status = "okay";
 };
@@ -206,7 +206,7 @@
                pinctrl_esdhc1_cd: esdhc1_cd {
                        fsl,pins = <
-                                MX51_PAD_GPIO1_0__SD1_CD 0x20d5
+                                MX51_PAD_GPIO1_0__GPIO1_0 0xd5
                        >;
                };
diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index d5d146a8b149..c4956b0ffb35 100644
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -21,27 +21,25 @@
                      <0xb0000000 0x20000000>;
        };
-        soc {
+        display1: display@di1 {
-                display1: display@di1 {
+                compatible = "fsl,imx-parallel-display";
-                        compatible = "fsl,imx-parallel-display";
+                interface-pix-fmt = "bgr666";
-                        interface-pix-fmt = "bgr666";
+                pinctrl-names = "default";
-                        pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_ipu_disp1>;
-                        pinctrl-0 = <&pinctrl_ipu_disp1>;
+                display-timings {
-                        display-timings {
+                        800x480p60 {
-                                800x480p60 {
+                                native-mode;
-                                        native-mode;
+                                clock-frequency = <31500000>;
-                                        clock-frequency = <31500000>;
+                                hactive = <800>;
-                                        hactive = <800>;
+                                vactive = <480>;
-                                        vactive = <480>;
+                                hfront-porch = <40>;
-                                        hfront-porch = <40>;
+                                hback-porch = <88>;
-                                        hback-porch = <88>;
+                                hsync-len = <128>;
-                                        hsync-len = <128>;
+                                vback-porch = <33>;
-                                        vback-porch = <33>;
+                                vfront-porch = <9>;
-                                        vfront-porch = <9>;
+                                vsync-len = <3>;
-                                        vsync-len = <3>;
+                                vsync-active = <1>;
-                                        vsync-active = <1>;
-                                };
                        };
                };
diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts
index 5373a5f2782b..c8e51dd41b8f 100644
--- a/arch/arm/boot/dts/imx6dl-hummingboard.dts
+++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts
@@ -143,6 +143,14 @@
                        fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>;
                };
+                pinctrl_hummingboard_usbotg_id: hummingboard-usbotg-id {
+                        /*
+                         * Similar to pinctrl_usbotg_2, but we want it
+                         * pulled down for a fixed host connection.
+                         */
+                        fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
+                };
                pinctrl_hummingboard_usbotg_vbus: hummingboard-usbotg-vbus {
                        fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>;
                };
@@ -178,6 +186,8 @@
 };
 &usbotg {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;
        vbus-supply = <&reg_usbotg_vbus>;
        status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6q-gw51xx.dts b/arch/arm/boot/dts/imx6q-gw51xx.dts
index af4929aee075..0e1406e58eff 100644
--- a/arch/arm/boot/dts/imx6q-gw51xx.dts
+++ b/arch/arm/boot/dts/imx6q-gw51xx.dts
@@ -11,7 +11,7 @@
 /dts-v1/;
 #include "imx6q.dtsi"
-#include "imx6qdl-gw54xx.dtsi"
+#include "imx6qdl-gw51xx.dtsi"
 / {
        model = "Gateworks Ventana i.MX6 Quad GW51XX";
diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index 25da82a03110..e8e781656b3f 100644
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -12,6 +12,19 @@
                pinctrl-0 = <&pinctrl_cubox_i_ir>;
        };
+        pwmleds {
+                compatible = "pwm-leds";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_cubox_i_pwm1>;
+                front {
+                        active-low;
+                        label = "imx6:red:front";
+                        max-brightness = <248>;
+                        pwms = <&pwm1 0 50000>;
+                };
+        };
        regulators {
                compatible = "simple-bus";
@@ -109,6 +122,10 @@
                        >;
                };
+                pinctrl_cubox_i_pwm1: cubox-i-pwm1-front-led {
+                        fsl,pins = <MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b0>;
+                };
                pinctrl_cubox_i_spdif: cubox-i-spdif {
                        fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;
                };
@@ -117,6 +134,14 @@
                        fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x4001b0b0>;
                };
+                pinctrl_cubox_i_usbotg_id: cubox-i-usbotg-id {
+                        /*
+                         * The Cubox-i pulls this low, but as it's pointless
+                         * leaving it as a pull-up, even if it is just 10uA.
+                         */
+                        fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
+                };
                pinctrl_cubox_i_usbotg_vbus: cubox-i-usbotg-vbus {
                        fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x4001b0b0>;
                };
@@ -153,6 +178,8 @@
 };
 &usbotg {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_cubox_i_usbotg_id>;
        vbus-supply = <&reg_usbotg_vbus>;
        status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
index 31665adcbf39..0db15af41cb1 100644
--- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
@@ -161,7 +161,7 @@
        status = "okay";
        pmic: ltc3676@3c {
-                compatible = "ltc,ltc3676";
+                compatible = "lltc,ltc3676";
                reg = <0x3c>;
                regulators {
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index 367af3ec9435..744c8a2d81f6 100644
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -220,7 +220,7 @@
        };
        pmic: ltc3676@3c {
-                compatible = "ltc,ltc3676";
+                compatible = "lltc,ltc3676";
                reg = <0x3c>;
                regulators {
@@ -288,7 +288,7 @@
        codec: sgtl5000@0a {
                compatible = "fsl,sgtl5000";
                reg = <0x0a>;
-                clocks = <&clks 169>;
+                clocks = <&clks 201>;
                VDDA-supply = <&reg_1p8v>;
                VDDIO-supply = <&reg_3p3v>;
        };
diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index c91b5a6c769b..adf150c1be90 100644
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@ -234,7 +234,7 @@
        };
        pmic: ltc3676@3c {
-                compatible = "ltc,ltc3676";
+                compatible = "lltc,ltc3676";
                reg = <0x3c>;
                regulators {
diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
index d729d0b15f25..79eac6849d4c 100644
--- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
@@ -10,14 +10,6 @@
                                MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA    0x1b0b1
                        >;
                };
-                pinctrl_microsom_usbotg: microsom-usbotg {
-                        /*
-                         * Similar to pinctrl_usbotg_2, but we want it
-                         * pulled down for a fixed host connection.
-                         */
-                        fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
-                };
        };
 };
@@ -26,8 +18,3 @@
        pinctrl-0 = <&pinctrl_microsom_uart1>;
        status = "okay";
 };
-&usbotg {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_microsom_usbotg>;
-};
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 2d4e5285f3f3..57d4abe03a94 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -686,7 +686,7 @@
                                compatible = "fsl,imx6sl-fec", "fsl,imx25-fec";
                                reg = <0x02188000 0x4000>;
                                interrupts = <0 114 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX6SL_CLK_ENET_REF>,
+                                clocks = <&clks IMX6SL_CLK_ENET>,
                                         <&clks IMX6SL_CLK_ENET_REF>;
                                clock-names = "ipg", "ahb";
                                status = "disabled";
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index c5a1fc75c7a3..b2d9834bf458 100644
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -105,7 +105,6 @@
                compatible = "ethernet-phy-id0141.0cb0",
                             "ethernet-phy-ieee802.3-c22";
                reg = <0>;
-                phy-connection-type = "rgmii-id";
        };
        ethphy1: ethernet-phy@1 {
@@ -113,7 +112,6 @@
                compatible = "ethernet-phy-id0141.0cb0",
                             "ethernet-phy-ieee802.3-c22";
                reg = <1>;
-                phy-connection-type = "rgmii-id";
        };
 };
@@ -121,6 +119,7 @@
        status = "okay";
        ethernet0-port@0 {
                phy-handle = <&ethphy0>;
+                phy-connection-type = "rgmii-id";
        };
 };
@@ -128,5 +127,6 @@
        status = "okay";
        ethernet1-port@0 {
                phy-handle = <&ethphy1>;
+                phy-connection-type = "rgmii-id";
        };
 };
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index cf0be662297e..1becefce821b 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -251,6 +251,11 @@
                        codec {
                        };
                };
+                twl_power: power {
+                        compatible = "ti,twl4030-power-beagleboard-xm", "ti,twl4030-power-idle-osc-off";
+                        ti,use_poweroff;
+                };
        };
 };
@@ -301,6 +306,7 @@
 };
 &uart3 {
+        interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;
        pinctrl-names = "default";
        pinctrl-0 = <&uart3_pins>;
 };
diff --git a/arch/arm/boot/dts/omap3-evm-common.dtsi b/arch/arm/boot/dts/omap3-evm-common.dtsi
index 8ae8f007c8ad..c8747c7f1cc8 100644
--- a/arch/arm/boot/dts/omap3-evm-common.dtsi
+++ b/arch/arm/boot/dts/omap3-evm-common.dtsi
@@ -50,6 +50,13 @@
        gpios = <&twl_gpio 18 GPIO_ACTIVE_LOW>;
 };
+&twl {
+        twl_power: power {
+                compatible = "ti,twl4030-power-omap3-evm", "ti,twl4030-power-idle";
+                ti,use_poweroff;
+        };
+};
 &i2c2 {
        clock-frequency = <400000>;
 };
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index ae8ae3f4f9bf..1fe45d1f75ec 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -351,6 +351,11 @@
                compatible = "ti,twl4030-audio";
                ti,enable-vibra = <1>;
        };
+        twl_power: power {
+                compatible = "ti,twl4030-power-n900", "ti,twl4030-power-idle-osc-off";
+                ti,use_poweroff;
+        };
 };
 &twl_keypad {
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 3bfda16c8b52..a4ed54988866 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -45,7 +45,6 @@
                        operating-points = <
                                /* kHz    uV */
-                                500000  880000
                                1000000 1060000
                                1500000 1250000
                        >;
diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi
index d6f254f302fe..a0f6f75fe3b5 100644
--- a/arch/arm/boot/dts/stih415.dtsi
+++ b/arch/arm/boot/dts/stih415.dtsi
@@ -169,8 +169,8 @@
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_mii0>;
-                        clock-names     = "stmmaceth";
+                        clock-names     = "stmmaceth", "sti-ethclk";
-                        clocks          = <&clk_s_a1_ls CLK_GMAC0_PHY>;
+                        clocks          = <&clk_s_a1_ls CLK_ICN_IF_2>, <&clk_s_a1_ls CLK_GMAC0_PHY>;
                };
                ethernet1: dwmac@fef08000 {
@@ -192,8 +192,8 @@
                        reset-names             = "stmmaceth";
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_mii1>;
-                        clock-names     = "stmmaceth";
+                        clock-names     = "stmmaceth", "sti-ethclk";
-                        clocks          = <&clk_s_a0_ls CLK_ETH1_PHY>;
+                        clocks          = <&clk_s_a0_ls CLK_ICN_REG>, <&clk_s_a0_ls CLK_ETH1_PHY>;
                };
                rc: rc@fe518000 {
diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020e.dts
index ba0fa2caaf18..ba0fa2caaf18 100644
--- a/arch/arm/boot/dts/stih416-b2020-revE.dts
+++ b/arch/arm/boot/dts/stih416-b2020e.dts
diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
index 06473c5d9ea9..84758d76d064 100644
--- a/arch/arm/boot/dts/stih416.dtsi
+++ b/arch/arm/boot/dts/stih416.dtsi
@@ -175,8 +175,8 @@
                        reset-names             = "stmmaceth";
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_mii0>;
-                        clock-names     = "stmmaceth";
+                        clock-names     = "stmmaceth", "sti-ethclk";
-                        clocks          = <&clk_s_a1_ls CLK_GMAC0_PHY>;
+                        clocks          = <&clk_s_a1_ls CLK_ICN_IF_2>, <&clk_s_a1_ls CLK_GMAC0_PHY>;
                };
                ethernet1: dwmac@fef08000 {
@@ -197,8 +197,8 @@
                        reset-names     = "stmmaceth";
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_mii1>;
-                        clock-names     = "stmmaceth";
+                        clock-names     = "stmmaceth", "sti-ethclk";
-                        clocks          = <&clk_s_a0_ls CLK_ETH1_PHY>;
+                        clocks          = <&clk_s_a0_ls CLK_ICN_REG>, <&clk_s_a0_ls CLK_ETH1_PHY>;
                };
                rc: rc@fe518000 {
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 6ef146edd0cd..a20fa80776d3 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -182,7 +182,6 @@ static int scoop_probe(struct platform_device *pdev)
        struct scoop_config *inf;
        struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        int ret;
-        int temp;
        if (!mem)
                return -EINVAL;
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index 9d13dae99125..4bf72264b175 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -94,10 +94,10 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=y
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
-CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_TEST=y
 CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_BCM_KONA=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index ef8815327e5b..59b7e45142d8 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -186,6 +186,7 @@ CONFIG_VIDEO_MX3=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_CODA=y
 CONFIG_SOC_CAMERA_OV2640=y
+CONFIG_IMX_IPUV3_CORE=y
 CONFIG_DRM=y
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index e2d62048e198..534836497998 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -223,12 +223,12 @@ CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_SUN6I=y
 CONFIG_SENSORS_LM90=y
 CONFIG_THERMAL=y
-CONFIG_DOVE_THERMAL=y
 CONFIG_ARMADA_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
 CONFIG_MFD_AS3722=y
+CONFIG_MFD_BCM590XX=y
 CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_CROS_EC_SPI=y
 CONFIG_MFD_MAX8907=y
@@ -240,6 +240,7 @@ CONFIG_MFD_TPS65910=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_AB8500=y
 CONFIG_REGULATOR_AS3722=y
+CONFIG_REGULATOR_BCM590XX=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_MAX8907=y
 CONFIG_REGULATOR_PALMAS=y
@@ -300,6 +301,7 @@ CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=16
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_DOVE=y
@@ -352,6 +354,7 @@ CONFIG_MFD_NVEC=y
 CONFIG_KEYBOARD_NVEC=y
 CONFIG_SERIO_NVEC_PS2=y
 CONFIG_NVEC_POWER=y
+CONFIG_QCOM_GSBI=y
 CONFIG_COMMON_CLK_QCOM=y
 CONFIG_MSM_GCC_8660=y
 CONFIG_MSM_MMCC_8960=y
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index e11170e37442..b0bfefa23902 100644
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -14,6 +14,7 @@ CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_375=y
 CONFIG_MACH_ARMADA_38X=y
 CONFIG_MACH_ARMADA_XP=y
+CONFIG_MACH_DOVE=y
 CONFIG_NEON=y
 # CONFIG_CACHE_L2X0 is not set
 # CONFIG_SWP_EMULATE is not set
@@ -52,6 +53,7 @@ CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_I2C=y
 CONFIG_SPI=y
 CONFIG_SPI_ORION=y
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 59066cf0271a..536a137863cb 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -32,6 +32,7 @@ CONFIG_SOC_OMAP5=y
 CONFIG_SOC_AM33XX=y
 CONFIG_SOC_AM43XX=y
 CONFIG_SOC_DRA7XX=y
+CONFIG_CACHE_L2X0=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_ERRATA_411920=y
 CONFIG_SMP=y
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
index eb577f4f5f70..39eb16b0066f 100644
--- a/arch/arm/include/asm/ftrace.h
+++ b/arch/arm/include/asm/ftrace.h
@@ -52,7 +52,7 @@ extern inline void *return_address(unsigned int level)
 #endif
-#define ftrace_return_addr(n) return_address(n)
+#define ftrace_return_address(n) return_address(n)
 #endif /* ifndef __ASSEMBLY__ */
diff --git a/arch/arm/include/asm/mcpm.h b/arch/arm/include/asm/mcpm.h
index d9702eb0b02b..94060adba174 100644
--- a/arch/arm/include/asm/mcpm.h
+++ b/arch/arm/include/asm/mcpm.h
@@ -208,8 +208,6 @@ struct sync_struct {
        struct mcpm_sync_struct clusters[MAX_NR_CLUSTERS];
 };
-extern unsigned long sync_phys; /* physical address of *mcpm_sync */
 void __mcpm_cpu_going_down(unsigned int cpu, unsigned int cluster);
 void __mcpm_cpu_down(unsigned int cpu, unsigned int cluster);
 void __mcpm_outbound_leave_critical(unsigned int cluster, int state);
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index f989d7c22dc5..e4e4208a9130 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -114,8 +114,14 @@ static inline struct thread_info *current_thread_info(void)
        ((unsigned long)(task_thread_info(tsk)->cpu_context.pc))
 #define thread_saved_sp(tsk)    \
        ((unsigned long)(task_thread_info(tsk)->cpu_context.sp))
+#ifndef CONFIG_THUMB2_KERNEL
 #define thread_saved_fp(tsk)    \
        ((unsigned long)(task_thread_info(tsk)->cpu_context.fp))
+#else
+#define thread_saved_fp(tsk)    \
+        ((unsigned long)(task_thread_info(tsk)->cpu_context.r7))
+#endif
 extern void crunch_task_disable(struct thread_info *);
 extern void crunch_task_copy(struct thread_info *, void *);
diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c
index 2037f7205987..1d37568c547a 100644
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
@@ -1924,7 +1924,7 @@ static int krait_pmu_get_event_idx(struct pmu_hw_events *cpuc,
                                   struct perf_event *event)
 {
        int idx;
-        int bit;
+        int bit = -1;
        unsigned int prefix;
        unsigned int region;
        unsigned int code;
@@ -1953,7 +1953,7 @@ static int krait_pmu_get_event_idx(struct pmu_hw_events *cpuc,
        }
        idx = armv7pmu_get_event_idx(cpuc, event);
-        if (idx < 0 && krait_event)
+        if (idx < 0 && bit >= 0)
                clear_bit(bit, cpuc->used_mask);
        return idx;
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 0dd3b79b15c3..0c27ed6f3f23 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -908,7 +908,7 @@ enum ptrace_syscall_dir {
        PTRACE_SYSCALL_EXIT,
 };
-static int tracehook_report_syscall(struct pt_regs *regs,
+static void tracehook_report_syscall(struct pt_regs *regs,
                                    enum ptrace_syscall_dir dir)
 {
        unsigned long ip;
@@ -926,7 +926,6 @@ static int tracehook_report_syscall(struct pt_regs *regs,
                current_thread_info()->syscall = -1;
        regs->ARM_ip = ip;
-        return current_thread_info()->syscall;
 }
 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
@@ -938,7 +937,9 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
                return -1;
        if (test_thread_flag(TIF_SYSCALL_TRACE))
-                scno = tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);
+                tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);
+        scno = current_thread_info()->syscall;
        if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
                trace_sys_enter(regs, scno);
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 9bc6db1c1348..41c839167e87 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -1,10 +1,9 @@
-config ARCH_BCM
+menuconfig ARCH_BCM
        bool "Broadcom SoC Support" if ARCH_MULTI_V6_V7
        help
          This enables support for Broadcom ARM based SoC chips
-menu "Broadcom SoC Selection"
+if ARCH_BCM
-        depends on ARCH_BCM
 config ARCH_BCM_MOBILE
        bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7
@@ -88,4 +87,4 @@ config ARCH_BCM_5301X
          different SoC or with the older BCM47XX and BCM53XX based
          network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
-endmenu
+endif
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index 101e0f356730..2631cfc5ab0d 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -1,4 +1,4 @@
-config ARCH_BERLIN
+menuconfig ARCH_BERLIN
        bool "Marvell Berlin SoCs" if ARCH_MULTI_V7
        select ARCH_REQUIRE_GPIOLIB
        select ARM_GIC
@@ -9,8 +9,6 @@ config ARCH_BERLIN
 if ARCH_BERLIN
-menu "Marvell Berlin SoC variants"
 config MACH_BERLIN_BG2
        bool "Marvell Armada 1500 (BG2)"
        select CACHE_L2X0
@@ -30,6 +28,4 @@ config MACH_BERLIN_BG2Q
        select HAVE_ARM_TWD if SMP
        select PINCTRL_BERLIN_BG2Q
-endmenu
 endif
diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig
index 66838f42037f..3c22a1990ecd 100644
--- a/arch/arm/mach-cns3xxx/Kconfig
+++ b/arch/arm/mach-cns3xxx/Kconfig
@@ -1,12 +1,11 @@
-config ARCH_CNS3XXX
+menuconfig ARCH_CNS3XXX
        bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6
        select ARM_GIC
        select PCI_DOMAINS if PCI
        help
          Support for Cavium Networks CNS3XXX platform.
-menu "CNS3XXX platform type"
+if ARCH_CNS3XXX
-        depends on ARCH_CNS3XXX
 config MACH_CNS3420VB
        bool "Support for CNS3420 Validation Board"
@@ -17,4 +16,4 @@ config MACH_CNS3420VB
          This is a platform with an on-board ARM11 MPCore and has support
          for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc.
-endmenu
+endif
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index db18ef866593..584e8d4e2892 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -39,7 +39,6 @@ config ARCH_DAVINCI_DA830
 config ARCH_DAVINCI_DA850
        bool "DA850/OMAP-L138/AM18x based system"
        select ARCH_DAVINCI_DA8XX
-        select ARCH_HAS_CPUFREQ
        select CP_INTC
 config ARCH_DAVINCI_DA8XX
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index d58995c9a95a..8f9b66c4ac78 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -7,10 +7,9 @@
 # Configuration options for the EXYNOS4
-config ARCH_EXYNOS
+menuconfig ARCH_EXYNOS
        bool "Samsung EXYNOS" if ARCH_MULTI_V7
        select ARCH_HAS_BANDGAP
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
@@ -30,8 +29,6 @@ config ARCH_EXYNOS
 if ARCH_EXYNOS
-menu "SAMSUNG EXYNOS SoCs Support"
 config ARCH_EXYNOS3
        bool "SAMSUNG EXYNOS3"
        select ARM_CPU_SUSPEND if PM
@@ -118,8 +115,6 @@ config SOC_EXYNOS5800
        default y
        depends on SOC_EXYNOS5420
-endmenu
 config EXYNOS5420_MCPM
        bool "Exynos5420 Multi-Cluster PM support"
        depends on MCPM && SOC_EXYNOS5420
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index 16617bdb37a9..1ee91763fa7c 100644
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -118,6 +118,7 @@ extern void __iomem *sysram_ns_base_addr;
 extern void __iomem *sysram_base_addr;
 void exynos_init_io(void);
 void exynos_restart(enum reboot_mode mode, const char *cmd);
+void exynos_sysram_init(void);
 void exynos_cpuidle_init(void);
 void exynos_cpufreq_init(void);
 void exynos_init_late(void);
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 90aab4d75d08..f38cf7c110cc 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -184,6 +184,28 @@ void __init exynos_cpufreq_init(void)
        platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);
 }
+void __iomem *sysram_base_addr;
+void __iomem *sysram_ns_base_addr;
+void __init exynos_sysram_init(void)
+{
+        struct device_node *node;
+        for_each_compatible_node(node, NULL, "samsung,exynos4210-sysram") {
+                if (!of_device_is_available(node))
+                        continue;
+                sysram_base_addr = of_iomap(node, 0);
+                break;
+        }
+        for_each_compatible_node(node, NULL, "samsung,exynos4210-sysram-ns") {
+                if (!of_device_is_available(node))
+                        continue;
+                sysram_ns_base_addr = of_iomap(node, 0);
+                break;
+        }
+}
 void __init exynos_init_late(void)
 {
        if (of_machine_is_compatible("samsung,exynos5440"))
@@ -198,7 +220,7 @@ static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname,
                                        int depth, void *data)
 {
        struct map_desc iodesc;
-        __be32 *reg;
+        const __be32 *reg;
        int len;
        if (!of_flat_dt_is_compatible(node, "samsung,exynos4210-chipid") &&
@@ -271,6 +293,13 @@ static void __init exynos_dt_machine_init(void)
                }
        }
+        /*
+         * This is called from smp_prepare_cpus if we've built for SMP, but
+         * we still need to set it up for PM and firmware ops if not.
+         */
+        if (!IS_ENABLED(SMP))
+                exynos_sysram_init();
        exynos_cpuidle_init();
        exynos_cpufreq_init();
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c
index 69fa48397394..8a134d019cb3 100644
--- a/arch/arm/mach-exynos/hotplug.c
+++ b/arch/arm/mach-exynos/hotplug.c
@@ -46,13 +46,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
                if (cpu == 1)
                        exynos_cpu_power_down(cpu);
-                /*
+                wfi();
-                 * here's the WFI
-                 */
-                asm(".word      0xe320f003\n"
-                    :
-                    :
-                    : "memory", "cc");
                if (pen_release == cpu_logical_map(cpu)) {
                        /*
diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c
index 0498d0b887ef..ace0ed617476 100644
--- a/arch/arm/mach-exynos/mcpm-exynos.c
+++ b/arch/arm/mach-exynos/mcpm-exynos.c
@@ -25,7 +25,6 @@
 #define EXYNOS5420_CPUS_PER_CLUSTER     4
 #define EXYNOS5420_NR_CLUSTERS          2
-#define MCPM_BOOT_ADDR_OFFSET           0x1c
 /*
 * The common v7_exit_coherency_flush API could not be used because of the
@@ -343,11 +342,13 @@ static int __init exynos_mcpm_init(void)
        pr_info("Exynos MCPM support installed\n");
        /*
-         * Future entries into the kernel can now go
+         * U-Boot SPL is hardcoded to jump to the start of ns_sram_base_addr
-         * through the cluster entry vectors.
+         * as part of secondary_cpu_start().  Let's redirect it to the
+         * mcpm_entry_point().
         */
-        __raw_writel(virt_to_phys(mcpm_entry_point),
+        __raw_writel(0xe59f0000, ns_sram_base_addr);     /* ldr r0, [pc, #0] */
-                        ns_sram_base_addr + MCPM_BOOT_ADDR_OFFSET);
+        __raw_writel(0xe12fff10, ns_sram_base_addr + 4); /* bx  r0 */
+        __raw_writel(virt_to_phys(mcpm_entry_point), ns_sram_base_addr + 8);
        iounmap(ns_sram_base_addr);
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index ec02422e8499..1c8d31e39520 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -32,28 +32,6 @@
 extern void exynos4_secondary_startup(void);
-void __iomem *sysram_base_addr;
-void __iomem *sysram_ns_base_addr;
-static void __init exynos_smp_prepare_sysram(void)
-{
-        struct device_node *node;
-        for_each_compatible_node(node, NULL, "samsung,exynos4210-sysram") {
-                if (!of_device_is_available(node))
-                        continue;
-                sysram_base_addr = of_iomap(node, 0);
-                break;
-        }
-        for_each_compatible_node(node, NULL, "samsung,exynos4210-sysram-ns") {
-                if (!of_device_is_available(node))
-                        continue;
-                sysram_ns_base_addr = of_iomap(node, 0);
-                break;
-        }
-}
 static inline void __iomem *cpu_boot_reg_base(void)
 {
        if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)
@@ -234,11 +212,11 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
 {
        int i;
+        exynos_sysram_init();
        if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
                scu_enable(scu_base_addr());
-        exynos_smp_prepare_sysram();
        /*
         * Write the address of secondary startup into the
         * system-wide flags register. The boot monitor waits
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index 87c0d34c7fba..202ca73e49c4 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -300,7 +300,7 @@ static int exynos_pm_suspend(void)
        tmp = (S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0);
        __raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION);
-        if (!soc_is_exynos5250())
+        if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
                exynos_cpu_save_register();
        return 0;
@@ -334,7 +334,7 @@ static void exynos_pm_resume(void)
        if (exynos_pm_central_resume())
                goto early_wakeup;
-        if (!soc_is_exynos5250())
+        if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
                exynos_cpu_restore_register();
        /* For release retention */
@@ -353,7 +353,7 @@ static void exynos_pm_resume(void)
        s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save));
-        if (!soc_is_exynos5250())
+        if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
                scu_enable(S5P_VA_SCU);
 early_wakeup:
@@ -440,15 +440,18 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self,
        case CPU_PM_ENTER:
                if (cpu == 0) {
                        exynos_pm_central_suspend();
-                        exynos_cpu_save_register();
+                        if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
+                                exynos_cpu_save_register();
                }
                break;
        case CPU_PM_EXIT:
                if (cpu == 0) {
-                        if (!soc_is_exynos5250())
+                        if (read_cpuid_part_number() ==
+                                        ARM_CPU_PART_CORTEX_A9) {
                                scu_enable(S5P_VA_SCU);
-                        exynos_cpu_restore_register();
+                                exynos_cpu_restore_register();
+                        }
                        exynos_pm_central_resume();
                }
                break;
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
index 830b76e70250..a5960e2ac090 100644
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -1,7 +1,6 @@
 config ARCH_HIGHBANK
        bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7
        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_HAS_OPP
        select ARCH_SUPPORTS_BIG_ENDIAN
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 8d42eab76d53..4b5185748f74 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,6 +1,5 @@
-config ARCH_MXC
+menuconfig ARCH_MXC
        bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select ARCH_REQUIRE_GPIOLIB
        select ARM_CPU_SUSPEND if PM
@@ -13,8 +12,7 @@ config ARCH_MXC
        help
          Support for Freescale MXC/iMX-based family of processors
-menu "Freescale i.MX support"
+if ARCH_MXC
-        depends on ARCH_MXC
 config MXC_TZIC
        bool
@@ -99,7 +97,6 @@ config SOC_IMX25
 config SOC_IMX27
        bool
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select CPU_ARM926T
        select IMX_HAVE_IOMUX_V1
@@ -124,7 +121,6 @@ config SOC_IMX35
 config SOC_IMX5
        bool
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select ARCH_MXC_IOMUX_V3
        select MXC_TZIC
@@ -738,9 +734,9 @@ config SOC_IMX6
        select HAVE_IMX_MMDC
        select HAVE_IMX_SRC
        select MFD_SYSCON
-        select PL310_ERRATA_588369 if CACHE_PL310
+        select PL310_ERRATA_588369 if CACHE_L2X0
-        select PL310_ERRATA_727915 if CACHE_PL310
+        select PL310_ERRATA_727915 if CACHE_L2X0
-        select PL310_ERRATA_769419 if CACHE_PL310
+        select PL310_ERRATA_769419 if CACHE_L2X0
 config SOC_IMX6Q
        bool "i.MX6 Quad/DualLite support"
@@ -775,9 +771,9 @@ config SOC_VF610
        select ARM_GIC
        select PINCTRL_VF610
        select VF_PIT_TIMER
-        select PL310_ERRATA_588369 if CACHE_PL310
+        select PL310_ERRATA_588369 if CACHE_L2X0
-        select PL310_ERRATA_727915 if CACHE_PL310
+        select PL310_ERRATA_727915 if CACHE_L2X0
-        select PL310_ERRATA_769419 if CACHE_PL310
+        select PL310_ERRATA_769419 if CACHE_L2X0
        help
          This enable support for Freescale Vybrid VF610 processor.
@@ -786,4 +782,4 @@ endif
 source "arch/arm/mach-imx/devices/Kconfig"
-endmenu
+endif
diff --git a/arch/arm/mach-imx/clk-imx6sl.c b/arch/arm/mach-imx/clk-imx6sl.c
index 21cf06cebade..5408ca70c8d6 100644
--- a/arch/arm/mach-imx/clk-imx6sl.c
+++ b/arch/arm/mach-imx/clk-imx6sl.c
@@ -312,6 +312,7 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node)
        clks[IMX6SL_CLK_ECSPI2]       = imx_clk_gate2("ecspi2",       "ecspi_root",        base + 0x6c, 2);
        clks[IMX6SL_CLK_ECSPI3]       = imx_clk_gate2("ecspi3",       "ecspi_root",        base + 0x6c, 4);
        clks[IMX6SL_CLK_ECSPI4]       = imx_clk_gate2("ecspi4",       "ecspi_root",        base + 0x6c, 6);
+        clks[IMX6SL_CLK_ENET]         = imx_clk_gate2("enet",         "ipg",               base + 0x6c, 10);
        clks[IMX6SL_CLK_EPIT1]        = imx_clk_gate2("epit1",        "perclk",            base + 0x6c, 12);
        clks[IMX6SL_CLK_EPIT2]        = imx_clk_gate2("epit2",        "perclk",            base + 0x6c, 14);
        clks[IMX6SL_CLK_EXTERN_AUDIO] = imx_clk_gate2("extern_audio", "extern_audio_podf", base + 0x6c, 16);
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index ba43321001d8..64f8e2564a37 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -28,7 +28,7 @@ config ARCH_CINTEGRATOR
        bool
 config INTEGRATOR_IMPD1
-        tristate "Include support for Integrator/IM-PD1"
+        bool "Include support for Integrator/IM-PD1"
        depends on ARCH_INTEGRATOR_AP
        select ARCH_REQUIRE_GPIOLIB
        select ARM_VIC
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index 0e870ea818c4..3ce880729cff 100644
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -308,7 +308,12 @@ static struct impd1_device impd1_devs[] = {
 */
 #define IMPD1_VALID_IRQS 0x00000bffU
-static int __init impd1_probe(struct lm_device *dev)
+/*
+ * As this module is bool, it is OK to have this as __init_refok() - no
+ * probe calls will be done after the initial system bootup, as devices
+ * are discovered as part of the machine startup.
+ */
+static int __init_refok impd1_probe(struct lm_device *dev)
 {
        struct impd1_module *impd1;
        int irq_base;
@@ -397,6 +402,11 @@ static void impd1_remove(struct lm_device *dev)
 static struct lm_driver impd1_driver = {
        .drv = {
                .name   = "impd1",
+                /*
+                 * As we're dropping the probe() function, suppress driver
+                 * binding from sysfs.
+                 */
+                .suppress_bind_attrs = true,
        },
        .probe          = impd1_probe,
        .remove         = impd1_remove,
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index dd0cc677d596..660ca6feff40 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -480,25 +480,18 @@ static const struct of_device_id ebi_match[] = {
 static void __init ap_init_of(void)
 {
        unsigned long sc_dec;
-        struct device_node *root;
        struct device_node *syscon;
        struct device_node *ebi;
        struct device *parent;
        struct soc_device *soc_dev;
        struct soc_device_attribute *soc_dev_attr;
        u32 ap_sc_id;
-        int err;
        int i;
-        /* Here we create an SoC device for the root node */
+        syscon = of_find_matching_node(NULL, ap_syscon_match);
-        root = of_find_node_by_path("/");
-        if (!root)
-                return;
-        syscon = of_find_matching_node(root, ap_syscon_match);
        if (!syscon)
                return;
-        ebi = of_find_matching_node(root, ebi_match);
+        ebi = of_find_matching_node(NULL, ebi_match);
        if (!ebi)
                return;
@@ -509,19 +502,17 @@ static void __init ap_init_of(void)
        if (!ebi_base)
                return;
+        of_platform_populate(NULL, of_default_bus_match_table,
+                        ap_auxdata_lookup, NULL);
        ap_sc_id = readl(ap_syscon_base);
        soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
        if (!soc_dev_attr)
                return;
-        err = of_property_read_string(root, "compatible",
+        soc_dev_attr->soc_id = "XVC";
-                                      &soc_dev_attr->soc_id);
+        soc_dev_attr->machine = "Integrator/AP";
-        if (err)
-                return;
-        err = of_property_read_string(root, "model", &soc_dev_attr->machine);
-        if (err)
-                return;
        soc_dev_attr->family = "Integrator";
        soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%c",
                                           'A' + (ap_sc_id & 0x0f));
@@ -536,9 +527,6 @@ static void __init ap_init_of(void)
        parent = soc_device_to_device(soc_dev);
        integrator_init_sysfs(parent, ap_sc_id);
-        of_platform_populate(root, of_default_bus_match_table,
-                        ap_auxdata_lookup, parent);
        sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET);
        for (i = 0; i < 4; i++) {
                struct lm_device *lmdev;
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index a938242b0c95..0e57f8f820a5 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -279,20 +279,13 @@ static const struct of_device_id intcp_syscon_match[] = {
 static void __init intcp_init_of(void)
 {
-        struct device_node *root;
        struct device_node *cpcon;
        struct device *parent;
        struct soc_device *soc_dev;
        struct soc_device_attribute *soc_dev_attr;
        u32 intcp_sc_id;
-        int err;
-        /* Here we create an SoC device for the root node */
+        cpcon = of_find_matching_node(NULL, intcp_syscon_match);
-        root = of_find_node_by_path("/");
-        if (!root)
-                return;
-        cpcon = of_find_matching_node(root, intcp_syscon_match);
        if (!cpcon)
                return;
@@ -300,19 +293,17 @@ static void __init intcp_init_of(void)
        if (!intcp_con_base)
                return;
+        of_platform_populate(NULL, of_default_bus_match_table,
+                             intcp_auxdata_lookup, NULL);
        intcp_sc_id = readl(intcp_con_base);
        soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
        if (!soc_dev_attr)
                return;
-        err = of_property_read_string(root, "compatible",
+        soc_dev_attr->soc_id = "XCV";
-                                      &soc_dev_attr->soc_id);
+        soc_dev_attr->machine = "Integrator/CP";
-        if (err)
-                return;
-        err = of_property_read_string(root, "model", &soc_dev_attr->machine);
-        if (err)
-                return;
        soc_dev_attr->family = "Integrator";
        soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%c",
                                           'A' + (intcp_sc_id & 0x0f));
@@ -326,8 +317,6 @@ static void __init intcp_init_of(void)
        parent = soc_device_to_device(soc_dev);
        integrator_init_sysfs(parent, intcp_sc_id);
-        of_platform_populate(root, of_default_bus_match_table,
-                        intcp_auxdata_lookup, parent);
 }
 static const char * intcp_dt_board_compat[] = {
diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index f50bc936cb84..98a156afaa94 100644
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -1,6 +1,7 @@
 config ARCH_KEYSTONE
        bool "Texas Instruments Keystone Devices"
        depends on ARCH_MULTI_V7
+        depends on ARM_PATCH_PHYS_VIRT
        select ARM_GIC
        select HAVE_ARM_ARCH_TIMER
        select CLKSRC_MMIO
diff --git a/arch/arm/mach-moxart/Kconfig b/arch/arm/mach-moxart/Kconfig
index 82a4ba8578a2..f49328c39bef 100644
--- a/arch/arm/mach-moxart/Kconfig
+++ b/arch/arm/mach-moxart/Kconfig
@@ -1,4 +1,4 @@
-config ARCH_MOXART
+menuconfig ARCH_MOXART
        bool "MOXA ART SoC" if ARCH_MULTI_V4
        select CPU_FA526
        select ARM_DMA_MEM_BUFFERABLE
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 6090b9eb00c8..b9bc599a5fd0 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -1,4 +1,4 @@
-config ARCH_MVEBU
+menuconfig ARCH_MVEBU
        bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V5)
        select ARCH_SUPPORTS_BIG_ENDIAN
        select CLKSRC_MMIO
@@ -10,15 +10,15 @@ config ARCH_MVEBU
        select ZONE_DMA if ARM_LPAE
        select ARCH_REQUIRE_GPIOLIB
        select PCI_QUIRKS if PCI
+        select OF_ADDRESS_PCI
 if ARCH_MVEBU
-menu "Marvell EBU SoC variants"
 config MACH_MVEBU_V7
        bool
        select ARMADA_370_XP_TIMER
        select CACHE_L2X0
+        select ARM_CPU_SUSPEND
 config MACH_ARMADA_370
        bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
@@ -84,7 +84,6 @@ config MACH_DOVE
 config MACH_KIRKWOOD
        bool "Marvell Kirkwood boards" if ARCH_MULTI_V5
-        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select CPU_FEROCEON
        select KIRKWOOD_CLK
@@ -97,6 +96,4 @@ config MACH_KIRKWOOD
          Say 'Y' here if you want your kernel to support boards based
          on the Marvell Kirkwood device tree.
-endmenu
 endif
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index 2ecb828e4a8b..1636cdbef01a 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -7,7 +7,7 @@ CFLAGS_pmsu.o			:= -march=armv7-a
 obj-y                            += system-controller.o mvebu-soc-id.o
 ifeq ($(CONFIG_MACH_MVEBU_V7),y)
-obj-y                            += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o
+obj-y                            += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o
 obj-$(CONFIG_SMP)                += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
 obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
 endif
diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c
index 8bb742fdf5ca..b2524d689f21 100644
--- a/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@ -23,6 +23,7 @@
 #include <linux/mbus.h>
 #include <linux/signal.h>
 #include <linux/slab.h>
+#include <linux/irqchip.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -71,17 +72,23 @@ static int armada_375_external_abort_wa(unsigned long addr, unsigned int fsr,
        return 1;
 }
-static void __init mvebu_timer_and_clk_init(void)
+static void __init mvebu_init_irq(void)
 {
-        of_clk_init(NULL);
+        irqchip_init();
-        clocksource_of_init();
        mvebu_scu_enable();
        coherency_init();
        BUG_ON(mvebu_mbus_dt_init(coherency_available()));
+}
+static void __init external_abort_quirk(void)
+{
+        u32 dev, rev;
-        if (of_machine_is_compatible("marvell,armada375"))
+        if (mvebu_get_soc_id(&dev, &rev) == 0 && rev > ARMADA_375_Z1_REV)
-                hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,
+                return;
-                                "imprecise external abort");
+        hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,
+                        "imprecise external abort");
 }
 static void __init i2c_quirk(void)
@@ -169,8 +176,10 @@ static void __init mvebu_dt_init(void)
 {
        if (of_machine_is_compatible("plathome,openblocks-ax3-4"))
                i2c_quirk();
-        if (of_machine_is_compatible("marvell,a375-db"))
+        if (of_machine_is_compatible("marvell,a375-db")) {
+                external_abort_quirk();
                thermal_quirk();
+        }
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
@@ -185,7 +194,7 @@ DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)")
        .l2c_aux_mask   = ~0,
        .smp            = smp_ops(armada_xp_smp_ops),
        .init_machine   = mvebu_dt_init,
-        .init_time      = mvebu_timer_and_clk_init,
+        .init_irq       = mvebu_init_irq,
        .restart        = mvebu_restart,
        .dt_compat      = armada_370_xp_dt_compat,
 MACHINE_END
@@ -198,7 +207,7 @@ static const char * const armada_375_dt_compat[] = {
 DT_MACHINE_START(ARMADA_375_DT, "Marvell Armada 375 (Device Tree)")
        .l2c_aux_val    = 0,
        .l2c_aux_mask   = ~0,
-        .init_time      = mvebu_timer_and_clk_init,
+        .init_irq       = mvebu_init_irq,
        .init_machine   = mvebu_dt_init,
        .restart        = mvebu_restart,
        .dt_compat      = armada_375_dt_compat,
@@ -213,7 +222,7 @@ static const char * const armada_38x_dt_compat[] = {
 DT_MACHINE_START(ARMADA_38X_DT, "Marvell Armada 380/385 (Device Tree)")
        .l2c_aux_val    = 0,
        .l2c_aux_mask   = ~0,
-        .init_time      = mvebu_timer_and_clk_init,
+        .init_irq       = mvebu_init_irq,
        .restart        = mvebu_restart,
        .dt_compat      = armada_38x_dt_compat,
 MACHINE_END
diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
index 53a55c8520bf..a1d407c0febe 100644
--- a/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c
@@ -66,6 +66,8 @@ static void __iomem *pmsu_mp_base;
 extern void ll_disable_coherency(void);
 extern void ll_enable_coherency(void);
+extern void armada_370_xp_cpu_resume(void);
 static struct platform_device armada_xp_cpuidle_device = {
        .name = "cpuidle-armada-370-xp",
 };
@@ -140,13 +142,6 @@ static void armada_370_xp_pmsu_enable_l2_powerdown_onidle(void)
        writel(reg, pmsu_mp_base + L2C_NFABRIC_PM_CTL);
 }
-static void armada_370_xp_cpu_resume(void)
-{
-        asm volatile("bl    ll_add_cpu_to_smp_group\n\t"
-                     "bl    ll_enable_coherency\n\t"
-                     "b     cpu_resume\n\t");
-}
 /* No locking is needed because we only access per-CPU registers */
 void armada_370_xp_pmsu_idle_prepare(bool deepidle)
 {
diff --git a/arch/arm/mach-mvebu/pmsu_ll.S b/arch/arm/mach-mvebu/pmsu_ll.S
new file mode 100644
index 000000000000..fc3de68d8c54
--- /dev/null
+++ b/arch/arm/mach-mvebu/pmsu_ll.S
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2014 Marvell
+ *
+ * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ * Gregory Clement <gregory.clement@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+/*
+ * This is the entry point through which CPUs exiting cpuidle deep
+ * idle state are going.
+ */
+ENTRY(armada_370_xp_cpu_resume)
+ARM_BE8(setend  be )                    @ go BE8 if entered LE
+        bl      ll_add_cpu_to_smp_group
+        bl      ll_enable_coherency
+        b       cpu_resume
+ENDPROC(armada_370_xp_cpu_resume)
diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig
index 486d301f43fd..3c61096c8627 100644
--- a/arch/arm/mach-nomadik/Kconfig
+++ b/arch/arm/mach-nomadik/Kconfig
@@ -1,4 +1,4 @@
-config ARCH_NOMADIK
+menuconfig ARCH_NOMADIK
        bool "ST-Ericsson Nomadik"
        depends on ARCH_MULTI_V5
        select ARCH_REQUIRE_GPIOLIB
@@ -15,7 +15,6 @@ config ARCH_NOMADIK
          Support for the Nomadik platform by ST-Ericsson
 if ARCH_NOMADIK
-menu "Nomadik boards"
 config MACH_NOMADIK_8815NHK
        bool "ST 8815 Nomadik Hardware Kit (evaluation board)"
@@ -24,7 +23,6 @@ config MACH_NOMADIK_8815NHK
        select I2C_ALGOBIT
        select I2C_NOMADIK
-endmenu
 endif
 config NOMADIK_8815
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 0ba482638ebf..1c1ed737f7ab 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -1,3 +1,6 @@
+menu "TI OMAP/AM/DM/DRA Family"
+        depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
 config ARCH_OMAP
        bool
@@ -28,12 +31,11 @@ config ARCH_OMAP4
        select ARM_CPU_SUSPEND if PM
        select ARM_ERRATA_720789
        select ARM_GIC
-        select CACHE_L2X0
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select OMAP_INTERCONNECT
-        select PL310_ERRATA_588369
+        select PL310_ERRATA_588369 if CACHE_L2X0
-        select PL310_ERRATA_727915
+        select PL310_ERRATA_727915 if CACHE_L2X0
        select PM_OPP if PM
        select PM_RUNTIME if CPU_IDLE
        select ARM_ERRATA_754322
@@ -80,7 +82,6 @@ config SOC_DRA7XX
 config ARCH_OMAP2PLUS
        bool
        select ARCH_HAS_BANDGAP
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_OMAP
        select ARCH_REQUIRE_GPIOLIB
@@ -343,3 +344,5 @@ config OMAP4_ERRATA_I688
 endmenu
 endif
+endmenu
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 8421f38cf445..8ca99e9321e3 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -110,14 +110,16 @@ obj-y					+= prm_common.o cm_common.o
 obj-$(CONFIG_ARCH_OMAP2)                += prm2xxx_3xxx.o prm2xxx.o cm2xxx.o
 obj-$(CONFIG_ARCH_OMAP3)                += prm2xxx_3xxx.o prm3xxx.o cm3xxx.o
 obj-$(CONFIG_ARCH_OMAP3)                += vc3xxx_data.o vp3xxx_data.o
-obj-$(CONFIG_SOC_AM33XX)                += prm33xx.o cm33xx.o
 omap-prcm-4-5-common                    =  cminst44xx.o cm44xx.o prm44xx.o \
                                           prcm_mpu44xx.o prminst44xx.o \
                                           vc44xx_data.o vp44xx_data.o
 obj-$(CONFIG_ARCH_OMAP4)                += $(omap-prcm-4-5-common)
 obj-$(CONFIG_SOC_OMAP5)                 += $(omap-prcm-4-5-common)
 obj-$(CONFIG_SOC_DRA7XX)                += $(omap-prcm-4-5-common)
-obj-$(CONFIG_SOC_AM43XX)                += $(omap-prcm-4-5-common)
+am33xx-43xx-prcm-common                 += prm33xx.o cm33xx.o
+obj-$(CONFIG_SOC_AM33XX)                += $(am33xx-43xx-prcm-common)
+obj-$(CONFIG_SOC_AM43XX)                += $(omap-prcm-4-5-common) \
+                                           $(am33xx-43xx-prcm-common)
 # OMAP voltage domains
 voltagedomain-common                    := voltage.o vc.o vp.o
diff --git a/arch/arm/mach-omap2/cm33xx.h b/arch/arm/mach-omap2/cm33xx.h
index 15a778ce7707..bd2441790779 100644
--- a/arch/arm/mach-omap2/cm33xx.h
+++ b/arch/arm/mach-omap2/cm33xx.h
@@ -380,7 +380,7 @@ void am33xx_cm_clkdm_disable_hwsup(u16 inst, u16 cdoffs);
 void am33xx_cm_clkdm_force_sleep(u16 inst, u16 cdoffs);
 void am33xx_cm_clkdm_force_wakeup(u16 inst, u16 cdoffs);
-#ifdef CONFIG_SOC_AM33XX
+#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)
 extern int am33xx_cm_wait_module_idle(u16 inst, s16 cdoffs,
                                        u16 clkctrl_offs);
 extern void am33xx_cm_module_enable(u8 mode, u16 inst, s16 cdoffs,
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index ff029737c8f0..b2d252bf4a53 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -91,7 +91,14 @@ extern void omap3_sync32k_timer_init(void);
 extern void omap3_secure_sync32k_timer_init(void);
 extern void omap3_gptimer_timer_init(void);
 extern void omap4_local_timer_init(void);
+#ifdef CONFIG_CACHE_L2X0
 int omap_l2_cache_init(void);
+#else
+static inline int omap_l2_cache_init(void)
+{
+        return 0;
+}
+#endif
 extern void omap5_realtime_timer_init(void);
 void omap2420_init_early(void);
@@ -241,7 +248,6 @@ static inline void __iomem *omap4_get_scu_base(void)
 }
 #endif
-extern void __init gic_init_irq(void);
 extern void gic_dist_disable(void);
 extern void gic_dist_enable(void);
 extern bool gic_dist_disabled(void);
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 43969da5d50b..d42022f2a71e 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -649,6 +649,18 @@ void __init dra7xxx_check_revision(void)
                }
                break;
+        case 0xb9bc:
+                switch (rev) {
+                case 0:
+                        omap_revision = DRA722_REV_ES1_0;
+                        break;
+                default:
+                        /* If we have no new revisions */
+                        omap_revision = DRA722_REV_ES1_0;
+                        break;
+                }
+                break;
        default:
                /* Unknown default to latest silicon rev as default*/
                pr_warn("%s: unknown idcode=0x%08x (hawkeye=0x%08x,rev=0x%d)\n",
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index fd88edeb027f..f62f7537d899 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -183,8 +183,10 @@ static int __init _omap_mux_get_by_name(struct omap_mux_partition *partition,
                m0_entry = mux->muxnames[0];
                /* First check for full name in mode0.muxmode format */
-                if (mode0_len && strncmp(muxname, m0_entry, mode0_len))
+                if (mode0_len)
-                        continue;
+                        if (strncmp(muxname, m0_entry, mode0_len) ||
+                            (strlen(m0_entry) != mode0_len))
+                                continue;
                /* Then check for muxmode only */
                for (i = 0; i < OMAP_MUX_NR_MODES; i++) {
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index 326cd982a3cb..539e8106eb96 100644
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -102,26 +102,6 @@ void __init omap_barriers_init(void)
 {}
 #endif
-void __init gic_init_irq(void)
-{
-        void __iomem *omap_irq_base;
-        /* Static mapping, never released */
-        gic_dist_base_addr = ioremap(OMAP44XX_GIC_DIST_BASE, SZ_4K);
-        BUG_ON(!gic_dist_base_addr);
-        twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_4K);
-        BUG_ON(!twd_base);
-        /* Static mapping, never released */
-        omap_irq_base = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_512);
-        BUG_ON(!omap_irq_base);
-        omap_wakeupgen_init();
-        gic_init(0, 29, gic_dist_base_addr, omap_irq_base);
-}
 void gic_dist_disable(void)
 {
        if (gic_dist_base_addr)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index f7bb435bb543..6c074f37cdd2 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -4251,9 +4251,9 @@ void __init omap_hwmod_init(void)
                soc_ops.enable_module = _omap4_enable_module;
                soc_ops.disable_module = _omap4_disable_module;
                soc_ops.wait_target_ready = _omap4_wait_target_ready;
-                soc_ops.assert_hardreset = _omap4_assert_hardreset;
+                soc_ops.assert_hardreset = _am33xx_assert_hardreset;
-                soc_ops.deassert_hardreset = _omap4_deassert_hardreset;
+                soc_ops.deassert_hardreset = _am33xx_deassert_hardreset;
-                soc_ops.is_hardreset_asserted = _omap4_is_hardreset_asserted;
+                soc_ops.is_hardreset_asserted = _am33xx_is_hardreset_asserted;
                soc_ops.init_clkdm = _init_clkdm;
        } else if (soc_is_am33xx()) {
                soc_ops.enable_module = _am33xx_enable_module;
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 290213f2cbe3..1103aa0e0d29 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -2020,6 +2020,77 @@ static struct omap_hwmod omap54xx_wd_timer2_hwmod = {
        },
 };
+/*
+ * 'ocp2scp' class
+ * bridge to transform ocp interface protocol to scp (serial control port)
+ * protocol
+ */
+/* ocp2scp3 */
+static struct omap_hwmod omap54xx_ocp2scp3_hwmod;
+/* l4_cfg -> ocp2scp3 */
+static struct omap_hwmod_ocp_if omap54xx_l4_cfg__ocp2scp3 = {
+        .master         = &omap54xx_l4_cfg_hwmod,
+        .slave          = &omap54xx_ocp2scp3_hwmod,
+        .clk            = "l4_root_clk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+static struct omap_hwmod omap54xx_ocp2scp3_hwmod = {
+        .name           = "ocp2scp3",
+        .class          = &omap54xx_ocp2scp_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP54XX_CM_L3INIT_OCP2SCP3_CLKCTRL_OFFSET,
+                        .context_offs = OMAP54XX_RM_L3INIT_OCP2SCP3_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+};
+/*
+ * 'sata' class
+ * sata:  serial ata interface  gen2 compliant   ( 1 rx/ 1 tx)
+ */
+static struct omap_hwmod_class_sysconfig omap54xx_sata_sysc = {
+        .sysc_offs      = 0x0000,
+        .sysc_flags     = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
+                           MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+static struct omap_hwmod_class omap54xx_sata_hwmod_class = {
+        .name   = "sata",
+        .sysc   = &omap54xx_sata_sysc,
+};
+/* sata */
+static struct omap_hwmod omap54xx_sata_hwmod = {
+        .name           = "sata",
+        .class          = &omap54xx_sata_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .flags          = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
+        .main_clk       = "func_48m_fclk",
+        .mpu_rt_idx     = 1,
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP54XX_CM_L3INIT_SATA_CLKCTRL_OFFSET,
+                        .context_offs = OMAP54XX_RM_L3INIT_SATA_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+/* l4_cfg -> sata */
+static struct omap_hwmod_ocp_if omap54xx_l4_cfg__sata = {
+        .master         = &omap54xx_l4_cfg_hwmod,
+        .slave          = &omap54xx_sata_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
 /*
 * Interfaces
@@ -2765,6 +2836,8 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
        &omap54xx_l4_cfg__usb_tll_hs,
        &omap54xx_l4_cfg__usb_otg_ss,
        &omap54xx_l4_wkup__wd_timer2,
+        &omap54xx_l4_cfg__ocp2scp3,
+        &omap54xx_l4_cfg__sata,
        NULL,
 };
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index de2a34c423a7..01ca8086fb6c 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -462,6 +462,7 @@ IS_OMAP_TYPE(3430, 0x3430)
 #define DRA7XX_CLASS            0x07000000
 #define DRA752_REV_ES1_0        (DRA7XX_CLASS | (0x52 << 16) | (0x10 << 8))
 #define DRA752_REV_ES1_1        (DRA7XX_CLASS | (0x52 << 16) | (0x11 << 8))
+#define DRA722_REV_ES1_0        (DRA7XX_CLASS | (0x22 << 16) | (0x10 << 8))
 void omap2xxx_check_revision(void);
 void omap3xxx_check_revision(void);
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index e4e505f52ba0..042f693ef423 100644
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -1,4 +1,4 @@
-config ARCH_SIRF
+menuconfig ARCH_SIRF
        bool "CSR SiRF" if ARCH_MULTI_V7
        select ARCH_HAS_RESET_CONTROLLER
        select ARCH_REQUIRE_GPIOLIB
@@ -11,7 +11,7 @@ config ARCH_SIRF
 if ARCH_SIRF
-menu "CSR SiRF atlas6/primaII/Marco/Polo Specific Features"
+comment "CSR SiRF atlas6/primaII/Marco/Polo Specific Features"
 config ARCH_ATLAS6
        bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform"
@@ -37,8 +37,6 @@ config ARCH_MARCO
        help
          Support for CSR SiRFSoC ARM Cortex A9 Platform
-endmenu
 config SIRF_IRQ
        bool
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index fd2b99dceb89..ee5697ba05bc 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -1,4 +1,4 @@
-config ARCH_QCOM
+menuconfig ARCH_QCOM
        bool "Qualcomm Support" if ARCH_MULTI_V7
        select ARCH_REQUIRE_GPIOLIB
        select ARM_GIC
@@ -11,8 +11,6 @@ config ARCH_QCOM
 if ARCH_QCOM
-menu "Qualcomm SoC Selection"
 config ARCH_MSM8X60
        bool "Enable support for MSM8X60"
        select CLKSRC_QCOM
@@ -25,8 +23,6 @@ config ARCH_MSM8974
        bool "Enable support for MSM8974"
        select HAVE_ARM_ARCH_TIMER
-endmenu
 config QCOM_SCM
        bool
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 04284de7aca5..ad5316ae524e 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -117,7 +117,7 @@ config S3C24XX_SETUP_TS
          Compile in platform device definition for Samsung TouchScreen.
 config S3C24XX_DMA
-        bool "S3C2410 DMA support"
+        bool "S3C2410 DMA support (deprecated)"
        select S3C_DMA
        help
          S3C2410 DMA support. This is needed for drivers like sound which
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 3136d86b0d6e..26ca2427e53d 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -18,9 +18,9 @@ config CPU_S3C6410
          Enable S3C6410 CPU support
 config S3C64XX_PL080
-        bool "S3C64XX DMA using generic PL08x driver"
+        def_bool DMADEVICES
+        select ARM_AMBA
        select AMBA_PL08X
-        select SAMSUNG_DMADEV
 config S3C64XX_SETUP_SDHCI
        bool
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig
index bb2111b3751e..26003e23796d 100644
--- a/arch/arm/mach-s5p64x0/Kconfig
+++ b/arch/arm/mach-s5p64x0/Kconfig
@@ -9,16 +9,18 @@ if ARCH_S5P64X0
 config CPU_S5P6440
        bool
+        select ARM_AMBA
+        select PL330_DMA if DMADEVICES
        select S5P_SLEEP if PM
-        select SAMSUNG_DMADEV
        select SAMSUNG_WAKEMASK if PM
        help
          Enable S5P6440 CPU support
 config CPU_S5P6450
        bool
+        select ARM_AMBA
+        select PL330_DMA if DMADEVICES
        select S5P_SLEEP if PM
-        select SAMSUNG_DMADEV
        select SAMSUNG_WAKEMASK if PM
        help
          Enable S5P6450 CPU support
diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig
index 15170be97a74..c5e3a969b063 100644
--- a/arch/arm/mach-s5pc100/Kconfig
+++ b/arch/arm/mach-s5pc100/Kconfig
@@ -9,8 +9,9 @@ if ARCH_S5PC100
 config CPU_S5PC100
        bool
+        select ARM_AMBA
+        select PL330_DMA if DMADEVICES
        select S5P_EXT_INT
-        select SAMSUNG_DMADEV
        help
          Enable S5PC100 CPU support
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 8c3abe521757..f60f2862856d 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -11,10 +11,11 @@ if ARCH_S5PV210
 config CPU_S5PV210
        bool
+        select ARM_AMBA
+        select PL330_DMA if DMADEVICES
        select S5P_EXT_INT
        select S5P_PM if PM
        select S5P_SLEEP if PM
-        select SAMSUNG_DMADEV
        help
          Enable S5PV210 CPU support
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index f9874ba60cc8..108939f8d053 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -329,6 +329,11 @@ static struct mtd_partition collie_partitions[] = {
                .name           = "rootfs",
                .offset         = MTDPART_OFS_APPEND,
                .size           = 0x00e20000,
+        }, {
+                .name           = "bootblock",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = 0x00020000,
+                .mask_flags     = MTD_WRITEABLE
        }
 };
@@ -356,7 +361,7 @@ static void collie_flash_exit(void)
 }
 static struct flash_platform_data collie_flash_data = {
-        .map_name       = "jedec_probe",
+        .map_name       = "cfi_probe",
        .init           = collie_flash_init,
        .set_vpp        = collie_set_vpp,
        .exit           = collie_flash_exit,
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index dbd954e61aa7..798073057e51 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,7 +1,7 @@
 config ARCH_SHMOBILE
        bool
-config ARCH_SHMOBILE_MULTI
+menuconfig ARCH_SHMOBILE_MULTI
        bool "Renesas ARM SoCs" if ARCH_MULTI_V7
        depends on MMU
        select ARCH_SHMOBILE
@@ -15,7 +15,7 @@ config ARCH_SHMOBILE_MULTI
 if ARCH_SHMOBILE_MULTI
-comment "Renesas ARM SoCs System Type"
+#comment "Renesas ARM SoCs System Type"
 config ARCH_EMEV2
        bool "Emma Mobile EV2"
@@ -85,7 +85,6 @@ config ARCH_R8A73A4
        select CPU_V7
        select SH_CLK_CPG
        select RENESAS_IRQC
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select SYS_SUPPORTS_SH_CMT
        select SYS_SUPPORTS_SH_TMU
@@ -264,7 +263,6 @@ config MACH_KOELSCH
 config MACH_KZM9G
        bool "KZM-A9-GT board"
        depends on ARCH_SH73A0
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select ARCH_REQUIRE_GPIOLIB
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
index 0786249b2832..90df2022276a 100644
--- a/arch/arm/mach-spear/Kconfig
+++ b/arch/arm/mach-spear/Kconfig
@@ -14,7 +14,6 @@ if PLAT_SPEAR
 config ARCH_SPEAR13XX
        bool "ST SPEAr13xx"
        depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
-        select ARCH_HAS_CPUFREQ
        select ARM_GIC
        select GPIO_SPEAR_SPICS
        select HAVE_ARM_SCU if SMP
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index abf9ee9bbc3f..878e9ec97d0f 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -1,5 +1,5 @@
 menuconfig ARCH_STI
-        bool "STMicroelectronics Consumer Electronics SOCs with Device Trees" if ARCH_MULTI_V7
+        bool "STMicroelectronics Consumer Electronics SOCs" if ARCH_MULTI_V7
        select ARM_GIC
        select ARM_GLOBAL_TIMER
        select PINCTRL
@@ -11,8 +11,8 @@ menuconfig ARCH_STI
        select ARM_ERRATA_754322
        select ARM_ERRATA_764369 if SMP
        select ARM_ERRATA_775420
-        select PL310_ERRATA_753970 if CACHE_PL310
+        select PL310_ERRATA_753970 if CACHE_L2X0
-        select PL310_ERRATA_769419 if CACHE_PL310
+        select PL310_ERRATA_769419 if CACHE_L2X0
        help
          Include support for STiH41x SOCs like STiH415/416 using the device tree
          for discovery
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 3f9587bb51f6..b6085084e0ff 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -12,8 +12,81 @@
 #include <linux/clk-provider.h>
 #include <linux/clocksource.h>
+#include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+#include <linux/io.h>
+#include <linux/reboot.h>
 #include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/system_misc.h>
+#define SUN4I_WATCHDOG_CTRL_REG         0x00
+#define SUN4I_WATCHDOG_CTRL_RESTART             BIT(0)
+#define SUN4I_WATCHDOG_MODE_REG         0x04
+#define SUN4I_WATCHDOG_MODE_ENABLE              BIT(0)
+#define SUN4I_WATCHDOG_MODE_RESET_ENABLE        BIT(1)
+#define SUN6I_WATCHDOG1_IRQ_REG         0x00
+#define SUN6I_WATCHDOG1_CTRL_REG        0x10
+#define SUN6I_WATCHDOG1_CTRL_RESTART            BIT(0)
+#define SUN6I_WATCHDOG1_CONFIG_REG      0x14
+#define SUN6I_WATCHDOG1_CONFIG_RESTART          BIT(0)
+#define SUN6I_WATCHDOG1_CONFIG_IRQ              BIT(1)
+#define SUN6I_WATCHDOG1_MODE_REG        0x18
+#define SUN6I_WATCHDOG1_MODE_ENABLE             BIT(0)
+static void __iomem *wdt_base;
+static void sun4i_restart(enum reboot_mode mode, const char *cmd)
+{
+        if (!wdt_base)
+                return;
+        /* Enable timer and set reset bit in the watchdog */
+        writel(SUN4I_WATCHDOG_MODE_ENABLE | SUN4I_WATCHDOG_MODE_RESET_ENABLE,
+               wdt_base + SUN4I_WATCHDOG_MODE_REG);
+        /*
+         * Restart the watchdog. The default (and lowest) interval
+         * value for the watchdog is 0.5s.
+         */
+        writel(SUN4I_WATCHDOG_CTRL_RESTART, wdt_base + SUN4I_WATCHDOG_CTRL_REG);
+        while (1) {
+                mdelay(5);
+                writel(SUN4I_WATCHDOG_MODE_ENABLE | SUN4I_WATCHDOG_MODE_RESET_ENABLE,
+                       wdt_base + SUN4I_WATCHDOG_MODE_REG);
+        }
+}
+static struct of_device_id sunxi_restart_ids[] = {
+        { .compatible = "allwinner,sun4i-a10-wdt" },
+        { /*sentinel*/ }
+};
+static void sunxi_setup_restart(void)
+{
+        struct device_node *np;
+        np = of_find_matching_node(NULL, sunxi_restart_ids);
+        if (WARN(!np, "unable to setup watchdog restart"))
+                return;
+        wdt_base = of_iomap(np, 0);
+        WARN(!wdt_base, "failed to map watchdog base address");
+}
+static void __init sunxi_dt_init(void)
+{
+        sunxi_setup_restart();
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
 static const char * const sunxi_board_dt_compat[] = {
        "allwinner,sun4i-a10",
@@ -23,7 +96,9 @@ static const char * const sunxi_board_dt_compat[] = {
 };
 DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
+        .init_machine   = sunxi_dt_init,
        .dt_compat      = sunxi_board_dt_compat,
+        .restart        = sun4i_restart,
 MACHINE_END
 static const char * const sun6i_board_dt_compat[] = {
@@ -51,5 +126,7 @@ static const char * const sun7i_board_dt_compat[] = {
 };
 DT_MACHINE_START(SUN7I_DT, "Allwinner sun7i (A20) Family")
+        .init_machine   = sunxi_dt_init,
        .dt_compat      = sun7i_board_dt_compat,
+        .restart        = sun4i_restart,
 MACHINE_END
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index e16999e5b735..095399618ca5 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -1,6 +1,5 @@
-config ARCH_TEGRA
+menuconfig ARCH_TEGRA
        bool "NVIDIA Tegra" if ARCH_MULTI_V7
-        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
        select ARM_GIC
@@ -16,8 +15,7 @@ config ARCH_TEGRA
        help
          This enables support for NVIDIA Tegra based systems.
-menu "NVIDIA Tegra options"
+if ARCH_TEGRA
-        depends on ARCH_TEGRA
 config ARCH_TEGRA_2x_SOC
        bool "Enable support for Tegra20 family"
@@ -69,4 +67,4 @@ config TEGRA_AHB
          which controls AHB bus master arbitration and some
          performance parameters(priority, prefech size).
-endmenu
+endif
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index e3a96d7302e9..bc51a71394af 100644
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -1,4 +1,4 @@
-config ARCH_U300
+menuconfig ARCH_U300
        bool "ST-Ericsson U300 Series" if ARCH_MULTI_V5
        depends on MMU
        select ARCH_REQUIRE_GPIOLIB
@@ -16,8 +16,6 @@ config ARCH_U300
 if ARCH_U300
-menu "ST-Ericsson AB U300/U335 Platform"
 config MACH_U300
        depends on ARCH_U300
        bool "U300"
@@ -43,6 +41,4 @@ config MACH_U300_SPIDUMMY
                you don't need it. Selecting this will activate the
                SPI framework and ARM PL022 support.
-endmenu
 endif
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index b41a42da1505..699e8601dbf0 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -1,9 +1,8 @@
-config ARCH_U8500
+menuconfig ARCH_U8500
        bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7
        depends on MMU
        select AB8500_CORE
        select ABX500_CORE
-        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select ARM_ERRATA_754322
@@ -16,7 +15,7 @@ config ARCH_U8500
        select PINCTRL
        select PINCTRL_ABX500
        select PINCTRL_NOMADIK
-        select PL310_ERRATA_753970 if CACHE_PL310
+        select PL310_ERRATA_753970 if CACHE_L2X0
        help
          Support for ST-Ericsson's Ux500 architecture
@@ -34,8 +33,6 @@ config UX500_SOC_DB8500
        select REGULATOR
        select REGULATOR_DB8500_PRCMU
-menu "Ux500 target platform (boards)"
 config MACH_MOP500
        bool "U8500 Development platform, MOP500 versions"
        select I2C
@@ -68,8 +65,6 @@ config UX500_AUTO_PLATFORM
          a working kernel. If everything else is disabled, this
          automatically enables MACH_MOP500.
-endmenu
 config UX500_DEBUG_UART
        int "Ux500 UART to use for low-level debug"
        default 2
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 90249cfc37b3..d8b9330f896a 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -1,4 +1,4 @@
-config ARCH_VEXPRESS
+menuconfig ARCH_VEXPRESS
        bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_SUPPORTS_BIG_ENDIAN
@@ -37,14 +37,13 @@ config ARCH_VEXPRESS
          platforms. The traditional (ATAGs) boot method is not usable on
          these boards with this option.
-menu "Versatile Express platform type"
+if ARCH_VEXPRESS
-        depends on ARCH_VEXPRESS
 config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
        bool "Enable A5 and A9 only errata work-arounds"
        default y
        select ARM_ERRATA_720789
-        select PL310_ERRATA_753970 if CACHE_PL310
+        select PL310_ERRATA_753970 if CACHE_L2X0
        help
          Provides common dependencies for Versatile Express platforms
          based on Cortex-A5 and Cortex-A9 processors. In order to
@@ -65,7 +64,6 @@ config ARCH_VEXPRESS_DCSCB
 config ARCH_VEXPRESS_SPC
        bool "Versatile Express Serial Power Controller (SPC)"
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select PM_OPP
        help
@@ -83,4 +81,4 @@ config ARCH_VEXPRESS_TC2_PM
          Support for CPU and cluster power management on Versatile Express
          with a TC2 (A15x2 A7x3) big.LITTLE core tile.
-endmenu
+endif
diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
index 08f56a41cb55..aaaa24fe4d71 100644
--- a/arch/arm/mach-vt8500/Kconfig
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -1,6 +1,5 @@
 config ARCH_VT8500
        bool
-        select ARCH_HAS_CPUFREQ
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select VT8500_TIMER
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 573e0db1d0f0..0c164f81e72d 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -1,6 +1,5 @@
 config ARCH_ZYNQ
        bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
-        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select ARCH_SUPPORTS_BIG_ENDIAN
        select ARM_AMBA
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index eda0dd0ab97b..c348eaee7ee2 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -889,9 +889,10 @@ config CACHE_L2X0
        help
          This option enables the L2x0 PrimeCell.
+if CACHE_L2X0
 config CACHE_PL310
        bool
-        depends on CACHE_L2X0
        default y if CPU_V7 && !(CPU_V6 || CPU_V6K)
        help
          This option enables optimisations for the PL310 cache
@@ -899,7 +900,6 @@ config CACHE_PL310
 config PL310_ERRATA_588369
        bool "PL310 errata: Clean & Invalidate maintenance operations do not invalidate clean lines"
-        depends on CACHE_L2X0
        help
           The PL310 L2 cache controller implements three types of Clean &
           Invalidate maintenance operations: by Physical Address
@@ -912,7 +912,6 @@ config PL310_ERRATA_588369
 config PL310_ERRATA_727915
        bool "PL310 errata: Background Clean & Invalidate by Way operation can cause data corruption"
-        depends on CACHE_L2X0
        help
          PL310 implements the Clean & Invalidate by Way L2 cache maintenance
          operation (offset 0x7FC). This operation runs in background so that
@@ -923,7 +922,6 @@ config PL310_ERRATA_727915
 config PL310_ERRATA_753970
        bool "PL310 errata: cache sync operation may be faulty"
-        depends on CACHE_PL310
        help
          This option enables the workaround for the 753970 PL310 (r3p0) erratum.
@@ -938,7 +936,6 @@ config PL310_ERRATA_753970
 config PL310_ERRATA_769419
        bool "PL310 errata: no automatic Store Buffer drain"
-        depends on CACHE_L2X0
        help
          On revisions of the PL310 prior to r3p2, the Store Buffer does
          not automatically drain. This can cause normal, non-cacheable
@@ -948,6 +945,8 @@ config PL310_ERRATA_769419
          on systems with an outer cache, the store buffer is drained
          explicitly.
+endif
 config CACHE_TAUROS2
        bool "Enable the Tauros2 L2 cache controller"
        depends on (ARCH_DOVE || ARCH_MMP || CPU_PJ4)
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index efc5cabf70e0..076172b69422 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -1069,6 +1069,33 @@ static const struct l2c_init_data of_l2c310_data __initconst = {
 };
 /*
+ * This is a variant of the of_l2c310_data with .sync set to
+ * NULL. Outer sync operations are not needed when the system is I/O
+ * coherent, and potentially harmful in certain situations (PCIe/PL310
+ * deadlock on Armada 375/38x due to hardware I/O coherency). The
+ * other operations are kept because they are infrequent (therefore do
+ * not cause the deadlock in practice) and needed for secondary CPU
+ * boot and other power management activities.
+ */
+static const struct l2c_init_data of_l2c310_coherent_data __initconst = {
+        .type = "L2C-310 Coherent",
+        .way_size_0 = SZ_8K,
+        .num_lock = 8,
+        .of_parse = l2c310_of_parse,
+        .enable = l2c310_enable,
+        .fixup = l2c310_fixup,
+        .save  = l2c310_save,
+        .outer_cache = {
+                .inv_range   = l2c210_inv_range,
+                .clean_range = l2c210_clean_range,
+                .flush_range = l2c210_flush_range,
+                .flush_all   = l2c210_flush_all,
+                .disable     = l2c310_disable,
+                .resume      = l2c310_resume,
+        },
+};
+/*
 * Note that the end addresses passed to Linux primitives are
 * noninclusive, while the hardware cache range operations use
 * inclusive start and end addresses.
@@ -1487,6 +1514,10 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
        data = of_match_node(l2x0_ids, np)->data;
+        if (of_device_is_compatible(np, "arm,pl310-cache") &&
+            of_property_read_bool(np, "arm,io-coherent"))
+                data = &of_l2c310_coherent_data;
        old_aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
        if (old_aux != ((old_aux & aux_mask) | aux_val)) {
                pr_warn("L2C: platform modifies aux control register: 0x%08x -> 0x%08x\n",
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
index da1874f9f8cf..a014dfacd5ca 100644
--- a/arch/arm/mm/nommu.c
+++ b/arch/arm/mm/nommu.c
@@ -300,6 +300,7 @@ void __init sanity_check_meminfo(void)
        sanity_check_meminfo_mpu();
        end = memblock_end_of_DRAM();
        high_memory = __va(end - 1) + 1;
+        memblock_set_current_limit(end);
 }
 /*
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index 97448c3acf38..ba0d58e1a2a2 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -502,6 +502,7 @@ __\name\()_proc_info:
        .long   \cpu_val
        .long   \cpu_mask
        .long   PMD_TYPE_SECT | \
+                PMD_SECT_CACHEABLE | \
                PMD_BIT4 | \
                PMD_SECT_AP_WRITE | \
                PMD_SECT_AP_READ
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 243dfcb2ca0e..301b892d97d9 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -35,27 +35,15 @@ config SAMSUNG_PM
          Base platform power management code for samsung code
 if PLAT_SAMSUNG
+menu "Samsung Common options"
 # boot configurations
 comment "Boot options"
-config S3C_BOOT_ERROR_RESET
-        bool "S3C Reboot on decompression error"
-        help
-          Say y here to use the watchdog to reset the system if the
-          kernel decompressor detects an error during decompression.
-config S3C_BOOT_UART_FORCE_FIFO
-       bool "Force UART FIFO on during boot process"
-       default y
-       help
-         Say Y here to force the UART FIFOs on during the kernel
-         uncompressor
 config S3C_LOWLEVEL_UART_PORT
        int "S3C UART to use for low-level messages"
+        depends on ARCH_S3C64XX
        default 0
        help
          Choice of which UART port to use for the low-level messages,
@@ -407,17 +395,16 @@ config SAMSUNG_PM_GPIO
          Include legacy GPIO power management code for platforms not using
          pinctrl-samsung driver.
-endif
 config SAMSUNG_DMADEV
-        bool
+        bool "Use legacy Samsung DMA abstraction"
-        select ARM_AMBA
+        depends on CPU_S5PV210 || CPU_S5PC100 || ARCH_S5P64X0 || ARCH_S3C64XX
        select DMADEVICES
-        select PL330_DMA if (ARCH_EXYNOS5 || ARCH_EXYNOS4 || CPU_S5PV210 || CPU_S5PC100 || \
+        default y
-                                        CPU_S5P6450 || CPU_S5P6440)
        help
          Use DMA device engine for PL330 DMAC.
+endif
 config S5P_DEV_MFC
        bool
        help
@@ -503,4 +490,5 @@ config DEBUG_S3C_UART
        default "2" if DEBUG_S3C_UART2
        default "3" if DEBUG_S3C_UART3
+endmenu
 endif
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 7295419165e1..a474de346be6 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1,8 +1,9 @@
 config ARM64
        def_bool y
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
-        select ARCH_USE_CMPXCHG_LOCKREF
+        select ARCH_HAS_OPP
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+        select ARCH_USE_CMPXCHG_LOCKREF
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
        select ARCH_WANT_FRAME_POINTERS
diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts
index 1247ca1200b1..6541962f5d70 100644
--- a/arch/arm64/boot/dts/apm-mustang.dts
+++ b/arch/arm64/boot/dts/apm-mustang.dts
@@ -24,3 +24,7 @@
                reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */
        };
 };
+&serial0 {
+        status = "ok";
+};
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
index c5f0a47a1375..40aa96ce13c4 100644
--- a/arch/arm64/boot/dts/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
@@ -273,8 +273,9 @@
                };
                serial0: serial@1c020000 {
+                        status = "disabled";
                        device_type = "serial";
-                        compatible = "ns16550";
+                        compatible = "ns16550a";
                        reg = <0 0x1c020000 0x0 0x1000>;
                        reg-shift = <2>;
                        clock-frequency = <10000000>; /* Updated by bootloader */
@@ -282,6 +283,39 @@
                        interrupts = <0x0 0x4c 0x4>;
                };
+                serial1: serial@1c021000 {
+                        status = "disabled";
+                        device_type = "serial";
+                        compatible = "ns16550a";
+                        reg = <0 0x1c021000 0x0 0x1000>;
+                        reg-shift = <2>;
+                        clock-frequency = <10000000>; /* Updated by bootloader */
+                        interrupt-parent = <&gic>;
+                        interrupts = <0x0 0x4d 0x4>;
+                };
+                serial2: serial@1c022000 {
+                        status = "disabled";
+                        device_type = "serial";
+                        compatible = "ns16550a";
+                        reg = <0 0x1c022000 0x0 0x1000>;
+                        reg-shift = <2>;
+                        clock-frequency = <10000000>; /* Updated by bootloader */
+                        interrupt-parent = <&gic>;
+                        interrupts = <0x0 0x4e 0x4>;
+                };
+                serial3: serial@1c023000 {
+                        status = "disabled";
+                        device_type = "serial";
+                        compatible = "ns16550a";
+                        reg = <0 0x1c023000 0x0 0x1000>;
+                        reg-shift = <2>;
+                        clock-frequency = <10000000>; /* Updated by bootloader */
+                        interrupt-parent = <&gic>;
+                        interrupts = <0x0 0x4f 0x4>;
+                };
                phy1: phy@1f21a000 {
                        compatible = "apm,xgene-phy";
                        reg = <0x0 0x1f21a000 0x0 0x100>;
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 157e1d8d9a47..3421f316f5dc 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -6,9 +6,18 @@ CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_CGROUP_HUGETLB=y
 # CONFIG_UTS_NS is not set
 # CONFIG_IPC_NS is not set
 # CONFIG_PID_NS is not set
@@ -27,6 +36,7 @@ CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
 CONFIG_SMP=y
 CONFIG_PREEMPT=y
+CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CMA=y
 CONFIG_CMDLINE="console=ttyAMA0"
@@ -45,6 +55,7 @@ CONFIG_IP_PNP_BOOTP=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DMA_CMA=y
+CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
@@ -53,6 +64,7 @@ CONFIG_ATA=y
 CONFIG_PATA_PLATFORM=y
 CONFIG_PATA_OF_PLATFORM=y
 CONFIG_NETDEVICES=y
+CONFIG_TUN=y
 CONFIG_SMC91X=y
 CONFIG_SMSC911X=y
 # CONFIG_WLAN is not set
@@ -85,6 +97,8 @@ CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 # CONFIG_EXT3_FS_XATTR is not set
 CONFIG_EXT4_FS=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=y
 CONFIG_VFAT_FS=y
@@ -104,6 +118,7 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_FTRACE is not set
+CONFIG_SECURITY=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
diff --git a/arch/arm64/crypto/ghash-ce-core.S b/arch/arm64/crypto/ghash-ce-core.S
index b9e6eaf41c9b..dc457015884e 100644
--- a/arch/arm64/crypto/ghash-ce-core.S
+++ b/arch/arm64/crypto/ghash-ce-core.S
@@ -3,14 +3,6 @@
 *
 * Copyright (C) 2014 Linaro Ltd. <ard.biesheuvel@linaro.org>
 *
- * Based on arch/x86/crypto/ghash-pmullni-intel_asm.S
- *
- * Copyright (c) 2009 Intel Corp.
- *   Author: Huang Ying <ying.huang@intel.com>
- *           Vinodh Gopal
- *           Erdinc Ozturk
- *           Deniz Karakoyunlu
- *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 as published
 * by the Free Software Foundation.
@@ -19,13 +11,15 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-        DATA    .req    v0
+        SHASH   .req    v0
-        SHASH   .req    v1
+        SHASH2  .req    v1
-        IN1     .req    v2
        T1      .req    v2
        T2      .req    v3
-        T3      .req    v4
+        MASK    .req    v4
-        VZR     .req    v5
+        XL      .req    v5
+        XM      .req    v6
+        XH      .req    v7
+        IN1     .req    v7
        .text
        .arch           armv8-a+crypto
@@ -35,61 +29,51 @@
         *                         struct ghash_key const *k, const char *head)
         */
 ENTRY(pmull_ghash_update)
-        ld1             {DATA.16b}, [x1]
        ld1             {SHASH.16b}, [x3]
-        eor             VZR.16b, VZR.16b, VZR.16b
+        ld1             {XL.16b}, [x1]
+        movi            MASK.16b, #0xe1
+        ext             SHASH2.16b, SHASH.16b, SHASH.16b, #8
+        shl             MASK.2d, MASK.2d, #57
+        eor             SHASH2.16b, SHASH2.16b, SHASH.16b
        /* do the head block first, if supplied */
        cbz             x4, 0f
-        ld1             {IN1.2d}, [x4]
+        ld1             {T1.2d}, [x4]
        b               1f
-0:      ld1             {IN1.2d}, [x2], #16
+0:      ld1             {T1.2d}, [x2], #16
        sub             w0, w0, #1
-1:      ext             IN1.16b, IN1.16b, IN1.16b, #8
-CPU_LE( rev64           IN1.16b, IN1.16b        )
-        eor             DATA.16b, DATA.16b, IN1.16b
-        /* multiply DATA by SHASH in GF(2^128) */
+1:      /* multiply XL by SHASH in GF(2^128) */
-        ext             T2.16b, DATA.16b, DATA.16b, #8
+CPU_LE( rev64           T1.16b, T1.16b  )
-        ext             T3.16b, SHASH.16b, SHASH.16b, #8
-        eor             T2.16b, T2.16b, DATA.16b
-        eor             T3.16b, T3.16b, SHASH.16b
-        pmull2          T1.1q, SHASH.2d, DATA.2d        // a1 * b1
+        ext             T2.16b, XL.16b, XL.16b, #8
-        pmull           DATA.1q, SHASH.1d, DATA.1d      // a0 * b0
+        ext             IN1.16b, T1.16b, T1.16b, #8
-        pmull           T2.1q, T2.1d, T3.1d             // (a1 + a0)(b1 + b0)
+        eor             T1.16b, T1.16b, T2.16b
-        eor             T2.16b, T2.16b, T1.16b          // (a0 * b1) + (a1 * b0)
+        eor             XL.16b, XL.16b, IN1.16b
-        eor             T2.16b, T2.16b, DATA.16b
-        ext             T3.16b, VZR.16b, T2.16b, #8
+        pmull2          XH.1q, SHASH.2d, XL.2d          // a1 * b1
-        ext             T2.16b, T2.16b, VZR.16b, #8
+        eor             T1.16b, T1.16b, XL.16b
-        eor             DATA.16b, DATA.16b, T3.16b
+        pmull           XL.1q, SHASH.1d, XL.1d          // a0 * b0
-        eor             T1.16b, T1.16b, T2.16b  // <T1:DATA> is result of
+        pmull           XM.1q, SHASH2.1d, T1.1d         // (a1 + a0)(b1 + b0)
-                                                // carry-less multiplication
-        /* first phase of the reduction */
+        ext             T1.16b, XL.16b, XH.16b, #8
-        shl             T3.2d, DATA.2d, #1
+        eor             T2.16b, XL.16b, XH.16b
-        eor             T3.16b, T3.16b, DATA.16b
+        eor             XM.16b, XM.16b, T1.16b
-        shl             T3.2d, T3.2d, #5
+        eor             XM.16b, XM.16b, T2.16b
-        eor             T3.16b, T3.16b, DATA.16b
+        pmull           T2.1q, XL.1d, MASK.1d
-        shl             T3.2d, T3.2d, #57
-        ext             T2.16b, VZR.16b, T3.16b, #8
-        ext             T3.16b, T3.16b, VZR.16b, #8
-        eor             DATA.16b, DATA.16b, T2.16b
-        eor             T1.16b, T1.16b, T3.16b
-        /* second phase of the reduction */
+        mov             XH.d[0], XM.d[1]
-        ushr            T2.2d, DATA.2d, #5
+        mov             XM.d[1], XL.d[0]
-        eor             T2.16b, T2.16b, DATA.16b
-        ushr            T2.2d, T2.2d, #1
+        eor             XL.16b, XM.16b, T2.16b
-        eor             T2.16b, T2.16b, DATA.16b
+        ext             T2.16b, XL.16b, XL.16b, #8
-        ushr            T2.2d, T2.2d, #1
+        pmull           XL.1q, XL.1d, MASK.1d
-        eor             T1.16b, T1.16b, T2.16b
+        eor             T2.16b, T2.16b, XH.16b
-        eor             DATA.16b, DATA.16b, T1.16b
+        eor             XL.16b, XL.16b, T2.16b
        cbnz            w0, 0b
-        st1             {DATA.16b}, [x1]
+        st1             {XL.16b}, [x1]
        ret
 ENDPROC(pmull_ghash_update)
diff --git a/arch/arm64/crypto/ghash-ce-glue.c b/arch/arm64/crypto/ghash-ce-glue.c
index b92baf3f68c7..833ec1e3f3e9 100644
--- a/arch/arm64/crypto/ghash-ce-glue.c
+++ b/arch/arm64/crypto/ghash-ce-glue.c
@@ -67,11 +67,12 @@ static int ghash_update(struct shash_desc *desc, const u8 *src,
                blocks = len / GHASH_BLOCK_SIZE;
                len %= GHASH_BLOCK_SIZE;
-                kernel_neon_begin_partial(6);
+                kernel_neon_begin_partial(8);
                pmull_ghash_update(blocks, ctx->digest, src, key,
                                   partial ? ctx->buf : NULL);
                kernel_neon_end();
                src += blocks * GHASH_BLOCK_SIZE;
+                partial = 0;
        }
        if (len)
                memcpy(ctx->buf + partial, src, len);
@@ -88,7 +89,7 @@ static int ghash_final(struct shash_desc *desc, u8 *dst)
                memset(ctx->buf + partial, 0, GHASH_BLOCK_SIZE - partial);
-                kernel_neon_begin_partial(6);
+                kernel_neon_begin_partial(8);
                pmull_ghash_update(1, ctx->digest, ctx->buf, key, NULL);
                kernel_neon_end();
        }
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index 42c7eecd2bb6..0b3fcf86e6ba 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -30,7 +30,6 @@ generic-y += msgbuf.h
 generic-y += mutex.h
 generic-y += pci.h
 generic-y += poll.h
-generic-y += posix_types.h
 generic-y += preempt.h
 generic-y += resource.h
 generic-y += rwsem.h
diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h
index 3a4572ec3273..dc82e52acdb3 100644
--- a/arch/arm64/include/asm/dma-mapping.h
+++ b/arch/arm64/include/asm/dma-mapping.h
@@ -26,8 +26,6 @@
 #include <xen/xen.h>
 #include <asm/xen/hypervisor.h>
-#define ARCH_HAS_DMA_GET_REQUIRED_MASK
 #define DMA_ERROR_CODE  (~(dma_addr_t)0)
 extern struct dma_map_ops *dma_ops;
 extern struct dma_map_ops coherent_swiotlb_dma_ops;
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index 598cc384fc1c..e0ccceb317d9 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -246,7 +246,7 @@ static inline pmd_t pte_pmd(pte_t pte)
 #define pmd_mkwrite(pmd)        pte_pmd(pte_mkwrite(pmd_pte(pmd)))
 #define pmd_mkdirty(pmd)        pte_pmd(pte_mkdirty(pmd_pte(pmd)))
 #define pmd_mkyoung(pmd)        pte_pmd(pte_mkyoung(pmd_pte(pmd)))
-#define pmd_mknotpresent(pmd)   (__pmd(pmd_val(pmd) &= ~PMD_TYPE_MASK))
+#define pmd_mknotpresent(pmd)   (__pmd(pmd_val(pmd) & ~PMD_TYPE_MASK))
 #define __HAVE_ARCH_PMD_WRITE
 #define pmd_write(pmd)          pte_write(pmd_pte(pmd))
@@ -292,7 +292,7 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
 #define pmd_sect(pmd)           ((pmd_val(pmd) & PMD_TYPE_MASK) == \
                                 PMD_TYPE_SECT)
-#ifdef ARM64_64K_PAGES
+#ifdef CONFIG_ARM64_64K_PAGES
 #define pud_sect(pud)           (0)
 #else
 #define pud_sect(pud)           ((pud_val(pud) & PUD_TYPE_MASK) == \
diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h
index a429b5940be2..501000fadb6f 100644
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@ -21,6 +21,10 @@
 #include <uapi/asm/ptrace.h>
+/* Current Exception Level values, as contained in CurrentEL */
+#define CurrentEL_EL1           (1 << 2)
+#define CurrentEL_EL2           (2 << 2)
 /* AArch32-specific ptrace requests */
 #define COMPAT_PTRACE_GETREGS           12
 #define COMPAT_PTRACE_SETREGS           13
diff --git a/arch/arm64/include/uapi/asm/posix_types.h b/arch/arm64/include/uapi/asm/posix_types.h
new file mode 100644
index 000000000000..7985ff60ca3f
--- /dev/null
+++ b/arch/arm64/include/uapi/asm/posix_types.h
@@ -0,0 +1,10 @@
+#ifndef __ASM_POSIX_TYPES_H
+#define __ASM_POSIX_TYPES_H
+typedef unsigned short __kernel_old_uid_t;
+typedef unsigned short __kernel_old_gid_t;
+#define __kernel_old_uid_t __kernel_old_uid_t
+#include <asm-generic/posix_types.h>
+#endif /*  __ASM_POSIX_TYPES_H */
diff --git a/arch/arm64/include/uapi/asm/sigcontext.h b/arch/arm64/include/uapi/asm/sigcontext.h
index b72cf405b3fe..ee469be1ae1d 100644
--- a/arch/arm64/include/uapi/asm/sigcontext.h
+++ b/arch/arm64/include/uapi/asm/sigcontext.h
@@ -58,7 +58,7 @@ struct fpsimd_context {
 struct esr_context {
        struct _aarch64_ctx head;
-        u64 esr;
+        __u64 esr;
 };
 #endif /* _UAPI__ASM_SIGCONTEXT_H */
diff --git a/arch/arm64/kernel/efi-entry.S b/arch/arm64/kernel/efi-entry.S
index 66716c9b9e5f..619b1dd7bcde 100644
--- a/arch/arm64/kernel/efi-entry.S
+++ b/arch/arm64/kernel/efi-entry.S
@@ -78,8 +78,7 @@ ENTRY(efi_stub_entry)
        /* Turn off Dcache and MMU */
        mrs     x0, CurrentEL
-        cmp     x0, #PSR_MODE_EL2t
+        cmp     x0, #CurrentEL_EL2
-        ccmp    x0, #PSR_MODE_EL2h, #0x4, ne
        b.ne    1f
        mrs     x0, sctlr_el2
        bic     x0, x0, #1 << 0 // clear SCTLR.M
diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S
index b051871f2965..aa5f9fcbf9ee 100644
--- a/arch/arm64/kernel/entry-ftrace.S
+++ b/arch/arm64/kernel/entry-ftrace.S
@@ -205,7 +205,7 @@ ENDPROC(ftrace_graph_caller)
 *
 * Run ftrace_return_to_handler() before going back to parent.
 * @fp is checked against the value passed by ftrace_graph_caller()
- * only when CONFIG_FUNCTION_GRAPH_FP_TEST is enabled.
+ * only when CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST is enabled.
 */
 ENTRY(return_to_handler)
        str     x0, [sp, #-16]!
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index bf017f4ffb4f..9ce04ba6bcb0 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -279,7 +279,6 @@ el1_sp_pc:
         */
        mrs     x0, far_el1
        enable_dbg
-        mov     x1, x25
        mov     x2, sp
        b       do_sp_pc_abort
 el1_undef:
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index a96d3a6a63f6..a2c1195abb7f 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -270,8 +270,7 @@ ENDPROC(stext)
 */
 ENTRY(el2_setup)
        mrs     x0, CurrentEL
-        cmp     x0, #PSR_MODE_EL2t
+        cmp     x0, #CurrentEL_EL2
-        ccmp    x0, #PSR_MODE_EL2h, #0x4, ne
        b.ne    1f
        mrs     x0, sctlr_el2
 CPU_BE( orr     x0, x0, #(1 << 25)      )       // Set the EE bit for EL2
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
index 3e926b9c0641..9fde010c945f 100644
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -655,11 +655,16 @@ static int compat_gpr_get(struct task_struct *target,
                        reg = task_pt_regs(target)->regs[idx];
                }
-                ret = copy_to_user(ubuf, &reg, sizeof(reg));
+                if (kbuf) {
-                if (ret)
+                        memcpy(kbuf, &reg, sizeof(reg));
-                        break;
+                        kbuf += sizeof(reg);
+                } else {
-                ubuf += sizeof(reg);
+                        ret = copy_to_user(ubuf, &reg, sizeof(reg));
+                        if (ret)
+                                break;
+                        ubuf += sizeof(reg);
+                }
        }
        return ret;
@@ -689,11 +694,16 @@ static int compat_gpr_set(struct task_struct *target,
                unsigned int idx = start + i;
                compat_ulong_t reg;
-                ret = copy_from_user(&reg, ubuf, sizeof(reg));
+                if (kbuf) {
-                if (ret)
+                        memcpy(&reg, kbuf, sizeof(reg));
-                        return ret;
+                        kbuf += sizeof(reg);
+                } else {
+                        ret = copy_from_user(&reg, ubuf, sizeof(reg));
+                        if (ret)
+                                return ret;
-                ubuf += sizeof(reg);
+                        ubuf += sizeof(reg);
+                }
                switch (idx) {
                case 15:
@@ -827,6 +837,7 @@ static int compat_ptrace_write_user(struct task_struct *tsk, compat_ulong_t off,
                                    compat_ulong_t val)
 {
        int ret;
+        mm_segment_t old_fs = get_fs();
        if (off & 3 || off >= COMPAT_USER_SZ)
                return -EIO;
@@ -834,10 +845,13 @@ static int compat_ptrace_write_user(struct task_struct *tsk, compat_ulong_t off,
        if (off >= sizeof(compat_elf_gregset_t))
                return 0;
+        set_fs(KERNEL_DS);
        ret = copy_regset_from_user(tsk, &user_aarch32_view,
                                    REGSET_COMPAT_GPR, off,
                                    sizeof(compat_ulong_t),
                                    &val);
+        set_fs(old_fs);
        return ret;
 }
diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c
index e4193e3adc7f..0d64089d28b5 100644
--- a/arch/arm64/mm/flush.c
+++ b/arch/arm64/mm/flush.c
@@ -79,7 +79,8 @@ void __sync_icache_dcache(pte_t pte, unsigned long addr)
                return;
        if (!test_and_set_bit(PG_dcache_clean, &page->flags)) {
-                __flush_dcache_area(page_address(page), PAGE_SIZE);
+                __flush_dcache_area(page_address(page),
+                                PAGE_SIZE << compound_order(page));
                __flush_icache_all();
        } else if (icache_is_aivivt()) {
                __flush_icache_all();
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 091d428d64ac..f43db8a69262 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -71,7 +71,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
        /* 4GB maximum for 32-bit only capable devices */
        if (IS_ENABLED(CONFIG_ZONE_DMA)) {
                unsigned long max_dma_phys =
-                        (unsigned long)dma_to_phys(NULL, DMA_BIT_MASK(32) + 1);
+                        (unsigned long)(dma_to_phys(NULL, DMA_BIT_MASK(32)) + 1);
                max_dma = max(min, min(max, max_dma_phys >> PAGE_SHIFT));
                zone_size[ZONE_DMA] = max_dma - min;
        }
@@ -126,6 +126,8 @@ static void arm64_memory_present(void)
 void __init arm64_memblock_init(void)
 {
+        phys_addr_t dma_phys_limit = 0;
        /* Register the kernel text, kernel data and initrd with memblock */
        memblock_reserve(__pa(_text), _end - _text);
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -141,7 +143,11 @@ void __init arm64_memblock_init(void)
        memblock_reserve(__pa(idmap_pg_dir), IDMAP_DIR_SIZE);
        early_init_fdt_scan_reserved_mem();
-        dma_contiguous_reserve(0);
+        /* 4GB maximum for 32-bit only capable devices */
+        if (IS_ENABLED(CONFIG_ZONE_DMA))
+                dma_phys_limit = dma_to_phys(NULL, DMA_BIT_MASK(32)) + 1;
+        dma_contiguous_reserve(dma_phys_limit);
        memblock_allow_resize();
        memblock_dump_all();
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 1a871b78e570..344387a55406 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -242,7 +242,7 @@ struct ioc {
        struct pci_dev  *sac_only_dev;
 };
-static struct ioc *ioc_list;
+static struct ioc *ioc_list, *ioc_found;
 static int reserve_sba_gart = 1;
 static SBA_INLINE void sba_mark_invalid(struct ioc *, dma_addr_t, size_t);
@@ -1809,20 +1809,13 @@ static struct ioc_iommu ioc_iommu_info[] __initdata = {
        { SX2000_IOC_ID, "sx2000", NULL },
 };
-static struct ioc *
+static void ioc_init(unsigned long hpa, struct ioc *ioc)
-ioc_init(unsigned long hpa, void *handle)
 {
-        struct ioc *ioc;
        struct ioc_iommu *info;
-        ioc = kzalloc(sizeof(*ioc), GFP_KERNEL);
-        if (!ioc)
-                return NULL;
        ioc->next = ioc_list;
        ioc_list = ioc;
-        ioc->handle = handle;
        ioc->ioc_hpa = ioremap(hpa, 0x1000);
        ioc->func_id = READ_REG(ioc->ioc_hpa + IOC_FUNC_ID);
@@ -1863,8 +1856,6 @@ ioc_init(unsigned long hpa, void *handle)
                "%s %d.%d HPA 0x%lx IOVA space %dMb at 0x%lx\n",
                ioc->name, (ioc->rev >> 4) & 0xF, ioc->rev & 0xF,
                hpa, ioc->iov_size >> 20, ioc->ibase);
-        return ioc;
 }
@@ -2031,22 +2022,21 @@ sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)
 #endif
 }
-static int
+static void acpi_sba_ioc_add(struct ioc *ioc)
-acpi_sba_ioc_add(struct acpi_device *device,
-                 const struct acpi_device_id *not_used)
 {
-        struct ioc *ioc;
+        acpi_handle handle = ioc->handle;
        acpi_status status;
        u64 hpa, length;
        struct acpi_device_info *adi;
-        status = hp_acpi_csr_space(device->handle, &hpa, &length);
+        ioc_found = ioc->next;
+        status = hp_acpi_csr_space(handle, &hpa, &length);
        if (ACPI_FAILURE(status))
-                return 1;
+                goto err;
-        status = acpi_get_object_info(device->handle, &adi);
+        status = acpi_get_object_info(handle, &adi);
        if (ACPI_FAILURE(status))
-                return 1;
+                goto err;
        /*
         * For HWP0001, only SBA appears in ACPI namespace.  It encloses the PCI
@@ -2067,13 +2057,13 @@ acpi_sba_ioc_add(struct acpi_device *device,
        if (!iovp_shift)
                iovp_shift = 12;
-        ioc = ioc_init(hpa, device->handle);
+        ioc_init(hpa, ioc);
-        if (!ioc)
-                return 1;
        /* setup NUMA node association */
-        sba_map_ioc_to_node(ioc, device->handle);
+        sba_map_ioc_to_node(ioc, handle);
-        return 0;
+        return;
+ err:
+        kfree(ioc);
 }
 static const struct acpi_device_id hp_ioc_iommu_device_ids[] = {
@@ -2081,9 +2071,26 @@ static const struct acpi_device_id hp_ioc_iommu_device_ids[] = {
        {"HWP0004", 0},
        {"", 0},
 };
+static int acpi_sba_ioc_attach(struct acpi_device *device,
+                               const struct acpi_device_id *not_used)
+{
+        struct ioc *ioc;
+        ioc = kzalloc(sizeof(*ioc), GFP_KERNEL);
+        if (!ioc)
+                return -ENOMEM;
+        ioc->next = ioc_found;
+        ioc_found = ioc;
+        ioc->handle = device->handle;
+        return 1;
+}
 static struct acpi_scan_handler acpi_sba_ioc_handler = {
        .ids    = hp_ioc_iommu_device_ids,
-        .attach = acpi_sba_ioc_add,
+        .attach = acpi_sba_ioc_attach,
 };
 static int __init acpi_sba_ioc_init_acpi(void)
@@ -2118,9 +2125,12 @@ sba_init(void)
 #endif
        /*
-         * ioc_list should be populated by the acpi_sba_ioc_handler's .attach()
+         * ioc_found should be populated by the acpi_sba_ioc_handler's .attach()
         * routine, but that only happens if acpi_scan_init() has already run.
         */
+        while (ioc_found)
+                acpi_sba_ioc_add(ioc_found);
        if (!ioc_list) {
 #ifdef CONFIG_IA64_GENERIC
                /*
diff --git a/arch/ia64/include/uapi/asm/fcntl.h b/arch/ia64/include/uapi/asm/fcntl.h
index 1dd275dc8f65..7b485876cad4 100644
--- a/arch/ia64/include/uapi/asm/fcntl.h
+++ b/arch/ia64/include/uapi/asm/fcntl.h
@@ -8,6 +8,7 @@
 #define force_o_largefile()     \
                (personality(current->personality) != PER_LINUX32)
+#include <linux/personality.h>
 #include <asm-generic/fcntl.h>
 #endif /* _ASM_IA64_FCNTL_H */
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7a469acee33c..4e238e6e661c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -269,6 +269,7 @@ config LANTIQ
 config LASAT
        bool "LASAT Networks platforms"
        select CEVT_R4K
+        select CRC32
        select CSRC_R4K
        select DMA_NONCOHERENT
        select SYS_HAS_EARLY_PRINTK
diff --git a/arch/mips/include/asm/sigcontext.h b/arch/mips/include/asm/sigcontext.h
index f54bdbe85c0d..eeeb0f48c767 100644
--- a/arch/mips/include/asm/sigcontext.h
+++ b/arch/mips/include/asm/sigcontext.h
@@ -32,8 +32,6 @@ struct sigcontext32 {
        __u32           sc_lo2;
        __u32           sc_hi3;
        __u32           sc_lo3;
-        __u64           sc_msaregs[32]; /* Most significant 64 bits */
-        __u32           sc_msa_csr;
 };
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */
 #endif /* _ASM_SIGCONTEXT_H */
diff --git a/arch/mips/include/asm/uasm.h b/arch/mips/include/asm/uasm.h
index f8d63b3b40b4..708c5d414905 100644
--- a/arch/mips/include/asm/uasm.h
+++ b/arch/mips/include/asm/uasm.h
@@ -67,6 +67,9 @@ void ISAOPC(op)(u32 **buf, unsigned int a, unsigned int b, signed int c)
 #define Ip_u2s3u1(op)                                                   \
 void ISAOPC(op)(u32 **buf, unsigned int a, signed int b, unsigned int c)
+#define Ip_s3s1s2(op)                                                   \
+void ISAOPC(op)(u32 **buf, int a, int b, int c)
 #define Ip_u2u1s3(op)                                                   \
 void ISAOPC(op)(u32 **buf, unsigned int a, unsigned int b, signed int c)
@@ -147,6 +150,7 @@ Ip_u2s3u1(_scd);
 Ip_u2s3u1(_sd);
 Ip_u2u1u3(_sll);
 Ip_u3u2u1(_sllv);
+Ip_s3s1s2(_slt);
 Ip_u2u1s3(_sltiu);
 Ip_u3u1u2(_sltu);
 Ip_u2u1u3(_sra);
diff --git a/arch/mips/include/uapi/asm/inst.h b/arch/mips/include/uapi/asm/inst.h
index 4b7160259292..4bfdb9d4c186 100644
--- a/arch/mips/include/uapi/asm/inst.h
+++ b/arch/mips/include/uapi/asm/inst.h
@@ -273,6 +273,7 @@ enum mm_32a_minor_op {
        mm_and_op = 0x250,
        mm_or32_op = 0x290,
        mm_xor32_op = 0x310,
+        mm_slt_op = 0x350,
        mm_sltu_op = 0x390,
 };
diff --git a/arch/mips/include/uapi/asm/sigcontext.h b/arch/mips/include/uapi/asm/sigcontext.h
index 681c17603a48..6c9906f59c6e 100644
--- a/arch/mips/include/uapi/asm/sigcontext.h
+++ b/arch/mips/include/uapi/asm/sigcontext.h
@@ -12,10 +12,6 @@
 #include <linux/types.h>
 #include <asm/sgidefs.h>
-/* Bits which may be set in sc_used_math */
-#define USEDMATH_FP     (1 << 0)
-#define USEDMATH_MSA    (1 << 1)
 #if _MIPS_SIM == _MIPS_SIM_ABI32
 /*
@@ -41,8 +37,6 @@ struct sigcontext {
        unsigned long           sc_lo2;
        unsigned long           sc_hi3;
        unsigned long           sc_lo3;
-        unsigned long long      sc_msaregs[32]; /* Most significant 64 bits */
-        unsigned long           sc_msa_csr;
 };
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
@@ -76,8 +70,6 @@ struct sigcontext {
        __u32   sc_used_math;
        __u32   sc_dsp;
        __u32   sc_reserved;
-        __u64   sc_msaregs[32];
-        __u32   sc_msa_csr;
 };
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 02f075df8f2e..4bb5107511e2 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -293,7 +293,6 @@ void output_sc_defines(void)
        OFFSET(SC_LO2, sigcontext, sc_lo2);
        OFFSET(SC_HI3, sigcontext, sc_hi3);
        OFFSET(SC_LO3, sigcontext, sc_lo3);
-        OFFSET(SC_MSAREGS, sigcontext, sc_msaregs);
        BLANK();
 }
 #endif
@@ -308,7 +307,6 @@ void output_sc_defines(void)
        OFFSET(SC_MDLO, sigcontext, sc_mdlo);
        OFFSET(SC_PC, sigcontext, sc_pc);
        OFFSET(SC_FPC_CSR, sigcontext, sc_fpc_csr);
-        OFFSET(SC_MSAREGS, sigcontext, sc_msaregs);
        BLANK();
 }
 #endif
@@ -320,7 +318,6 @@ void output_sc32_defines(void)
        OFFSET(SC32_FPREGS, sigcontext32, sc_fpregs);
        OFFSET(SC32_FPC_CSR, sigcontext32, sc_fpc_csr);
        OFFSET(SC32_FPC_EIR, sigcontext32, sc_fpc_eir);
-        OFFSET(SC32_MSAREGS, sigcontext32, sc_msaregs);
        BLANK();
 }
 #endif
diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c
index 4858642d543d..a734b2c2f9ea 100644
--- a/arch/mips/kernel/irq-msc01.c
+++ b/arch/mips/kernel/irq-msc01.c
@@ -126,7 +126,7 @@ void __init init_msc_irqs(unsigned long icubase, unsigned int irqbase, msc_irqma
        board_bind_eic_interrupt = &msc_bind_eic_interrupt;
-        for (; nirq >= 0; nirq--, imp++) {
+        for (; nirq > 0; nirq--, imp++) {
                int n = imp->im_irq;
                switch (imp->im_type) {
diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
index 5aa4c6f8cf83..c4c2069d3a20 100644
--- a/arch/mips/kernel/pm-cps.c
+++ b/arch/mips/kernel/pm-cps.c
@@ -101,7 +101,7 @@ static void coupled_barrier(atomic_t *a, unsigned online)
        if (!coupled_coherence)
                return;
-        smp_mb__before_atomic_inc();
+        smp_mb__before_atomic();
        atomic_inc(a);
        while (atomic_read(a) < online)
@@ -158,7 +158,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
        /* Indicate that this CPU might not be coherent */
        cpumask_clear_cpu(cpu, &cpu_coherent_mask);
-        smp_mb__after_clear_bit();
+        smp_mb__after_atomic();
        /* Create a non-coherent mapping of the core ready_count */
        core_ready_count = per_cpu(ready_count, core);
diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S
index 71814272d148..8352523568e6 100644
--- a/arch/mips/kernel/r4k_fpu.S
+++ b/arch/mips/kernel/r4k_fpu.S
@@ -13,7 +13,6 @@
 * Copyright (C) 1999, 2001 Silicon Graphics, Inc.
 */
 #include <asm/asm.h>
-#include <asm/asmmacro.h>
 #include <asm/errno.h>
 #include <asm/fpregdef.h>
 #include <asm/mipsregs.h>
@@ -246,218 +245,6 @@ LEAF(_restore_fp_context32)
        END(_restore_fp_context32)
 #endif
-#ifdef CONFIG_CPU_HAS_MSA
-        .macro  save_sc_msareg  wr, off, sc, tmp
-#ifdef CONFIG_64BIT
-        copy_u_d \tmp, \wr, 1
-        EX sd   \tmp, (\off+(\wr*8))(\sc)
-#elif defined(CONFIG_CPU_LITTLE_ENDIAN)
-        copy_u_w \tmp, \wr, 2
-        EX sw   \tmp, (\off+(\wr*8)+0)(\sc)
-        copy_u_w \tmp, \wr, 3
-        EX sw   \tmp, (\off+(\wr*8)+4)(\sc)
-#else /* CONFIG_CPU_BIG_ENDIAN */
-        copy_u_w \tmp, \wr, 2
-        EX sw   \tmp, (\off+(\wr*8)+4)(\sc)
-        copy_u_w \tmp, \wr, 3
-        EX sw   \tmp, (\off+(\wr*8)+0)(\sc)
-#endif
-        .endm
-/*
- * int _save_msa_context(struct sigcontext *sc)
- *
- * Save the upper 64 bits of each vector register along with the MSA_CSR
- * register into sc. Returns zero on success, else non-zero.
- */
-LEAF(_save_msa_context)
-        save_sc_msareg  0, SC_MSAREGS, a0, t0
-        save_sc_msareg  1, SC_MSAREGS, a0, t0
-        save_sc_msareg  2, SC_MSAREGS, a0, t0
-        save_sc_msareg  3, SC_MSAREGS, a0, t0
-        save_sc_msareg  4, SC_MSAREGS, a0, t0
-        save_sc_msareg  5, SC_MSAREGS, a0, t0
-        save_sc_msareg  6, SC_MSAREGS, a0, t0
-        save_sc_msareg  7, SC_MSAREGS, a0, t0
-        save_sc_msareg  8, SC_MSAREGS, a0, t0
-        save_sc_msareg  9, SC_MSAREGS, a0, t0
-        save_sc_msareg  10, SC_MSAREGS, a0, t0
-        save_sc_msareg  11, SC_MSAREGS, a0, t0
-        save_sc_msareg  12, SC_MSAREGS, a0, t0
-        save_sc_msareg  13, SC_MSAREGS, a0, t0
-        save_sc_msareg  14, SC_MSAREGS, a0, t0
-        save_sc_msareg  15, SC_MSAREGS, a0, t0
-        save_sc_msareg  16, SC_MSAREGS, a0, t0
-        save_sc_msareg  17, SC_MSAREGS, a0, t0
-        save_sc_msareg  18, SC_MSAREGS, a0, t0
-        save_sc_msareg  19, SC_MSAREGS, a0, t0
-        save_sc_msareg  20, SC_MSAREGS, a0, t0
-        save_sc_msareg  21, SC_MSAREGS, a0, t0
-        save_sc_msareg  22, SC_MSAREGS, a0, t0
-        save_sc_msareg  23, SC_MSAREGS, a0, t0
-        save_sc_msareg  24, SC_MSAREGS, a0, t0
-        save_sc_msareg  25, SC_MSAREGS, a0, t0
-        save_sc_msareg  26, SC_MSAREGS, a0, t0
-        save_sc_msareg  27, SC_MSAREGS, a0, t0
-        save_sc_msareg  28, SC_MSAREGS, a0, t0
-        save_sc_msareg  29, SC_MSAREGS, a0, t0
-        save_sc_msareg  30, SC_MSAREGS, a0, t0
-        save_sc_msareg  31, SC_MSAREGS, a0, t0
-        jr      ra
-         li     v0, 0
-        END(_save_msa_context)
-#ifdef CONFIG_MIPS32_COMPAT
-/*
- * int _save_msa_context32(struct sigcontext32 *sc)
- *
- * Save the upper 64 bits of each vector register along with the MSA_CSR
- * register into sc. Returns zero on success, else non-zero.
- */
-LEAF(_save_msa_context32)
-        save_sc_msareg  0, SC32_MSAREGS, a0, t0
-        save_sc_msareg  1, SC32_MSAREGS, a0, t0
-        save_sc_msareg  2, SC32_MSAREGS, a0, t0
-        save_sc_msareg  3, SC32_MSAREGS, a0, t0
-        save_sc_msareg  4, SC32_MSAREGS, a0, t0
-        save_sc_msareg  5, SC32_MSAREGS, a0, t0
-        save_sc_msareg  6, SC32_MSAREGS, a0, t0
-        save_sc_msareg  7, SC32_MSAREGS, a0, t0
-        save_sc_msareg  8, SC32_MSAREGS, a0, t0
-        save_sc_msareg  9, SC32_MSAREGS, a0, t0
-        save_sc_msareg  10, SC32_MSAREGS, a0, t0
-        save_sc_msareg  11, SC32_MSAREGS, a0, t0
-        save_sc_msareg  12, SC32_MSAREGS, a0, t0
-        save_sc_msareg  13, SC32_MSAREGS, a0, t0
-        save_sc_msareg  14, SC32_MSAREGS, a0, t0
-        save_sc_msareg  15, SC32_MSAREGS, a0, t0
-        save_sc_msareg  16, SC32_MSAREGS, a0, t0
-        save_sc_msareg  17, SC32_MSAREGS, a0, t0
-        save_sc_msareg  18, SC32_MSAREGS, a0, t0
-        save_sc_msareg  19, SC32_MSAREGS, a0, t0
-        save_sc_msareg  20, SC32_MSAREGS, a0, t0
-        save_sc_msareg  21, SC32_MSAREGS, a0, t0
-        save_sc_msareg  22, SC32_MSAREGS, a0, t0
-        save_sc_msareg  23, SC32_MSAREGS, a0, t0
-        save_sc_msareg  24, SC32_MSAREGS, a0, t0
-        save_sc_msareg  25, SC32_MSAREGS, a0, t0
-        save_sc_msareg  26, SC32_MSAREGS, a0, t0
-        save_sc_msareg  27, SC32_MSAREGS, a0, t0
-        save_sc_msareg  28, SC32_MSAREGS, a0, t0
-        save_sc_msareg  29, SC32_MSAREGS, a0, t0
-        save_sc_msareg  30, SC32_MSAREGS, a0, t0
-        save_sc_msareg  31, SC32_MSAREGS, a0, t0
-        jr      ra
-         li     v0, 0
-        END(_save_msa_context32)
-#endif /* CONFIG_MIPS32_COMPAT */
-        .macro restore_sc_msareg        wr, off, sc, tmp
-#ifdef CONFIG_64BIT
-        EX ld   \tmp, (\off+(\wr*8))(\sc)
-        insert_d \wr, 1, \tmp
-#elif defined(CONFIG_CPU_LITTLE_ENDIAN)
-        EX lw   \tmp, (\off+(\wr*8)+0)(\sc)
-        insert_w \wr, 2, \tmp
-        EX lw   \tmp, (\off+(\wr*8)+4)(\sc)
-        insert_w \wr, 3, \tmp
-#else /* CONFIG_CPU_BIG_ENDIAN */
-        EX lw   \tmp, (\off+(\wr*8)+4)(\sc)
-        insert_w \wr, 2, \tmp
-        EX lw   \tmp, (\off+(\wr*8)+0)(\sc)
-        insert_w \wr, 3, \tmp
-#endif
-        .endm
-/*
- * int _restore_msa_context(struct sigcontext *sc)
- */
-LEAF(_restore_msa_context)
-        restore_sc_msareg       0, SC_MSAREGS, a0, t0
-        restore_sc_msareg       1, SC_MSAREGS, a0, t0
-        restore_sc_msareg       2, SC_MSAREGS, a0, t0
-        restore_sc_msareg       3, SC_MSAREGS, a0, t0
-        restore_sc_msareg       4, SC_MSAREGS, a0, t0
-        restore_sc_msareg       5, SC_MSAREGS, a0, t0
-        restore_sc_msareg       6, SC_MSAREGS, a0, t0
-        restore_sc_msareg       7, SC_MSAREGS, a0, t0
-        restore_sc_msareg       8, SC_MSAREGS, a0, t0
-        restore_sc_msareg       9, SC_MSAREGS, a0, t0
-        restore_sc_msareg       10, SC_MSAREGS, a0, t0
-        restore_sc_msareg       11, SC_MSAREGS, a0, t0
-        restore_sc_msareg       12, SC_MSAREGS, a0, t0
-        restore_sc_msareg       13, SC_MSAREGS, a0, t0
-        restore_sc_msareg       14, SC_MSAREGS, a0, t0
-        restore_sc_msareg       15, SC_MSAREGS, a0, t0
-        restore_sc_msareg       16, SC_MSAREGS, a0, t0
-        restore_sc_msareg       17, SC_MSAREGS, a0, t0
-        restore_sc_msareg       18, SC_MSAREGS, a0, t0
-        restore_sc_msareg       19, SC_MSAREGS, a0, t0
-        restore_sc_msareg       20, SC_MSAREGS, a0, t0
-        restore_sc_msareg       21, SC_MSAREGS, a0, t0
-        restore_sc_msareg       22, SC_MSAREGS, a0, t0
-        restore_sc_msareg       23, SC_MSAREGS, a0, t0
-        restore_sc_msareg       24, SC_MSAREGS, a0, t0
-        restore_sc_msareg       25, SC_MSAREGS, a0, t0
-        restore_sc_msareg       26, SC_MSAREGS, a0, t0
-        restore_sc_msareg       27, SC_MSAREGS, a0, t0
-        restore_sc_msareg       28, SC_MSAREGS, a0, t0
-        restore_sc_msareg       29, SC_MSAREGS, a0, t0
-        restore_sc_msareg       30, SC_MSAREGS, a0, t0
-        restore_sc_msareg       31, SC_MSAREGS, a0, t0
-        jr      ra
-         li     v0, 0
-        END(_restore_msa_context)
-#ifdef CONFIG_MIPS32_COMPAT
-/*
- * int _restore_msa_context32(struct sigcontext32 *sc)
- */
-LEAF(_restore_msa_context32)
-        restore_sc_msareg       0, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       1, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       2, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       3, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       4, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       5, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       6, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       7, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       8, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       9, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       10, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       11, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       12, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       13, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       14, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       15, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       16, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       17, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       18, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       19, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       20, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       21, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       22, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       23, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       24, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       25, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       26, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       27, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       28, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       29, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       30, SC32_MSAREGS, a0, t0
-        restore_sc_msareg       31, SC32_MSAREGS, a0, t0
-        jr      ra
-         li     v0, 0
-        END(_restore_msa_context32)
-#endif /* CONFIG_MIPS32_COMPAT */
-#endif /* CONFIG_CPU_HAS_MSA */
        .set    reorder
        .type   fault@function
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 33133d3df3e5..9e60d117e41e 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -31,7 +31,6 @@
 #include <linux/bitops.h>
 #include <asm/cacheflush.h>
 #include <asm/fpu.h>
-#include <asm/msa.h>
 #include <asm/sim.h>
 #include <asm/ucontext.h>
 #include <asm/cpu-features.h>
@@ -48,9 +47,6 @@ static int (*restore_fp_context)(struct sigcontext __user *sc);
 extern asmlinkage int _save_fp_context(struct sigcontext __user *sc);
 extern asmlinkage int _restore_fp_context(struct sigcontext __user *sc);
-extern asmlinkage int _save_msa_context(struct sigcontext __user *sc);
-extern asmlinkage int _restore_msa_context(struct sigcontext __user *sc);
 struct sigframe {
        u32 sf_ass[4];          /* argument save space for o32 */
        u32 sf_pad[2];          /* Was: signal trampoline */
@@ -100,60 +96,20 @@ static int copy_fp_from_sigcontext(struct sigcontext __user *sc)
 }
 /*
- * These functions will save only the upper 64 bits of the vector registers,
- * since the lower 64 bits have already been saved as the scalar FP context.
- */
-static int copy_msa_to_sigcontext(struct sigcontext __user *sc)
-{
-        int i;
-        int err = 0;
-        for (i = 0; i < NUM_FPU_REGS; i++) {
-                err |=
-                    __put_user(get_fpr64(&current->thread.fpu.fpr[i], 1),
-                               &sc->sc_msaregs[i]);
-        }
-        err |= __put_user(current->thread.fpu.msacsr, &sc->sc_msa_csr);
-        return err;
-}
-static int copy_msa_from_sigcontext(struct sigcontext __user *sc)
-{
-        int i;
-        int err = 0;
-        u64 val;
-        for (i = 0; i < NUM_FPU_REGS; i++) {
-                err |= __get_user(val, &sc->sc_msaregs[i]);
-                set_fpr64(&current->thread.fpu.fpr[i], 1, val);
-        }
-        err |= __get_user(current->thread.fpu.msacsr, &sc->sc_msa_csr);
-        return err;
-}
-/*
 * Helper routines
 */
-static int protected_save_fp_context(struct sigcontext __user *sc,
+static int protected_save_fp_context(struct sigcontext __user *sc)
-                                     unsigned used_math)
 {
        int err;
-        bool save_msa = cpu_has_msa && (used_math & USEDMATH_MSA);
 #ifndef CONFIG_EVA
        while (1) {
                lock_fpu_owner();
                if (is_fpu_owner()) {
                        err = save_fp_context(sc);
-                        if (save_msa && !err)
-                                err = _save_msa_context(sc);
                        unlock_fpu_owner();
                } else {
                        unlock_fpu_owner();
                        err = copy_fp_to_sigcontext(sc);
-                        if (save_msa && !err)
-                                err = copy_msa_to_sigcontext(sc);
                }
                if (likely(!err))
                        break;
@@ -169,38 +125,24 @@ static int protected_save_fp_context(struct sigcontext __user *sc,
         * EVA does not have FPU EVA instructions so saving fpu context directly
         * does not work.
         */
-        disable_msa();
        lose_fpu(1);
        err = save_fp_context(sc); /* this might fail */
-        if (save_msa && !err)
-                err = copy_msa_to_sigcontext(sc);
 #endif
        return err;
 }
-static int protected_restore_fp_context(struct sigcontext __user *sc,
+static int protected_restore_fp_context(struct sigcontext __user *sc)
-                                        unsigned used_math)
 {
        int err, tmp __maybe_unused;
-        bool restore_msa = cpu_has_msa && (used_math & USEDMATH_MSA);
 #ifndef CONFIG_EVA
        while (1) {
                lock_fpu_owner();
                if (is_fpu_owner()) {
                        err = restore_fp_context(sc);
-                        if (restore_msa && !err) {
-                                enable_msa();
-                                err = _restore_msa_context(sc);
-                        } else {
-                                /* signal handler may have used MSA */
-                                disable_msa();
-                        }
                        unlock_fpu_owner();
                } else {
                        unlock_fpu_owner();
                        err = copy_fp_from_sigcontext(sc);
-                        if (!err && (used_math & USEDMATH_MSA))
-                                err = copy_msa_from_sigcontext(sc);
                }
                if (likely(!err))
                        break;
@@ -216,11 +158,8 @@ static int protected_restore_fp_context(struct sigcontext __user *sc,
         * EVA does not have FPU EVA instructions so restoring fpu context
         * directly does not work.
         */
-        enable_msa();
        lose_fpu(0);
        err = restore_fp_context(sc); /* this might fail */
-        if (restore_msa && !err)
-                err = copy_msa_from_sigcontext(sc);
 #endif
        return err;
 }
@@ -252,8 +191,7 @@ int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
                err |= __put_user(rddsp(DSP_MASK), &sc->sc_dsp);
        }
-        used_math = used_math() ? USEDMATH_FP : 0;
+        used_math = !!used_math();
-        used_math |= thread_msa_context_live() ? USEDMATH_MSA : 0;
        err |= __put_user(used_math, &sc->sc_used_math);
        if (used_math) {
@@ -261,7 +199,7 @@ int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
                 * Save FPU state to signal context. Signal handler
                 * will "inherit" current FPU state.
                 */
-                err |= protected_save_fp_context(sc, used_math);
+                err |= protected_save_fp_context(sc);
        }
        return err;
 }
@@ -286,14 +224,14 @@ int fpcsr_pending(unsigned int __user *fpcsr)
 }
 static int
-check_and_restore_fp_context(struct sigcontext __user *sc, unsigned used_math)
+check_and_restore_fp_context(struct sigcontext __user *sc)
 {
        int err, sig;
        err = sig = fpcsr_pending(&sc->sc_fpc_csr);
        if (err > 0)
                err = 0;
-        err |= protected_restore_fp_context(sc, used_math);
+        err |= protected_restore_fp_context(sc);
        return err ?: sig;
 }
@@ -333,10 +271,9 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
        if (used_math) {
                /* restore fpu context if we have used it before */
                if (!err)
-                        err = check_and_restore_fp_context(sc, used_math);
+                        err = check_and_restore_fp_context(sc);
        } else {
-                /* signal handler may have used FPU or MSA. Disable them. */
+                /* signal handler may have used FPU.  Give it up. */
-                disable_msa();
                lose_fpu(0);
        }
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index 299f956e4db3..bae2e6ee2109 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -30,7 +30,6 @@
 #include <asm/sim.h>
 #include <asm/ucontext.h>
 #include <asm/fpu.h>
-#include <asm/msa.h>
 #include <asm/war.h>
 #include <asm/vdso.h>
 #include <asm/dsp.h>
@@ -43,9 +42,6 @@ static int (*restore_fp_context32)(struct sigcontext32 __user *sc);
 extern asmlinkage int _save_fp_context32(struct sigcontext32 __user *sc);
 extern asmlinkage int _restore_fp_context32(struct sigcontext32 __user *sc);
-extern asmlinkage int _save_msa_context32(struct sigcontext32 __user *sc);
-extern asmlinkage int _restore_msa_context32(struct sigcontext32 __user *sc);
 /*
 * Including <asm/unistd.h> would give use the 64-bit syscall numbers ...
 */
@@ -115,59 +111,19 @@ static int copy_fp_from_sigcontext32(struct sigcontext32 __user *sc)
 }
 /*
- * These functions will save only the upper 64 bits of the vector registers,
- * since the lower 64 bits have already been saved as the scalar FP context.
- */
-static int copy_msa_to_sigcontext32(struct sigcontext32 __user *sc)
-{
-        int i;
-        int err = 0;
-        for (i = 0; i < NUM_FPU_REGS; i++) {
-                err |=
-                    __put_user(get_fpr64(&current->thread.fpu.fpr[i], 1),
-                               &sc->sc_msaregs[i]);
-        }
-        err |= __put_user(current->thread.fpu.msacsr, &sc->sc_msa_csr);
-        return err;
-}
-static int copy_msa_from_sigcontext32(struct sigcontext32 __user *sc)
-{
-        int i;
-        int err = 0;
-        u64 val;
-        for (i = 0; i < NUM_FPU_REGS; i++) {
-                err |= __get_user(val, &sc->sc_msaregs[i]);
-                set_fpr64(&current->thread.fpu.fpr[i], 1, val);
-        }
-        err |= __get_user(current->thread.fpu.msacsr, &sc->sc_msa_csr);
-        return err;
-}
-/*
 * sigcontext handlers
 */
-static int protected_save_fp_context32(struct sigcontext32 __user *sc,
+static int protected_save_fp_context32(struct sigcontext32 __user *sc)
-                                       unsigned used_math)
 {
        int err;
-        bool save_msa = cpu_has_msa && (used_math & USEDMATH_MSA);
        while (1) {
                lock_fpu_owner();
                if (is_fpu_owner()) {
                        err = save_fp_context32(sc);
-                        if (save_msa && !err)
-                                err = _save_msa_context32(sc);
                        unlock_fpu_owner();
                } else {
                        unlock_fpu_owner();
                        err = copy_fp_to_sigcontext32(sc);
-                        if (save_msa && !err)
-                                err = copy_msa_to_sigcontext32(sc);
                }
                if (likely(!err))
                        break;
@@ -181,28 +137,17 @@ static int protected_save_fp_context32(struct sigcontext32 __user *sc,
        return err;
 }
-static int protected_restore_fp_context32(struct sigcontext32 __user *sc,
+static int protected_restore_fp_context32(struct sigcontext32 __user *sc)
-                                          unsigned used_math)
 {
        int err, tmp __maybe_unused;
-        bool restore_msa = cpu_has_msa && (used_math & USEDMATH_MSA);
        while (1) {
                lock_fpu_owner();
                if (is_fpu_owner()) {
                        err = restore_fp_context32(sc);
-                        if (restore_msa && !err) {
-                                enable_msa();
-                                err = _restore_msa_context32(sc);
-                        } else {
-                                /* signal handler may have used MSA */
-                                disable_msa();
-                        }
                        unlock_fpu_owner();
                } else {
                        unlock_fpu_owner();
                        err = copy_fp_from_sigcontext32(sc);
-                        if (restore_msa && !err)
-                                err = copy_msa_from_sigcontext32(sc);
                }
                if (likely(!err))
                        break;
@@ -241,8 +186,7 @@ static int setup_sigcontext32(struct pt_regs *regs,
                err |= __put_user(mflo3(), &sc->sc_lo3);
        }
-        used_math = used_math() ? USEDMATH_FP : 0;
+        used_math = !!used_math();
-        used_math |= thread_msa_context_live() ? USEDMATH_MSA : 0;
        err |= __put_user(used_math, &sc->sc_used_math);
        if (used_math) {
@@ -250,21 +194,20 @@ static int setup_sigcontext32(struct pt_regs *regs,
                 * Save FPU state to signal context.  Signal handler
                 * will "inherit" current FPU state.
                 */
-                err |= protected_save_fp_context32(sc, used_math);
+                err |= protected_save_fp_context32(sc);
        }
        return err;
 }
 static int
-check_and_restore_fp_context32(struct sigcontext32 __user *sc,
+check_and_restore_fp_context32(struct sigcontext32 __user *sc)
-                               unsigned used_math)
 {
        int err, sig;
        err = sig = fpcsr_pending(&sc->sc_fpc_csr);
        if (err > 0)
                err = 0;
-        err |= protected_restore_fp_context32(sc, used_math);
+        err |= protected_restore_fp_context32(sc);
        return err ?: sig;
 }
@@ -301,10 +244,9 @@ static int restore_sigcontext32(struct pt_regs *regs,
        if (used_math) {
                /* restore fpu context if we have used it before */
                if (!err)
-                        err = check_and_restore_fp_context32(sc, used_math);
+                        err = check_and_restore_fp_context32(sc);
        } else {
-                /* signal handler may have used FPU or MSA. Disable them. */
+                /* signal handler may have used FPU.  Give it up. */
-                disable_msa();
                lose_fpu(0);
        }
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
index df0598d9bfdd..949f2c6827a0 100644
--- a/arch/mips/kernel/smp-cps.c
+++ b/arch/mips/kernel/smp-cps.c
@@ -301,7 +301,7 @@ static int cps_cpu_disable(void)
        core_cfg = &mips_cps_core_bootcfg[current_cpu_data.core];
        atomic_sub(1 << cpu_vpe_id(&current_cpu_data), &core_cfg->vpe_mask);
-        smp_mb__after_atomic_dec();
+        smp_mb__after_atomic();
        set_cpu_online(cpu, false);
        cpu_clear(cpu, cpu_callin_map);
diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c
index cd5e4f568439..f3c56a182fd8 100644
--- a/arch/mips/kvm/kvm_mips.c
+++ b/arch/mips/kvm/kvm_mips.c
@@ -384,6 +384,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
        kfree(vcpu->arch.guest_ebase);
        kfree(vcpu->arch.kseg0_commpage);
+        kfree(vcpu);
 }
 void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
diff --git a/arch/mips/math-emu/ieee754.c b/arch/mips/math-emu/ieee754.c
index 53f1d2287084..8e97acbbe22c 100644
--- a/arch/mips/math-emu/ieee754.c
+++ b/arch/mips/math-emu/ieee754.c
@@ -34,13 +34,22 @@
 * Special constants
 */
-#define DPCNST(s, b, m)                                                 \
+/*
+ * Older GCC requires the inner braces for initialization of union ieee754dp's
+ * anonymous struct member.  Without an error will result.
+ */
+#define xPCNST(s, b, m, ebias)                                          \
 {                                                                       \
-        .sign   = (s),                                                  \
+        {                                                               \
-        .bexp   = (b) + DP_EBIAS,                                       \
+                .sign   = (s),                                          \
-        .mant   = (m)                                                   \
+                .bexp   = (b) + ebias,                                  \
+                .mant   = (m)                                           \
+        }                                                               \
 }
+#define DPCNST(s, b, m)                                                 \
+        xPCNST(s, b, m, DP_EBIAS)
 const union ieee754dp __ieee754dp_spcvals[] = {
        DPCNST(0, DP_EMIN - 1, 0x0000000000000ULL),     /* + zero   */
        DPCNST(1, DP_EMIN - 1, 0x0000000000000ULL),     /* - zero   */
@@ -62,11 +71,7 @@ const union ieee754dp __ieee754dp_spcvals[] = {
 };
 #define SPCNST(s, b, m)                                                 \
-{                                                                       \
+        xPCNST(s, b, m, SP_EBIAS)
-        .sign   = (s),                                                  \
-        .bexp   = (b) + SP_EBIAS,                                       \
-        .mant   = (m)                                                   \
-}
 const union ieee754sp __ieee754sp_spcvals[] = {
        SPCNST(0, SP_EMIN - 1, 0x000000),       /* + zero   */
diff --git a/arch/mips/mm/uasm-micromips.c b/arch/mips/mm/uasm-micromips.c
index 775c2800cba2..8399ddf03a02 100644
--- a/arch/mips/mm/uasm-micromips.c
+++ b/arch/mips/mm/uasm-micromips.c
@@ -102,6 +102,7 @@ static struct insn insn_table_MM[] = {
        { insn_sd, 0, 0 },
        { insn_sll, M(mm_pool32a_op, 0, 0, 0, 0, mm_sll32_op), RT | RS | RD },
        { insn_sllv, M(mm_pool32a_op, 0, 0, 0, 0, mm_sllv32_op), RT | RS | RD },
+        { insn_slt, M(mm_pool32a_op, 0, 0, 0, 0, mm_slt_op), RT | RS | RD },
        { insn_sltiu, M(mm_sltiu32_op, 0, 0, 0, 0, 0), RT | RS | SIMM },
        { insn_sltu, M(mm_pool32a_op, 0, 0, 0, 0, mm_sltu_op), RT | RS | RD },
        { insn_sra, M(mm_pool32a_op, 0, 0, 0, 0, mm_sra_op), RT | RS | RD },
diff --git a/arch/mips/mm/uasm-mips.c b/arch/mips/mm/uasm-mips.c
index 38792c2364f5..6708a2dbf934 100644
--- a/arch/mips/mm/uasm-mips.c
+++ b/arch/mips/mm/uasm-mips.c
@@ -89,7 +89,7 @@ static struct insn insn_table[] = {
        { insn_lb, M(lb_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
        { insn_ld,  M(ld_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
        { insn_ldx, M(spec3_op, 0, 0, 0, ldx_op, lx_op), RS | RT | RD },
-        { insn_lh,  M(lw_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
+        { insn_lh,  M(lh_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
        { insn_lld,  M(lld_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
        { insn_ll,  M(ll_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
        { insn_lui,  M(lui_op, 0, 0, 0, 0, 0),  RT | SIMM },
@@ -110,6 +110,7 @@ static struct insn insn_table[] = {
        { insn_sd,  M(sd_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
        { insn_sll,  M(spec_op, 0, 0, 0, 0, sll_op),  RT | RD | RE },
        { insn_sllv,  M(spec_op, 0, 0, 0, 0, sllv_op),  RS | RT | RD },
+        { insn_slt,  M(spec_op, 0, 0, 0, 0, slt_op),  RS | RT | RD },
        { insn_sltiu, M(sltiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
        { insn_sltu, M(spec_op, 0, 0, 0, 0, sltu_op), RS | RT | RD },
        { insn_sra,  M(spec_op, 0, 0, 0, 0, sra_op),  RT | RD | RE },
diff --git a/arch/mips/mm/uasm.c b/arch/mips/mm/uasm.c
index 00515805fe41..a01b0d6cedd2 100644
--- a/arch/mips/mm/uasm.c
+++ b/arch/mips/mm/uasm.c
@@ -53,7 +53,7 @@ enum opcode {
        insn_ld, insn_ldx, insn_lh, insn_ll, insn_lld, insn_lui, insn_lw,
        insn_lwx, insn_mfc0, insn_mfhi, insn_mflo, insn_mtc0, insn_mul,
        insn_or, insn_ori, insn_pref, insn_rfe, insn_rotr, insn_sc, insn_scd,
-        insn_sd, insn_sll, insn_sllv, insn_sltiu, insn_sltu, insn_sra,
+        insn_sd, insn_sll, insn_sllv, insn_slt, insn_sltiu, insn_sltu, insn_sra,
        insn_srl, insn_srlv, insn_subu, insn_sw, insn_sync, insn_syscall,
        insn_tlbp, insn_tlbr, insn_tlbwi, insn_tlbwr, insn_wait, insn_wsbh,
        insn_xor, insn_xori, insn_yield,
@@ -139,6 +139,13 @@ Ip_u1u2u3(op)						\
 }                                                       \
 UASM_EXPORT_SYMBOL(uasm_i##op);
+#define I_s3s1s2(op)                                    \
+Ip_s3s1s2(op)                                           \
+{                                                       \
+        build_insn(buf, insn##op, b, c, a);             \
+}                                                       \
+UASM_EXPORT_SYMBOL(uasm_i##op);
 #define I_u2u1u3(op)                                    \
 Ip_u2u1u3(op)                                           \
 {                                                       \
@@ -289,6 +296,7 @@ I_u2s3u1(_scd)
 I_u2s3u1(_sd)
 I_u2u1u3(_sll)
 I_u3u2u1(_sllv)
+I_s3s1s2(_slt)
 I_u2u1s3(_sltiu)
 I_u3u1u2(_sltu)
 I_u2u1u3(_sra)
diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index a67b9753330b..b87390a56a2f 100644
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -119,8 +119,6 @@
 /* Arguments used by JIT */
 #define ARGS_USED_BY_JIT        2 /* only applicable to 64-bit */
-#define FLAG_NEED_X_RESET       (1 << 0)
 #define SBIT(x)                 (1 << (x)) /* Signed version of BIT() */
 /**
@@ -153,6 +151,8 @@ static inline int optimize_div(u32 *k)
        return 0;
 }
+static inline void emit_jit_reg_move(ptr dst, ptr src, struct jit_ctx *ctx);
 /* Simply emit the instruction if the JIT memory space has been allocated */
 #define emit_instr(ctx, func, ...)                      \
 do {                                                    \
@@ -166,9 +166,7 @@ do {							\
 /* Determine if immediate is within the 16-bit signed range */
 static inline bool is_range16(s32 imm)
 {
-        if (imm >= SBIT(15) || imm < -SBIT(15))
+        return !(imm >= SBIT(15) || imm < -SBIT(15));
-                return true;
-        return false;
 }
 static inline void emit_addu(unsigned int dst, unsigned int src1,
@@ -187,7 +185,7 @@ static inline void emit_load_imm(unsigned int dst, u32 imm, struct jit_ctx *ctx)
 {
        if (ctx->target != NULL) {
                /* addiu can only handle s16 */
-                if (is_range16(imm)) {
+                if (!is_range16(imm)) {
                        u32 *p = &ctx->target[ctx->idx];
                        uasm_i_lui(&p, r_tmp_imm, (s32)imm >> 16);
                        p = &ctx->target[ctx->idx + 1];
@@ -199,7 +197,7 @@ static inline void emit_load_imm(unsigned int dst, u32 imm, struct jit_ctx *ctx)
        }
        ctx->idx++;
-        if (is_range16(imm))
+        if (!is_range16(imm))
                ctx->idx++;
 }
@@ -240,7 +238,7 @@ static inline void emit_daddiu(unsigned int dst, unsigned int src,
 static inline void emit_addiu(unsigned int dst, unsigned int src,
                              u32 imm, struct jit_ctx *ctx)
 {
-        if (is_range16(imm)) {
+        if (!is_range16(imm)) {
                emit_load_imm(r_tmp, imm, ctx);
                emit_addu(dst, r_tmp, src, ctx);
        } else {
@@ -313,8 +311,11 @@ static inline void emit_sll(unsigned int dst, unsigned int src,
                            unsigned int sa, struct jit_ctx *ctx)
 {
        /* sa is 5-bits long */
-        BUG_ON(sa >= BIT(5));
+        if (sa >= BIT(5))
-        emit_instr(ctx, sll, dst, src, sa);
+                /* Shifting >= 32 results in zero */
+                emit_jit_reg_move(dst, r_zero, ctx);
+        else
+                emit_instr(ctx, sll, dst, src, sa);
 }
 static inline void emit_srlv(unsigned int dst, unsigned int src,
@@ -327,8 +328,17 @@ static inline void emit_srl(unsigned int dst, unsigned int src,
                            unsigned int sa, struct jit_ctx *ctx)
 {
        /* sa is 5-bits long */
-        BUG_ON(sa >= BIT(5));
+        if (sa >= BIT(5))
-        emit_instr(ctx, srl, dst, src, sa);
+                /* Shifting >= 32 results in zero */
+                emit_jit_reg_move(dst, r_zero, ctx);
+        else
+                emit_instr(ctx, srl, dst, src, sa);
+}
+static inline void emit_slt(unsigned int dst, unsigned int src1,
+                            unsigned int src2, struct jit_ctx *ctx)
+{
+        emit_instr(ctx, slt, dst, src1, src2);
 }
 static inline void emit_sltu(unsigned int dst, unsigned int src1,
@@ -341,7 +351,7 @@ static inline void emit_sltiu(unsigned dst, unsigned int src,
                              unsigned int imm, struct jit_ctx *ctx)
 {
        /* 16 bit immediate */
-        if (is_range16((s32)imm)) {
+        if (!is_range16((s32)imm)) {
                emit_load_imm(r_tmp, imm, ctx);
                emit_sltu(dst, src, r_tmp, ctx);
        } else {
@@ -408,7 +418,7 @@ static inline void emit_div(unsigned int dst, unsigned int src,
                u32 *p = &ctx->target[ctx->idx];
                uasm_i_divu(&p, dst, src);
                p = &ctx->target[ctx->idx + 1];
-                uasm_i_mfhi(&p, dst);
+                uasm_i_mflo(&p, dst);
        }
        ctx->idx += 2; /* 2 insts */
 }
@@ -443,6 +453,17 @@ static inline void emit_wsbh(unsigned int dst, unsigned int src,
        emit_instr(ctx, wsbh, dst, src);
 }
+/* load pointer to register */
+static inline void emit_load_ptr(unsigned int dst, unsigned int src,
+                                     int imm, struct jit_ctx *ctx)
+{
+        /* src contains the base addr of the 32/64-pointer */
+        if (config_enabled(CONFIG_64BIT))
+                emit_instr(ctx, ld, dst, imm, src);
+        else
+                emit_instr(ctx, lw, dst, imm, src);
+}
 /* load a function pointer to register */
 static inline void emit_load_func(unsigned int reg, ptr imm,
                                  struct jit_ctx *ctx)
@@ -545,29 +566,13 @@ static inline u16 align_sp(unsigned int num)
        return num;
 }
-static inline void update_on_xread(struct jit_ctx *ctx)
-{
-        if (!(ctx->flags & SEEN_X))
-                ctx->flags |= FLAG_NEED_X_RESET;
-        ctx->flags |= SEEN_X;
-}
 static bool is_load_to_a(u16 inst)
 {
        switch (inst) {
-        case BPF_S_LD_W_LEN:
+        case BPF_LD | BPF_W | BPF_LEN:
-        case BPF_S_LD_W_ABS:
+        case BPF_LD | BPF_W | BPF_ABS:
-        case BPF_S_LD_H_ABS:
+        case BPF_LD | BPF_H | BPF_ABS:
-        case BPF_S_LD_B_ABS:
+        case BPF_LD | BPF_B | BPF_ABS:
-        case BPF_S_ANC_CPU:
-        case BPF_S_ANC_IFINDEX:
-        case BPF_S_ANC_MARK:
-        case BPF_S_ANC_PROTOCOL:
-        case BPF_S_ANC_RXHASH:
-        case BPF_S_ANC_VLAN_TAG:
-        case BPF_S_ANC_VLAN_TAG_PRESENT:
-        case BPF_S_ANC_QUEUE:
                return true;
        default:
                return false;
@@ -618,7 +623,10 @@ static void save_bpf_jit_regs(struct jit_ctx *ctx, unsigned offset)
        if (ctx->flags & SEEN_MEM) {
                if (real_off % (RSIZE * 2))
                        real_off += RSIZE;
-                emit_addiu(r_M, r_sp, real_off, ctx);
+                if (config_enabled(CONFIG_64BIT))
+                        emit_daddiu(r_M, r_sp, real_off, ctx);
+                else
+                        emit_addiu(r_M, r_sp, real_off, ctx);
        }
 }
@@ -705,11 +713,11 @@ static void build_prologue(struct jit_ctx *ctx)
        if (ctx->flags & SEEN_SKB)
                emit_reg_move(r_skb, MIPS_R_A0, ctx);
-        if (ctx->flags & FLAG_NEED_X_RESET)
+        if (ctx->flags & SEEN_X)
                emit_jit_reg_move(r_X, r_zero, ctx);
        /* Do not leak kernel data to userspace */
-        if ((first_inst != BPF_S_RET_K) && !(is_load_to_a(first_inst)))
+        if ((first_inst != (BPF_RET | BPF_K)) && !(is_load_to_a(first_inst)))
                emit_jit_reg_move(r_A, r_zero, ctx);
 }
@@ -757,13 +765,17 @@ static u64 jit_get_skb_w(struct sk_buff *skb, unsigned offset)
        return (u64)err << 32 | ntohl(ret);
 }
-#define PKT_TYPE_MAX 7
+#ifdef __BIG_ENDIAN_BITFIELD
+#define PKT_TYPE_MAX    (7 << 5)
+#else
+#define PKT_TYPE_MAX    7
+#endif
 static int pkt_type_offset(void)
 {
        struct sk_buff skb_probe = {
                .pkt_type = ~0,
        };
-        char *ct = (char *)&skb_probe;
+        u8 *ct = (u8 *)&skb_probe;
        unsigned int off;
        for (off = 0; off < sizeof(struct sk_buff); off++) {
@@ -783,46 +795,62 @@ static int build_body(struct jit_ctx *ctx)
        u32 k, b_off __maybe_unused;
        for (i = 0; i < prog->len; i++) {
+                u16 code;
                inst = &(prog->insns[i]);
                pr_debug("%s: code->0x%02x, jt->0x%x, jf->0x%x, k->0x%x\n",
                         __func__, inst->code, inst->jt, inst->jf, inst->k);
                k = inst->k;
+                code = bpf_anc_helper(inst);
                if (ctx->target == NULL)
                        ctx->offsets[i] = ctx->idx * 4;
-                switch (inst->code) {
+                switch (code) {
-                case BPF_S_LD_IMM:
+                case BPF_LD | BPF_IMM:
                        /* A <- k ==> li r_A, k */
                        ctx->flags |= SEEN_A;
                        emit_load_imm(r_A, k, ctx);
                        break;
-                case BPF_S_LD_W_LEN:
+                case BPF_LD | BPF_W | BPF_LEN:
                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, len) != 4);
                        /* A <- len ==> lw r_A, offset(skb) */
                        ctx->flags |= SEEN_SKB | SEEN_A;
                        off = offsetof(struct sk_buff, len);
                        emit_load(r_A, r_skb, off, ctx);
                        break;
-                case BPF_S_LD_MEM:
+                case BPF_LD | BPF_MEM:
                        /* A <- M[k] ==> lw r_A, offset(M) */
                        ctx->flags |= SEEN_MEM | SEEN_A;
                        emit_load(r_A, r_M, SCRATCH_OFF(k), ctx);
                        break;
-                case BPF_S_LD_W_ABS:
+                case BPF_LD | BPF_W | BPF_ABS:
                        /* A <- P[k:4] */
                        load_order = 2;
                        goto load;
-                case BPF_S_LD_H_ABS:
+                case BPF_LD | BPF_H | BPF_ABS:
                        /* A <- P[k:2] */
                        load_order = 1;
                        goto load;
-                case BPF_S_LD_B_ABS:
+                case BPF_LD | BPF_B | BPF_ABS:
                        /* A <- P[k:1] */
                        load_order = 0;
 load:
+                        /* the interpreter will deal with the negative K */
+                        if ((int)k < 0)
+                                return -ENOTSUPP;
                        emit_load_imm(r_off, k, ctx);
 load_common:
+                        /*
+                         * We may got here from the indirect loads so
+                         * return if offset is negative.
+                         */
+                        emit_slt(r_s0, r_off, r_zero, ctx);
+                        emit_bcond(MIPS_COND_NE, r_s0, r_zero,
+                                   b_imm(prog->len, ctx), ctx);
+                        emit_reg_move(r_ret, r_zero, ctx);
                        ctx->flags |= SEEN_CALL | SEEN_OFF | SEEN_S0 |
                                SEEN_SKB | SEEN_A;
@@ -852,39 +880,42 @@ load_common:
                        emit_b(b_imm(prog->len, ctx), ctx);
                        emit_reg_move(r_ret, r_zero, ctx);
                        break;
-                case BPF_S_LD_W_IND:
+                case BPF_LD | BPF_W | BPF_IND:
                        /* A <- P[X + k:4] */
                        load_order = 2;
                        goto load_ind;
-                case BPF_S_LD_H_IND:
+                case BPF_LD | BPF_H | BPF_IND:
                        /* A <- P[X + k:2] */
                        load_order = 1;
                        goto load_ind;
-                case BPF_S_LD_B_IND:
+                case BPF_LD | BPF_B | BPF_IND:
                        /* A <- P[X + k:1] */
                        load_order = 0;
 load_ind:
-                        update_on_xread(ctx);
                        ctx->flags |= SEEN_OFF | SEEN_X;
                        emit_addiu(r_off, r_X, k, ctx);
                        goto load_common;
-                case BPF_S_LDX_IMM:
+                case BPF_LDX | BPF_IMM:
                        /* X <- k */
                        ctx->flags |= SEEN_X;
                        emit_load_imm(r_X, k, ctx);
                        break;
-                case BPF_S_LDX_MEM:
+                case BPF_LDX | BPF_MEM:
                        /* X <- M[k] */
                        ctx->flags |= SEEN_X | SEEN_MEM;
                        emit_load(r_X, r_M, SCRATCH_OFF(k), ctx);
                        break;
-                case BPF_S_LDX_W_LEN:
+                case BPF_LDX | BPF_W | BPF_LEN:
                        /* X <- len */
                        ctx->flags |= SEEN_X | SEEN_SKB;
                        off = offsetof(struct sk_buff, len);
                        emit_load(r_X, r_skb, off, ctx);
                        break;
-                case BPF_S_LDX_B_MSH:
+                case BPF_LDX | BPF_B | BPF_MSH:
+                        /* the interpreter will deal with the negative K */
+                        if ((int)k < 0)
+                                return -ENOTSUPP;
                        /* X <- 4 * (P[k:1] & 0xf) */
                        ctx->flags |= SEEN_X | SEEN_CALL | SEEN_S0 | SEEN_SKB;
                        /* Load offset to a1 */
@@ -917,50 +948,49 @@ load_ind:
                        emit_b(b_imm(prog->len, ctx), ctx);
                        emit_load_imm(r_ret, 0, ctx); /* delay slot */
                        break;
-                case BPF_S_ST:
+                case BPF_ST:
                        /* M[k] <- A */
                        ctx->flags |= SEEN_MEM | SEEN_A;
                        emit_store(r_A, r_M, SCRATCH_OFF(k), ctx);
                        break;
-                case BPF_S_STX:
+                case BPF_STX:
                        /* M[k] <- X */
                        ctx->flags |= SEEN_MEM | SEEN_X;
                        emit_store(r_X, r_M, SCRATCH_OFF(k), ctx);
                        break;
-                case BPF_S_ALU_ADD_K:
+                case BPF_ALU | BPF_ADD | BPF_K:
                        /* A += K */
                        ctx->flags |= SEEN_A;
                        emit_addiu(r_A, r_A, k, ctx);
                        break;
-                case BPF_S_ALU_ADD_X:
+                case BPF_ALU | BPF_ADD | BPF_X:
                        /* A += X */
                        ctx->flags |= SEEN_A | SEEN_X;
                        emit_addu(r_A, r_A, r_X, ctx);
                        break;
-                case BPF_S_ALU_SUB_K:
+                case BPF_ALU | BPF_SUB | BPF_K:
                        /* A -= K */
                        ctx->flags |= SEEN_A;
                        emit_addiu(r_A, r_A, -k, ctx);
                        break;
-                case BPF_S_ALU_SUB_X:
+                case BPF_ALU | BPF_SUB | BPF_X:
                        /* A -= X */
                        ctx->flags |= SEEN_A | SEEN_X;
                        emit_subu(r_A, r_A, r_X, ctx);
                        break;
-                case BPF_S_ALU_MUL_K:
+                case BPF_ALU | BPF_MUL | BPF_K:
                        /* A *= K */
                        /* Load K to scratch register before MUL */
                        ctx->flags |= SEEN_A | SEEN_S0;
                        emit_load_imm(r_s0, k, ctx);
                        emit_mul(r_A, r_A, r_s0, ctx);
                        break;
-                case BPF_S_ALU_MUL_X:
+                case BPF_ALU | BPF_MUL | BPF_X:
                        /* A *= X */
-                        update_on_xread(ctx);
                        ctx->flags |= SEEN_A | SEEN_X;
                        emit_mul(r_A, r_A, r_X, ctx);
                        break;
-                case BPF_S_ALU_DIV_K:
+                case BPF_ALU | BPF_DIV | BPF_K:
                        /* A /= k */
                        if (k == 1)
                                break;
@@ -973,7 +1003,7 @@ load_ind:
                        emit_load_imm(r_s0, k, ctx);
                        emit_div(r_A, r_s0, ctx);
                        break;
-                case BPF_S_ALU_MOD_K:
+                case BPF_ALU | BPF_MOD | BPF_K:
                        /* A %= k */
                        if (k == 1 || optimize_div(&k)) {
                                ctx->flags |= SEEN_A;
@@ -984,9 +1014,8 @@ load_ind:
                                emit_mod(r_A, r_s0, ctx);
                        }
                        break;
-                case BPF_S_ALU_DIV_X:
+                case BPF_ALU | BPF_DIV | BPF_X:
                        /* A /= X */
-                        update_on_xread(ctx);
                        ctx->flags |= SEEN_X | SEEN_A;
                        /* Check if r_X is zero */
                        emit_bcond(MIPS_COND_EQ, r_X, r_zero,
@@ -994,9 +1023,8 @@ load_ind:
                        emit_load_imm(r_val, 0, ctx); /* delay slot */
                        emit_div(r_A, r_X, ctx);
                        break;
-                case BPF_S_ALU_MOD_X:
+                case BPF_ALU | BPF_MOD | BPF_X:
                        /* A %= X */
-                        update_on_xread(ctx);
                        ctx->flags |= SEEN_X | SEEN_A;
                        /* Check if r_X is zero */
                        emit_bcond(MIPS_COND_EQ, r_X, r_zero,
@@ -1004,94 +1032,89 @@ load_ind:
                        emit_load_imm(r_val, 0, ctx); /* delay slot */
                        emit_mod(r_A, r_X, ctx);
                        break;
-                case BPF_S_ALU_OR_K:
+                case BPF_ALU | BPF_OR | BPF_K:
                        /* A |= K */
                        ctx->flags |= SEEN_A;
                        emit_ori(r_A, r_A, k, ctx);
                        break;
-                case BPF_S_ALU_OR_X:
+                case BPF_ALU | BPF_OR | BPF_X:
                        /* A |= X */
-                        update_on_xread(ctx);
                        ctx->flags |= SEEN_A;
                        emit_ori(r_A, r_A, r_X, ctx);
                        break;
-                case BPF_S_ALU_XOR_K:
+                case BPF_ALU | BPF_XOR | BPF_K:
                        /* A ^= k */
                        ctx->flags |= SEEN_A;
                        emit_xori(r_A, r_A, k, ctx);
                        break;
-                case BPF_S_ANC_ALU_XOR_X:
+                case BPF_ANC | SKF_AD_ALU_XOR_X:
-                case BPF_S_ALU_XOR_X:
+                case BPF_ALU | BPF_XOR | BPF_X:
                        /* A ^= X */
-                        update_on_xread(ctx);
                        ctx->flags |= SEEN_A;
                        emit_xor(r_A, r_A, r_X, ctx);
                        break;
-                case BPF_S_ALU_AND_K:
+                case BPF_ALU | BPF_AND | BPF_K:
                        /* A &= K */
                        ctx->flags |= SEEN_A;
                        emit_andi(r_A, r_A, k, ctx);
                        break;
-                case BPF_S_ALU_AND_X:
+                case BPF_ALU | BPF_AND | BPF_X:
                        /* A &= X */
-                        update_on_xread(ctx);
                        ctx->flags |= SEEN_A | SEEN_X;
                        emit_and(r_A, r_A, r_X, ctx);
                        break;
-                case BPF_S_ALU_LSH_K:
+                case BPF_ALU | BPF_LSH | BPF_K:
                        /* A <<= K */
                        ctx->flags |= SEEN_A;
                        emit_sll(r_A, r_A, k, ctx);
                        break;
-                case BPF_S_ALU_LSH_X:
+                case BPF_ALU | BPF_LSH | BPF_X:
                        /* A <<= X */
                        ctx->flags |= SEEN_A | SEEN_X;
-                        update_on_xread(ctx);
                        emit_sllv(r_A, r_A, r_X, ctx);
                        break;
-                case BPF_S_ALU_RSH_K:
+                case BPF_ALU | BPF_RSH | BPF_K:
                        /* A >>= K */
                        ctx->flags |= SEEN_A;
                        emit_srl(r_A, r_A, k, ctx);
                        break;
-                case BPF_S_ALU_RSH_X:
+                case BPF_ALU | BPF_RSH | BPF_X:
                        ctx->flags |= SEEN_A | SEEN_X;
-                        update_on_xread(ctx);
                        emit_srlv(r_A, r_A, r_X, ctx);
                        break;
-                case BPF_S_ALU_NEG:
+                case BPF_ALU | BPF_NEG:
                        /* A = -A */
                        ctx->flags |= SEEN_A;
                        emit_neg(r_A, ctx);
                        break;
-                case BPF_S_JMP_JA:
+                case BPF_JMP | BPF_JA:
                        /* pc += K */
                        emit_b(b_imm(i + k + 1, ctx), ctx);
                        emit_nop(ctx);
                        break;
-                case BPF_S_JMP_JEQ_K:
+                case BPF_JMP | BPF_JEQ | BPF_K:
                        /* pc += ( A == K ) ? pc->jt : pc->jf */
                        condt = MIPS_COND_EQ | MIPS_COND_K;
                        goto jmp_cmp;
-                case BPF_S_JMP_JEQ_X:
+                case BPF_JMP | BPF_JEQ | BPF_X:
                        ctx->flags |= SEEN_X;
                        /* pc += ( A == X ) ? pc->jt : pc->jf */
                        condt = MIPS_COND_EQ | MIPS_COND_X;
                        goto jmp_cmp;
-                case BPF_S_JMP_JGE_K:
+                case BPF_JMP | BPF_JGE | BPF_K:
                        /* pc += ( A >= K ) ? pc->jt : pc->jf */
                        condt = MIPS_COND_GE | MIPS_COND_K;
                        goto jmp_cmp;
-                case BPF_S_JMP_JGE_X:
+                case BPF_JMP | BPF_JGE | BPF_X:
                        ctx->flags |= SEEN_X;
                        /* pc += ( A >= X ) ? pc->jt : pc->jf */
                        condt = MIPS_COND_GE | MIPS_COND_X;
                        goto jmp_cmp;
-                case BPF_S_JMP_JGT_K:
+                case BPF_JMP | BPF_JGT | BPF_K:
                        /* pc += ( A > K ) ? pc->jt : pc->jf */
                        condt = MIPS_COND_GT | MIPS_COND_K;
                        goto jmp_cmp;
-                case BPF_S_JMP_JGT_X:
+                case BPF_JMP | BPF_JGT | BPF_X:
                        ctx->flags |= SEEN_X;
                        /* pc += ( A > X ) ? pc->jt : pc->jf */
                        condt = MIPS_COND_GT | MIPS_COND_X;
@@ -1109,7 +1132,7 @@ jmp_cmp:
                                }
                                /* A < (K|X) ? r_scrach = 1 */
                                b_off = b_imm(i + inst->jf + 1, ctx);
-                                emit_bcond(MIPS_COND_GT, r_s0, r_zero, b_off,
+                                emit_bcond(MIPS_COND_NE, r_s0, r_zero, b_off,
                                           ctx);
                                emit_nop(ctx);
                                /* A > (K|X) ? scratch = 0 */
@@ -1167,7 +1190,7 @@ jmp_cmp:
                                }
                        }
                        break;
-                case BPF_S_JMP_JSET_K:
+                case BPF_JMP | BPF_JSET | BPF_K:
                        ctx->flags |= SEEN_S0 | SEEN_S1 | SEEN_A;
                        /* pc += (A & K) ? pc -> jt : pc -> jf */
                        emit_load_imm(r_s1, k, ctx);
@@ -1181,7 +1204,7 @@ jmp_cmp:
                        emit_b(b_off, ctx);
                        emit_nop(ctx);
                        break;
-                case BPF_S_JMP_JSET_X:
+                case BPF_JMP | BPF_JSET | BPF_X:
                        ctx->flags |= SEEN_S0 | SEEN_X | SEEN_A;
                        /* pc += (A & X) ? pc -> jt : pc -> jf */
                        emit_and(r_s0, r_A, r_X, ctx);
@@ -1194,7 +1217,7 @@ jmp_cmp:
                        emit_b(b_off, ctx);
                        emit_nop(ctx);
                        break;
-                case BPF_S_RET_A:
+                case BPF_RET | BPF_A:
                        ctx->flags |= SEEN_A;
                        if (i != prog->len - 1)
                                /*
@@ -1204,7 +1227,7 @@ jmp_cmp:
                                emit_b(b_imm(prog->len, ctx), ctx);
                        emit_reg_move(r_ret, r_A, ctx); /* delay slot */
                        break;
-                case BPF_S_RET_K:
+                case BPF_RET | BPF_K:
                        /*
                         * It can emit two instructions so it does not fit on
                         * the delay slot.
@@ -1219,19 +1242,18 @@ jmp_cmp:
                                emit_nop(ctx);
                        }
                        break;
-                case BPF_S_MISC_TAX:
+                case BPF_MISC | BPF_TAX:
                        /* X = A */
                        ctx->flags |= SEEN_X | SEEN_A;
                        emit_jit_reg_move(r_X, r_A, ctx);
                        break;
-                case BPF_S_MISC_TXA:
+                case BPF_MISC | BPF_TXA:
                        /* A = X */
                        ctx->flags |= SEEN_A | SEEN_X;
-                        update_on_xread(ctx);
                        emit_jit_reg_move(r_A, r_X, ctx);
                        break;
                /* AUX */
-                case BPF_S_ANC_PROTOCOL:
+                case BPF_ANC | SKF_AD_PROTOCOL:
                        /* A = ntohs(skb->protocol */
                        ctx->flags |= SEEN_SKB | SEEN_OFF | SEEN_A;
                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,
@@ -1256,7 +1278,7 @@ jmp_cmp:
                        }
 #endif
                        break;
-                case BPF_S_ANC_CPU:
+                case BPF_ANC | SKF_AD_CPU:
                        ctx->flags |= SEEN_A | SEEN_OFF;
                        /* A = current_thread_info()->cpu */
                        BUILD_BUG_ON(FIELD_SIZEOF(struct thread_info,
@@ -1265,11 +1287,12 @@ jmp_cmp:
                        /* $28/gp points to the thread_info struct */
                        emit_load(r_A, 28, off, ctx);
                        break;
-                case BPF_S_ANC_IFINDEX:
+                case BPF_ANC | SKF_AD_IFINDEX:
                        /* A = skb->dev->ifindex */
                        ctx->flags |= SEEN_SKB | SEEN_A | SEEN_S0;
                        off = offsetof(struct sk_buff, dev);
-                        emit_load(r_s0, r_skb, off, ctx);
+                        /* Load *dev pointer */
+                        emit_load_ptr(r_s0, r_skb, off, ctx);
                        /* error (0) in the delay slot */
                        emit_bcond(MIPS_COND_EQ, r_s0, r_zero,
                                   b_imm(prog->len, ctx), ctx);
@@ -1279,31 +1302,36 @@ jmp_cmp:
                        off = offsetof(struct net_device, ifindex);
                        emit_load(r_A, r_s0, off, ctx);
                        break;
-                case BPF_S_ANC_MARK:
+                case BPF_ANC | SKF_AD_MARK:
                        ctx->flags |= SEEN_SKB | SEEN_A;
                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, mark) != 4);
                        off = offsetof(struct sk_buff, mark);
                        emit_load(r_A, r_skb, off, ctx);
                        break;
-                case BPF_S_ANC_RXHASH:
+                case BPF_ANC | SKF_AD_RXHASH:
                        ctx->flags |= SEEN_SKB | SEEN_A;
                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4);
                        off = offsetof(struct sk_buff, hash);
                        emit_load(r_A, r_skb, off, ctx);
                        break;
-                case BPF_S_ANC_VLAN_TAG:
+                case BPF_ANC | SKF_AD_VLAN_TAG:
-                case BPF_S_ANC_VLAN_TAG_PRESENT:
+                case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:
                        ctx->flags |= SEEN_SKB | SEEN_S0 | SEEN_A;
                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,
                                                  vlan_tci) != 2);
                        off = offsetof(struct sk_buff, vlan_tci);
                        emit_half_load(r_s0, r_skb, off, ctx);
-                        if (inst->code == BPF_S_ANC_VLAN_TAG)
+                        if (code == (BPF_ANC | SKF_AD_VLAN_TAG)) {
-                                emit_and(r_A, r_s0, VLAN_VID_MASK, ctx);
+                                emit_andi(r_A, r_s0, (u16)~VLAN_TAG_PRESENT, ctx);
-                        else
+                        } else {
-                                emit_and(r_A, r_s0, VLAN_TAG_PRESENT, ctx);
+                                emit_andi(r_A, r_s0, VLAN_TAG_PRESENT, ctx);
+                                /* return 1 if present */
+                                emit_sltu(r_A, r_zero, r_A, ctx);
+                        }
                        break;
-                case BPF_S_ANC_PKTTYPE:
+                case BPF_ANC | SKF_AD_PKTTYPE:
+                        ctx->flags |= SEEN_SKB;
                        off = pkt_type_offset();
                        if (off < 0)
@@ -1311,8 +1339,12 @@ jmp_cmp:
                        emit_load_byte(r_tmp, r_skb, off, ctx);
                        /* Keep only the last 3 bits */
                        emit_andi(r_A, r_tmp, PKT_TYPE_MAX, ctx);
+#ifdef __BIG_ENDIAN_BITFIELD
+                        /* Get the actual packet type to the lower 3 bits */
+                        emit_srl(r_A, r_A, 5, ctx);
+#endif
                        break;
-                case BPF_S_ANC_QUEUE:
+                case BPF_ANC | SKF_AD_QUEUE:
                        ctx->flags |= SEEN_SKB | SEEN_A;
                        BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,
                                                  queue_mapping) != 2);
@@ -1322,8 +1354,8 @@ jmp_cmp:
                        emit_half_load(r_A, r_skb, off, ctx);
                        break;
                default:
-                        pr_warn("%s: Unhandled opcode: 0x%02x\n", __FILE__,
+                        pr_debug("%s: Unhandled opcode: 0x%02x\n", __FILE__,
-                                inst->code);
+                                 inst->code);
                        return -1;
                }
        }
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 790352f93700..35d16bd2760b 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -303,7 +303,6 @@ config PPC_EARLY_DEBUG_OPAL_VTERMNO
          This correspond to which /dev/hvcN you want to use for early
          debug.
-          On OPAL v1 (takeover) this should always be 0
          On OPAL v2, this will be 0 for network console and 1 or 2 for
          the machine built-in serial ports.
diff --git a/arch/powerpc/include/asm/code-patching.h b/arch/powerpc/include/asm/code-patching.h
index 37991e154ef8..840a5509b3f1 100644
--- a/arch/powerpc/include/asm/code-patching.h
+++ b/arch/powerpc/include/asm/code-patching.h
@@ -88,4 +88,15 @@ static inline unsigned long ppc_function_entry(void *func)
 #endif
 }
+static inline unsigned long ppc_global_function_entry(void *func)
+{
+#if defined(CONFIG_PPC64) && defined(_CALL_ELF) && _CALL_ELF == 2
+        /* PPC64 ABIv2 the global entry point is at the address */
+        return (unsigned long)func;
+#else
+        /* All other cases there is no change vs ppc_function_entry() */
+        return ppc_function_entry(func);
+#endif
+}
 #endif /* _ASM_POWERPC_CODE_PATCHING_H */
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index 460018889ba9..0da1dbd42e02 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -12,27 +12,7 @@
 #ifndef __OPAL_H
 #define __OPAL_H
-/****** Takeover interface ********/
-/* PAPR H-Call used to querty the HAL existence and/or instanciate
- * it from within pHyp (tech preview only).
- *
- * This is exclusively used in prom_init.c
- */
 #ifndef __ASSEMBLY__
-struct opal_takeover_args {
-        u64     k_image;                /* r4 */
-        u64     k_size;                 /* r5 */
-        u64     k_entry;                /* r6 */
-        u64     k_entry2;               /* r7 */
-        u64     hal_addr;               /* r8 */
-        u64     rd_image;               /* r9 */
-        u64     rd_size;                /* r10 */
-        u64     rd_loc;                 /* r11 */
-};
 /*
 * SG entry
 *
@@ -55,15 +35,6 @@ struct opal_sg_list {
 /* We calculate number of sg entries based on PAGE_SIZE */
 #define SG_ENTRIES_PER_NODE ((PAGE_SIZE - 16) / sizeof(struct opal_sg_entry))
-extern long opal_query_takeover(u64 *hal_size, u64 *hal_align);
-extern long opal_do_takeover(struct opal_takeover_args *args);
-struct rtas_args;
-extern int opal_enter_rtas(struct rtas_args *args,
-                           unsigned long data,
-                           unsigned long entry);
 #endif /* __ASSEMBLY__ */
 /****** OPAL APIs ******/
diff --git a/arch/powerpc/include/asm/swab.h b/arch/powerpc/include/asm/swab.h
index b9bd1ca944d0..96f59de61855 100644
--- a/arch/powerpc/include/asm/swab.h
+++ b/arch/powerpc/include/asm/swab.h
@@ -9,10 +9,6 @@
 #include <uapi/asm/swab.h>
-#ifdef __GNUC__
-#ifndef __powerpc64__
-#endif /* __powerpc64__ */
 static __inline__ __u16 ld_le16(const volatile __u16 *addr)
 {
        __u16 val;
@@ -20,19 +16,12 @@ static __inline__ __u16 ld_le16(const volatile __u16 *addr)
        __asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (addr), "m" (*addr));
        return val;
 }
-#define __arch_swab16p ld_le16
 static __inline__ void st_le16(volatile __u16 *addr, const __u16 val)
 {
        __asm__ __volatile__ ("sthbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
 }
-static inline void __arch_swab16s(__u16 *addr)
-{
-        st_le16(addr, *addr);
-}
-#define __arch_swab16s __arch_swab16s
 static __inline__ __u32 ld_le32(const volatile __u32 *addr)
 {
        __u32 val;
@@ -40,42 +29,10 @@ static __inline__ __u32 ld_le32(const volatile __u32 *addr)
        __asm__ __volatile__ ("lwbrx %0,0,%1" : "=r" (val) : "r" (addr), "m" (*addr));
        return val;
 }
-#define __arch_swab32p ld_le32
 static __inline__ void st_le32(volatile __u32 *addr, const __u32 val)
 {
        __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
 }
-static inline void __arch_swab32s(__u32 *addr)
-{
-        st_le32(addr, *addr);
-}
-#define __arch_swab32s __arch_swab32s
-static inline __attribute_const__ __u16 __arch_swab16(__u16 value)
-{
-        __u16 result;
-        __asm__("rlwimi %0,%1,8,16,23"
-            : "=r" (result)
-            : "r" (value), "0" (value >> 8));
-        return result;
-}
-#define __arch_swab16 __arch_swab16
-static inline __attribute_const__ __u32 __arch_swab32(__u32 value)
-{
-        __u32 result;
-        __asm__("rlwimi %0,%1,24,16,23\n\t"
-            "rlwimi %0,%1,8,8,15\n\t"
-            "rlwimi %0,%1,24,0,7"
-            : "=r" (result)
-            : "r" (value), "0" (value >> 24));
-        return result;
-}
-#define __arch_swab32 __arch_swab32
-#endif /* __GNUC__ */
 #endif /* _ASM_POWERPC_SWAB_H */
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index f202d0731b06..d178834fe508 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -10,6 +10,8 @@
 *
 */
+#define pr_fmt(fmt) "ftrace-powerpc: " fmt
 #include <linux/spinlock.h>
 #include <linux/hardirq.h>
 #include <linux/uaccess.h>
@@ -105,7 +107,7 @@ __ftrace_make_nop(struct module *mod,
                  struct dyn_ftrace *rec, unsigned long addr)
 {
        unsigned int op;
-        unsigned long ptr;
+        unsigned long entry, ptr;
        unsigned long ip = rec->ip;
        void *tramp;
@@ -115,7 +117,7 @@ __ftrace_make_nop(struct module *mod,
        /* Make sure that that this is still a 24bit jump */
        if (!is_bl_op(op)) {
-                printk(KERN_ERR "Not expected bl: opcode is %x\n", op);
+                pr_err("Not expected bl: opcode is %x\n", op);
                return -EINVAL;
        }
@@ -125,21 +127,21 @@ __ftrace_make_nop(struct module *mod,
        pr_devel("ip:%lx jumps to %p", ip, tramp);
        if (!is_module_trampoline(tramp)) {
-                printk(KERN_ERR "Not a trampoline\n");
+                pr_err("Not a trampoline\n");
                return -EINVAL;
        }
        if (module_trampoline_target(mod, tramp, &ptr)) {
-                printk(KERN_ERR "Failed to get trampoline target\n");
+                pr_err("Failed to get trampoline target\n");
                return -EFAULT;
        }
        pr_devel("trampoline target %lx", ptr);
+        entry = ppc_global_function_entry((void *)addr);
        /* This should match what was called */
-        if (ptr != ppc_function_entry((void *)addr)) {
+        if (ptr != entry) {
-                printk(KERN_ERR "addr %lx does not match expected %lx\n",
+                pr_err("addr %lx does not match expected %lx\n", ptr, entry);
-                        ptr, ppc_function_entry((void *)addr));
                return -EINVAL;
        }
@@ -179,7 +181,7 @@ __ftrace_make_nop(struct module *mod,
        /* Make sure that that this is still a 24bit jump */
        if (!is_bl_op(op)) {
-                printk(KERN_ERR "Not expected bl: opcode is %x\n", op);
+                pr_err("Not expected bl: opcode is %x\n", op);
                return -EINVAL;
        }
@@ -198,7 +200,7 @@ __ftrace_make_nop(struct module *mod,
        /* Find where the trampoline jumps to */
        if (probe_kernel_read(jmp, (void *)tramp, sizeof(jmp))) {
-                printk(KERN_ERR "Failed to read %lx\n", tramp);
+                pr_err("Failed to read %lx\n", tramp);
                return -EFAULT;
        }
@@ -209,7 +211,7 @@ __ftrace_make_nop(struct module *mod,
            ((jmp[1] & 0xffff0000) != 0x398c0000) ||
            (jmp[2] != 0x7d8903a6) ||
            (jmp[3] != 0x4e800420)) {
-                printk(KERN_ERR "Not a trampoline\n");
+                pr_err("Not a trampoline\n");
                return -EINVAL;
        }
@@ -221,8 +223,7 @@ __ftrace_make_nop(struct module *mod,
        pr_devel(" %lx ", tramp);
        if (tramp != addr) {
-                printk(KERN_ERR
+                pr_err("Trampoline location %08lx does not match addr\n",
-                       "Trampoline location %08lx does not match addr\n",
                       tramp);
                return -EINVAL;
        }
@@ -263,15 +264,13 @@ int ftrace_make_nop(struct module *mod,
         */
        if (!rec->arch.mod) {
                if (!mod) {
-                        printk(KERN_ERR "No module loaded addr=%lx\n",
+                        pr_err("No module loaded addr=%lx\n", addr);
-                               addr);
                        return -EFAULT;
                }
                rec->arch.mod = mod;
        } else if (mod) {
                if (mod != rec->arch.mod) {
-                        printk(KERN_ERR
+                        pr_err("Record mod %p not equal to passed in mod %p\n",
-                               "Record mod %p not equal to passed in mod %p\n",
                               rec->arch.mod, mod);
                        return -EINVAL;
                }
@@ -307,26 +306,25 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
         * The load offset is different depending on the ABI. For simplicity
         * just mask it out when doing the compare.
         */
-        if ((op[0] != 0x48000008) || ((op[1] & 0xffff00000) != 0xe8410000)) {
+        if ((op[0] != 0x48000008) || ((op[1] & 0xffff0000) != 0xe8410000)) {
-                printk(KERN_ERR "Unexpected call sequence: %x %x\n",
+                pr_err("Unexpected call sequence: %x %x\n", op[0], op[1]);
-                        op[0], op[1]);
                return -EINVAL;
        }
        /* If we never set up a trampoline to ftrace_caller, then bail */
        if (!rec->arch.mod->arch.tramp) {
-                printk(KERN_ERR "No ftrace trampoline\n");
+                pr_err("No ftrace trampoline\n");
                return -EINVAL;
        }
        /* Ensure branch is within 24 bits */
-        if (create_branch(ip, rec->arch.mod->arch.tramp, BRANCH_SET_LINK)) {
+        if (!create_branch(ip, rec->arch.mod->arch.tramp, BRANCH_SET_LINK)) {
-                printk(KERN_ERR "Branch out of range");
+                pr_err("Branch out of range\n");
                return -EINVAL;
        }
        if (patch_branch(ip, rec->arch.mod->arch.tramp, BRANCH_SET_LINK)) {
-                printk(KERN_ERR "REL24 out of range!\n");
+                pr_err("REL24 out of range!\n");
                return -EINVAL;
        }
@@ -345,13 +343,13 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
        /* It should be pointing to a nop */
        if (op != PPC_INST_NOP) {
-                printk(KERN_ERR "Expected NOP but have %x\n", op);
+                pr_err("Expected NOP but have %x\n", op);
                return -EINVAL;
        }
        /* If we never set up a trampoline to ftrace_caller, then bail */
        if (!rec->arch.mod->arch.tramp) {
-                printk(KERN_ERR "No ftrace trampoline\n");
+                pr_err("No ftrace trampoline\n");
                return -EINVAL;
        }
@@ -359,7 +357,7 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
        op = create_branch((unsigned int *)ip,
                           rec->arch.mod->arch.tramp, BRANCH_SET_LINK);
        if (!op) {
-                printk(KERN_ERR "REL24 out of range!\n");
+                pr_err("REL24 out of range!\n");
                return -EINVAL;
        }
@@ -397,7 +395,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
         * already have a module defined.
         */
        if (!rec->arch.mod) {
-                printk(KERN_ERR "No module loaded\n");
+                pr_err("No module loaded\n");
                return -EINVAL;
        }
diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c
index b82227e7e21b..12e48d56f771 100644
--- a/arch/powerpc/kernel/iomap.c
+++ b/arch/powerpc/kernel/iomap.c
@@ -23,7 +23,7 @@ unsigned int ioread16(void __iomem *addr)
 }
 unsigned int ioread16be(void __iomem *addr)
 {
-        return in_be16(addr);
+        return readw_be(addr);
 }
 unsigned int ioread32(void __iomem *addr)
 {
@@ -31,7 +31,7 @@ unsigned int ioread32(void __iomem *addr)
 }
 unsigned int ioread32be(void __iomem *addr)
 {
-        return in_be32(addr);
+        return readl_be(addr);
 }
 EXPORT_SYMBOL(ioread8);
 EXPORT_SYMBOL(ioread16);
@@ -49,7 +49,7 @@ void iowrite16(u16 val, void __iomem *addr)
 }
 void iowrite16be(u16 val, void __iomem *addr)
 {
-        out_be16(addr, val);
+        writew_be(val, addr);
 }
 void iowrite32(u32 val, void __iomem *addr)
 {
@@ -57,7 +57,7 @@ void iowrite32(u32 val, void __iomem *addr)
 }
 void iowrite32be(u32 val, void __iomem *addr)
 {
-        out_be32(addr, val);
+        writel_be(val, addr);
 }
 EXPORT_SYMBOL(iowrite8);
 EXPORT_SYMBOL(iowrite16);
@@ -75,15 +75,15 @@ EXPORT_SYMBOL(iowrite32be);
 */
 void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
 {
-        _insb((u8 __iomem *) addr, dst, count);
+        readsb(addr, dst, count);
 }
 void ioread16_rep(void __iomem *addr, void *dst, unsigned long count)
 {
-        _insw_ns((u16 __iomem *) addr, dst, count);
+        readsw(addr, dst, count);
 }
 void ioread32_rep(void __iomem *addr, void *dst, unsigned long count)
 {
-        _insl_ns((u32 __iomem *) addr, dst, count);
+        readsl(addr, dst, count);
 }
 EXPORT_SYMBOL(ioread8_rep);
 EXPORT_SYMBOL(ioread16_rep);
@@ -91,15 +91,15 @@ EXPORT_SYMBOL(ioread32_rep);
 void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count)
 {
-        _outsb((u8 __iomem *) addr, src, count);
+        writesb(addr, src, count);
 }
 void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count)
 {
-        _outsw_ns((u16 __iomem *) addr, src, count);
+        writesw(addr, src, count);
 }
 void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count)
 {
-        _outsl_ns((u32 __iomem *) addr, src, count);
+        writesl(addr, src, count);
 }
 EXPORT_SYMBOL(iowrite8_rep);
 EXPORT_SYMBOL(iowrite16_rep);
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 90fab64d911d..2f72af82513c 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/kdebug.h>
 #include <linux/slab.h>
+#include <asm/code-patching.h>
 #include <asm/cacheflush.h>
 #include <asm/sstep.h>
 #include <asm/uaccess.h>
@@ -491,12 +492,10 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
        return ret;
 }
-#ifdef CONFIG_PPC64
 unsigned long arch_deref_entry_point(void *entry)
 {
-        return ((func_descr_t *)entry)->entry;
+        return ppc_global_function_entry(entry);
 }
-#endif
 int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 {
@@ -508,8 +507,12 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
        /* setup return addr to the jprobe handler routine */
        regs->nip = arch_deref_entry_point(jp->entry);
 #ifdef CONFIG_PPC64
+#if defined(_CALL_ELF) && _CALL_ELF == 2
+        regs->gpr[12] = (unsigned long)jp->entry;
+#else
        regs->gpr[2] = (unsigned long)(((func_descr_t *)jp->entry)->toc);
 #endif
+#endif
        return 1;
 }
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
index 077d2ce6c5a7..d807ee626af9 100644
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@ -315,8 +315,17 @@ static void dedotify_versions(struct modversion_info *vers,
        struct modversion_info *end;
        for (end = (void *)vers + size; vers < end; vers++)
-                if (vers->name[0] == '.')
+                if (vers->name[0] == '.') {
                        memmove(vers->name, vers->name+1, strlen(vers->name));
+#ifdef ARCH_RELOCATES_KCRCTAB
+                        /* The TOC symbol has no CRC computed. To avoid CRC
+                         * check failing, we must force it to the expected
+                         * value (see CRC check in module.c).
+                         */
+                        if (!strcmp(vers->name, "TOC."))
+                                vers->crc = -(unsigned long)reloc_start;
+#endif
+                }
 }
 /* Undefined symbols which refer to .funcname, hack to funcname (or .TOC.) */
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 613a860a203c..b694b0730971 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -662,13 +662,6 @@ void __init early_init_devtree(void *params)
        of_scan_flat_dt(early_init_dt_scan_fw_dump, NULL);
 #endif
-        /* Pre-initialize the cmd_line with the content of boot_commmand_line,
-         * which will be empty except when the content of the variable has
-         * been overriden by a bootloading mechanism. This happens typically
-         * with HAL takeover
-         */
-        strlcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE);
        /* Retrieve various informations from the /chosen node of the
         * device-tree, including the platform type, initrd location and
         * size, TCE reserve, and more ...
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 078145acf7fb..1a85d8f96739 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -1268,201 +1268,6 @@ static u64 __initdata prom_opal_base;
 static u64 __initdata prom_opal_entry;
 #endif
-#ifdef __BIG_ENDIAN__
-/* XXX Don't change this structure without updating opal-takeover.S */
-static struct opal_secondary_data {
-        s64                             ack;    /*  0 */
-        u64                             go;     /*  8 */
-        struct opal_takeover_args       args;   /* 16 */
-} opal_secondary_data;
-static u64 __initdata prom_opal_align;
-static u64 __initdata prom_opal_size;
-static int __initdata prom_rtas_start_cpu;
-static u64 __initdata prom_rtas_data;
-static u64 __initdata prom_rtas_entry;
-extern char opal_secondary_entry;
-static void __init prom_query_opal(void)
-{
-        long rc;
-        /* We must not query for OPAL presence on a machine that
-         * supports TNK takeover (970 blades), as this uses the same
-         * h-call with different arguments and will crash
-         */
-        if (PHANDLE_VALID(call_prom("finddevice", 1, 1,
-                                    ADDR("/tnk-memory-map")))) {
-                prom_printf("TNK takeover detected, skipping OPAL check\n");
-                return;
-        }
-        prom_printf("Querying for OPAL presence... ");
-        rc = opal_query_takeover(&prom_opal_size,
-                                 &prom_opal_align);
-        prom_debug("(rc = %ld) ", rc);
-        if (rc != 0) {
-                prom_printf("not there.\n");
-                return;
-        }
-        of_platform = PLATFORM_OPAL;
-        prom_printf(" there !\n");
-        prom_debug("  opal_size  = 0x%lx\n", prom_opal_size);
-        prom_debug("  opal_align = 0x%lx\n", prom_opal_align);
-        if (prom_opal_align < 0x10000)
-                prom_opal_align = 0x10000;
-}
-static int __init prom_rtas_call(int token, int nargs, int nret,
-                                 int *outputs, ...)
-{
-        struct rtas_args rtas_args;
-        va_list list;
-        int i;
-        rtas_args.token = token;
-        rtas_args.nargs = nargs;
-        rtas_args.nret  = nret;
-        rtas_args.rets  = (rtas_arg_t *)&(rtas_args.args[nargs]);
-        va_start(list, outputs);
-        for (i = 0; i < nargs; ++i)
-                rtas_args.args[i] = va_arg(list, rtas_arg_t);
-        va_end(list);
-        for (i = 0; i < nret; ++i)
-                rtas_args.rets[i] = 0;
-        opal_enter_rtas(&rtas_args, prom_rtas_data,
-                        prom_rtas_entry);
-        if (nret > 1 && outputs != NULL)
-                for (i = 0; i < nret-1; ++i)
-                        outputs[i] = rtas_args.rets[i+1];
-        return (nret > 0)? rtas_args.rets[0]: 0;
-}
-static void __init prom_opal_hold_cpus(void)
-{
-        int i, cnt, cpu, rc;
-        long j;
-        phandle node;
-        char type[64];
-        u32 servers[8];
-        void *entry = (unsigned long *)&opal_secondary_entry;
-        struct opal_secondary_data *data = &opal_secondary_data;
-        prom_debug("prom_opal_hold_cpus: start...\n");
-        prom_debug("    - entry       = 0x%x\n", entry);
-        prom_debug("    - data        = 0x%x\n", data);
-        data->ack = -1;
-        data->go = 0;
-        /* look for cpus */
-        for (node = 0; prom_next_node(&node); ) {
-                type[0] = 0;
-                prom_getprop(node, "device_type", type, sizeof(type));
-                if (strcmp(type, "cpu") != 0)
-                        continue;
-                /* Skip non-configured cpus. */
-                if (prom_getprop(node, "status", type, sizeof(type)) > 0)
-                        if (strcmp(type, "okay") != 0)
-                                continue;
-                cnt = prom_getprop(node, "ibm,ppc-interrupt-server#s", servers,
-                             sizeof(servers));
-                if (cnt == PROM_ERROR)
-                        break;
-                cnt >>= 2;
-                for (i = 0; i < cnt; i++) {
-                        cpu = servers[i];
-                        prom_debug("CPU %d ... ", cpu);
-                        if (cpu == prom.cpu) {
-                                prom_debug("booted !\n");
-                                continue;
-                        }
-                        prom_debug("starting ... ");
-                        /* Init the acknowledge var which will be reset by
-                         * the secondary cpu when it awakens from its OF
-                         * spinloop.
-                         */
-                        data->ack = -1;
-                        rc = prom_rtas_call(prom_rtas_start_cpu, 3, 1,
-                                            NULL, cpu, entry, data);
-                        prom_debug("rtas rc=%d ...", rc);
-                        for (j = 0; j < 100000000 && data->ack == -1; j++) {
-                                HMT_low();
-                                mb();
-                        }
-                        HMT_medium();
-                        if (data->ack != -1)
-                                prom_debug("done, PIR=0x%x\n", data->ack);
-                        else
-                                prom_debug("timeout !\n");
-                }
-        }
-        prom_debug("prom_opal_hold_cpus: end...\n");
-}
-static void __init prom_opal_takeover(void)
-{
-        struct opal_secondary_data *data = &opal_secondary_data;
-        struct opal_takeover_args *args = &data->args;
-        u64 align = prom_opal_align;
-        u64 top_addr, opal_addr;
-        args->k_image   = (u64)_stext;
-        args->k_size    = _end - _stext;
-        args->k_entry   = 0;
-        args->k_entry2  = 0x60;
-        top_addr = _ALIGN_UP(args->k_size, align);
-        if (prom_initrd_start != 0) {
-                args->rd_image = prom_initrd_start;
-                args->rd_size = prom_initrd_end - args->rd_image;
-                args->rd_loc = top_addr;
-                top_addr = _ALIGN_UP(args->rd_loc + args->rd_size, align);
-        }
-        /* Pickup an address for the HAL. We want to go really high
-         * up to avoid problem with future kexecs. On the other hand
-         * we don't want to be all over the TCEs on P5IOC2 machines
-         * which are going to be up there too. We assume the machine
-         * has plenty of memory, and we ask for the HAL for now to
-         * be just below the 1G point, or above the initrd
-         */
-        opal_addr = _ALIGN_DOWN(0x40000000 - prom_opal_size, align);
-        if (opal_addr < top_addr)
-                opal_addr = top_addr;
-        args->hal_addr = opal_addr;
-        /* Copy the command line to the kernel image */
-        strlcpy(boot_command_line, prom_cmd_line,
-                COMMAND_LINE_SIZE);
-        prom_debug("  k_image    = 0x%lx\n", args->k_image);
-        prom_debug("  k_size     = 0x%lx\n", args->k_size);
-        prom_debug("  k_entry    = 0x%lx\n", args->k_entry);
-        prom_debug("  k_entry2   = 0x%lx\n", args->k_entry2);
-        prom_debug("  hal_addr   = 0x%lx\n", args->hal_addr);
-        prom_debug("  rd_image   = 0x%lx\n", args->rd_image);
-        prom_debug("  rd_size    = 0x%lx\n", args->rd_size);
-        prom_debug("  rd_loc     = 0x%lx\n", args->rd_loc);
-        prom_printf("Performing OPAL takeover,this can take a few minutes..\n");
-        prom_close_stdin();
-        mb();
-        data->go = 1;
-        for (;;)
-                opal_do_takeover(args);
-}
-#endif /* __BIG_ENDIAN__ */
 /*
 * Allocate room for and instantiate OPAL
 */
@@ -1597,12 +1402,6 @@ static void __init prom_instantiate_rtas(void)
                         &val, sizeof(val)) != PROM_ERROR)
                rtas_has_query_cpu_stopped = true;
-#if defined(CONFIG_PPC_POWERNV) && defined(__BIG_ENDIAN__)
-        /* PowerVN takeover hack */
-        prom_rtas_data = base;
-        prom_rtas_entry = entry;
-        prom_getprop(rtas_node, "start-cpu", &prom_rtas_start_cpu, 4);
-#endif
        prom_debug("rtas base     = 0x%x\n", base);
        prom_debug("rtas entry    = 0x%x\n", entry);
        prom_debug("rtas size     = 0x%x\n", (long)size);
@@ -3027,16 +2826,6 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
                prom_instantiate_rtas();
 #ifdef CONFIG_PPC_POWERNV
-#ifdef __BIG_ENDIAN__
-        /* Detect HAL and try instanciating it & doing takeover */
-        if (of_platform == PLATFORM_PSERIES_LPAR) {
-                prom_query_opal();
-                if (of_platform == PLATFORM_OPAL) {
-                        prom_opal_hold_cpus();
-                        prom_opal_takeover();
-                }
-        } else
-#endif /* __BIG_ENDIAN__ */
        if (of_platform == PLATFORM_OPAL)
                prom_instantiate_opal();
 #endif /* CONFIG_PPC_POWERNV */
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index 77aa1e95e904..fe8e54b9ef7d 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
@@ -21,9 +21,7 @@ _end enter_prom memcpy memset reloc_offset __secondary_hold
 __secondary_hold_acknowledge __secondary_hold_spinloop __start
 strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224
 reloc_got2 kernstart_addr memstart_addr linux_banner _stext
-opal_query_takeover opal_do_takeover opal_enter_rtas opal_secondary_entry
+__prom_init_toc_start __prom_init_toc_end btext_setup_display TOC."
-boot_command_line __prom_init_toc_start __prom_init_toc_end
-btext_setup_display TOC."
 NM="$1"
 OBJ="$2"
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index e239df3768ac..e5b022c55ccd 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -469,9 +469,17 @@ void __init smp_setup_cpu_maps(void)
                }
                for (j = 0; j < nthreads && cpu < nr_cpu_ids; j++) {
+                        bool avail;
                        DBG("    thread %d -> cpu %d (hard id %d)\n",
                            j, cpu, be32_to_cpu(intserv[j]));
-                        set_cpu_present(cpu, of_device_is_available(dn));
+                        avail = of_device_is_available(dn);
+                        if (!avail)
+                                avail = !of_property_match_string(dn,
+                                                "enable-method", "spin-table");
+                        set_cpu_present(cpu, avail);
                        set_hard_smp_processor_id(cpu, be32_to_cpu(intserv[j]));
                        set_cpu_possible(cpu, true);
                        cpu++;
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 4e47db686b5d..1bc5a1755ed4 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -54,7 +54,6 @@
 #include "signal.h"
-#undef DEBUG_SIG
 #ifdef CONFIG_PPC64
 #define sys_rt_sigreturn        compat_sys_rt_sigreturn
@@ -1063,10 +1062,6 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
        return 1;
 badframe:
-#ifdef DEBUG_SIG
-        printk("badframe in handle_rt_signal, regs=%p frame=%p newsp=%lx\n",
-               regs, frame, newsp);
-#endif
        if (show_unhandled_signals)
                printk_ratelimited(KERN_INFO
                                   "%s[%d]: bad frame in handle_rt_signal32: "
@@ -1484,10 +1479,6 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka,
        return 1;
 badframe:
-#ifdef DEBUG_SIG
-        printk("badframe in handle_signal, regs=%p frame=%p newsp=%lx\n",
-               regs, frame, newsp);
-#endif
        if (show_unhandled_signals)
                printk_ratelimited(KERN_INFO
                                   "%s[%d]: bad frame in handle_signal32: "
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index d501dc4dc3e6..97c1e4b683fc 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -38,7 +38,6 @@
 #include "signal.h"
-#define DEBUG_SIG 0
 #define GP_REGS_SIZE    min(sizeof(elf_gregset_t), sizeof(struct pt_regs))
 #define FP_REGS_SIZE    sizeof(elf_fpregset_t)
@@ -700,10 +699,6 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
        return 0;
 badframe:
-#if DEBUG_SIG
-        printk("badframe in sys_rt_sigreturn, regs=%p uc=%p &uc->uc_mcontext=%p\n",
-               regs, uc, &uc->uc_mcontext);
-#endif
        if (show_unhandled_signals)
                printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,
                                   current->comm, current->pid, "rt_sigreturn",
@@ -809,10 +804,6 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
        return 1;
 badframe:
-#if DEBUG_SIG
-        printk("badframe in setup_rt_frame, regs=%p frame=%p newsp=%lx\n",
-               regs, frame, newsp);
-#endif
        if (show_unhandled_signals)
                printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,
                                   current->comm, current->pid, "setup_rt_frame",
diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c b/arch/powerpc/platforms/cell/cbe_thermal.c
index 94560db788bf..2c15ff094483 100644
--- a/arch/powerpc/platforms/cell/cbe_thermal.c
+++ b/arch/powerpc/platforms/cell/cbe_thermal.c
@@ -125,7 +125,7 @@ static ssize_t show_throttle(struct cbe_pmd_regs __iomem *pmd_regs, char *buf, i
 static ssize_t store_throttle(struct cbe_pmd_regs __iomem *pmd_regs, const char *buf, size_t size, int pos)
 {
        u64 reg_value;
-        int temp;
+        unsigned int temp;
        u64 new_value;
        int ret;
diff --git a/arch/powerpc/platforms/powernv/Makefile b/arch/powerpc/platforms/powernv/Makefile
index d55891f89a2c..4ad227d04c1a 100644
--- a/arch/powerpc/platforms/powernv/Makefile
+++ b/arch/powerpc/platforms/powernv/Makefile
@@ -1,4 +1,4 @@
-obj-y                   += setup.o opal-takeover.o opal-wrappers.o opal.o opal-async.o
+obj-y                   += setup.o opal-wrappers.o opal.o opal-async.o
 obj-y                   += opal-rtc.o opal-nvram.o opal-lpc.o opal-flash.o
 obj-y                   += rng.o opal-elog.o opal-dump.o opal-sysparam.o opal-sensor.o
 obj-y                   += opal-msglog.o
diff --git a/arch/powerpc/platforms/powernv/opal-takeover.S b/arch/powerpc/platforms/powernv/opal-takeover.S
deleted file mode 100644
index 11a3169ee583..000000000000
--- a/arch/powerpc/platforms/powernv/opal-takeover.S
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * PowerNV OPAL takeover assembly code, for use by prom_init.c
- *
- * Copyright 2011 IBM Corp.
- *
- * 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.
- */
-#include <asm/ppc_asm.h>
-#include <asm/hvcall.h>
-#include <asm/asm-offsets.h>
-#include <asm/opal.h>
-#define H_HAL_TAKEOVER                  0x5124
-#define H_HAL_TAKEOVER_QUERY_MAGIC      -1
-        .text
-_GLOBAL(opal_query_takeover)
-        mfcr    r0
-        stw     r0,8(r1)
-        stdu    r1,-STACKFRAMESIZE(r1)
-        std     r3,STK_PARAM(R3)(r1)
-        std     r4,STK_PARAM(R4)(r1)
-        li      r3,H_HAL_TAKEOVER
-        li      r4,H_HAL_TAKEOVER_QUERY_MAGIC
-        HVSC
-        addi    r1,r1,STACKFRAMESIZE
-        ld      r10,STK_PARAM(R3)(r1)
-        std     r4,0(r10)
-        ld      r10,STK_PARAM(R4)(r1)
-        std     r5,0(r10)
-        lwz     r0,8(r1)
-        mtcrf   0xff,r0
-        blr
-_GLOBAL(opal_do_takeover)
-        mfcr    r0
-        stw     r0,8(r1)
-        mflr    r0
-        std     r0,16(r1)
-        bl      __opal_do_takeover
-        ld      r0,16(r1)
-        mtlr    r0
-        lwz     r0,8(r1)
-        mtcrf   0xff,r0
-        blr
-__opal_do_takeover:
-        ld      r4,0(r3)
-        ld      r5,0x8(r3)
-        ld      r6,0x10(r3)
-        ld      r7,0x18(r3)
-        ld      r8,0x20(r3)
-        ld      r9,0x28(r3)
-        ld      r10,0x30(r3)
-        ld      r11,0x38(r3)
-        li      r3,H_HAL_TAKEOVER
-        HVSC
-        blr
-        .globl opal_secondary_entry
-opal_secondary_entry:
-        mr      r31,r3
-        mfmsr   r11
-        li      r12,(MSR_SF | MSR_ISF)@highest
-        sldi    r12,r12,48
-        or      r11,r11,r12
-        mtmsrd  r11
-        isync
-        mfspr   r4,SPRN_PIR
-        std     r4,0(r3)
-1:      HMT_LOW
-        ld      r4,8(r3)
-        cmpli   cr0,r4,0
-        beq     1b
-        HMT_MEDIUM
-1:      addi    r3,r31,16
-        bl      __opal_do_takeover
-        b       1b
-_GLOBAL(opal_enter_rtas)
-        mflr    r0
-        std     r0,16(r1)
-        stdu    r1,-PROM_FRAME_SIZE(r1) /* Save SP and create stack space */
-        /* Because PROM is running in 32b mode, it clobbers the high order half
-         * of all registers that it saves.  We therefore save those registers
-         * PROM might touch to the stack.  (r0, r3-r13 are caller saved)
-        */
-        SAVE_GPR(2, r1)
-        SAVE_GPR(13, r1)
-        SAVE_8GPRS(14, r1)
-        SAVE_10GPRS(22, r1)
-        mfcr    r10
-        mfmsr   r11
-        std     r10,_CCR(r1)
-        std     r11,_MSR(r1)
-        /* Get the PROM entrypoint */
-        mtlr    r5
-        /* Switch MSR to 32 bits mode
-         */
-        li      r12,1
-        rldicr  r12,r12,MSR_SF_LG,(63-MSR_SF_LG)
-        andc    r11,r11,r12
-        li      r12,1
-        rldicr  r12,r12,MSR_ISF_LG,(63-MSR_ISF_LG)
-        andc    r11,r11,r12
-        mtmsrd  r11
-        isync
-        /* Enter RTAS here... */
-        blrl
-        /* Just make sure that r1 top 32 bits didn't get
-         * corrupt by OF
-         */
-        rldicl  r1,r1,0,32
-        /* Restore the MSR (back to 64 bits) */
-        ld      r0,_MSR(r1)
-        MTMSRD(r0)
-        isync
-        /* Restore other registers */
-        REST_GPR(2, r1)
-        REST_GPR(13, r1)
-        REST_8GPRS(14, r1)
-        REST_10GPRS(22, r1)
-        ld      r4,_CCR(r1)
-        mtcr    r4
-        addi    r1,r1,PROM_FRAME_SIZE
-        ld      r0,16(r1)
-        mtlr    r0
-        blr
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index 62c47bb76517..9e5353ff6d1b 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -476,6 +476,11 @@ void __init alloc_dart_table(void)
         */
        dart_tablebase = (unsigned long)
                __va(memblock_alloc_base(1UL<<24, 1UL<<24, 0x80000000L));
+        /*
+         * The DART space is later unmapped from the kernel linear mapping and
+         * accessing dart_tablebase during kmemleak scanning will fault.
+         */
+        kmemleak_no_scan((void *)dart_tablebase);
        printk(KERN_INFO "DART table allocated at: %lx\n", dart_tablebase);
 }
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig
index 8df022c43af7..fd09a10a2b53 100644
--- a/arch/s390/configs/default_defconfig
+++ b/arch/s390/configs/default_defconfig
@@ -45,7 +45,8 @@ CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_DEADLINE=y
-CONFIG_MARCH_Z9_109=y
+CONFIG_MARCH_Z196=y
+CONFIG_TUNE_ZEC12=y
 CONFIG_NR_CPUS=256
 CONFIG_PREEMPT=y
 CONFIG_HZ_100=y
@@ -240,7 +241,6 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 CONFIG_NF_TABLES_IPV4=m
-CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NF_TABLES_ARP=m
@@ -456,6 +456,7 @@ CONFIG_TN3270_FS=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_DIAG288_WATCHDOG=m
 # CONFIG_HID is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_INFINIBAND=m
diff --git a/arch/s390/configs/gcov_defconfig b/arch/s390/configs/gcov_defconfig
index c81a74e3e25a..b061180d3544 100644
--- a/arch/s390/configs/gcov_defconfig
+++ b/arch/s390/configs/gcov_defconfig
@@ -45,7 +45,8 @@ CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_DEADLINE=y
-CONFIG_MARCH_Z9_109=y
+CONFIG_MARCH_Z196=y
+CONFIG_TUNE_ZEC12=y
 CONFIG_NR_CPUS=256
 CONFIG_HZ_100=y
 CONFIG_MEMORY_HOTPLUG=y
@@ -238,7 +239,6 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 CONFIG_NF_TABLES_IPV4=m
-CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NF_TABLES_ARP=m
@@ -453,6 +453,7 @@ CONFIG_TN3270_FS=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_DIAG288_WATCHDOG=m
 # CONFIG_HID is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_INFINIBAND=m
diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig
index b5ba8fe1cc64..d279baa08014 100644
--- a/arch/s390/configs/performance_defconfig
+++ b/arch/s390/configs/performance_defconfig
@@ -43,7 +43,8 @@ CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_DEADLINE=y
-CONFIG_MARCH_Z9_109=y
+CONFIG_MARCH_Z196=y
+CONFIG_TUNE_ZEC12=y
 CONFIG_NR_CPUS=256
 CONFIG_HZ_100=y
 CONFIG_MEMORY_HOTPLUG=y
@@ -236,7 +237,6 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 CONFIG_NF_TABLES_IPV4=m
-CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NF_TABLES_ARP=m
@@ -451,6 +451,7 @@ CONFIG_TN3270_FS=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_DIAG288_WATCHDOG=m
 # CONFIG_HID is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_INFINIBAND=m
diff --git a/arch/s390/configs/zfcpdump_defconfig b/arch/s390/configs/zfcpdump_defconfig
index cef073ca1f07..948e0e057a23 100644
--- a/arch/s390/configs/zfcpdump_defconfig
+++ b/arch/s390/configs/zfcpdump_defconfig
@@ -8,7 +8,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_IBM_PARTITION=y
 CONFIG_DEFAULT_DEADLINE=y
-CONFIG_MARCH_Z9_109=y
+CONFIG_MARCH_Z196=y
+CONFIG_TUNE_ZEC12=y
 # CONFIG_COMPAT is not set
 CONFIG_NR_CPUS=2
 # CONFIG_HOTPLUG_CPU is not set
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 4557cb7ffddf..2e56498a40df 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -135,8 +135,8 @@ CONFIG_PROVE_LOCKING=y
 CONFIG_LOCK_STAT=y
 CONFIG_DEBUG_LOCKDEP=y
 CONFIG_DEBUG_ATOMIC_SLEEP=y
-CONFIG_DEBUG_WRITECOUNT=y
 CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_PI_LIST=y
 CONFIG_DEBUG_SG=y
 CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_PROVE_RCU=y
@@ -199,4 +199,10 @@ CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_DES_S390=m
 CONFIG_CRYPTO_AES_S390=m
 CONFIG_CRC7=m
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_SPARC is not set
 CONFIG_CMM=m
diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h
index c28f32a45af5..3815bfea1b2d 100644
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@ -33,10 +33,9 @@ static inline int init_new_context(struct task_struct *tsk,
 static inline void set_user_asce(struct mm_struct *mm)
 {
-        pgd_t *pgd = mm->pgd;
+        S390_lowcore.user_asce = mm->context.asce_bits | __pa(mm->pgd);
+        if (current->thread.mm_segment.ar4)
-        S390_lowcore.user_asce = mm->context.asce_bits | __pa(pgd);
+                __ctl_load(S390_lowcore.user_asce, 7, 7);
-        set_fs(current->thread.mm_segment);
        set_cpu_flag(CIF_ASCE);
 }
@@ -70,12 +69,11 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
        /* Clear old ASCE by loading the kernel ASCE. */
        __ctl_load(S390_lowcore.kernel_asce, 1, 1);
        __ctl_load(S390_lowcore.kernel_asce, 7, 7);
-        /* Delay loading of the new ASCE to control registers CR1 & CR7 */
-        set_cpu_flag(CIF_ASCE);
        atomic_inc(&next->context.attach_count);
        atomic_dec(&prev->context.attach_count);
        if (MACHINE_HAS_TLB_LC)
                cpumask_clear_cpu(cpu, &prev->context.cpu_attach_mask);
+        S390_lowcore.user_asce = next->context.asce_bits | __pa(next->pgd);
 }
 #define finish_arch_post_lock_switch finish_arch_post_lock_switch
@@ -84,17 +82,18 @@ static inline void finish_arch_post_lock_switch(void)
        struct task_struct *tsk = current;
        struct mm_struct *mm = tsk->mm;
-        if (!mm)
+        load_kernel_asce();
-                return;
+        if (mm) {
-        preempt_disable();
+                preempt_disable();
-        while (atomic_read(&mm->context.attach_count) >> 16)
+                while (atomic_read(&mm->context.attach_count) >> 16)
-                cpu_relax();
+                        cpu_relax();
-        cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));
+                cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));
-        set_user_asce(mm);
+                if (mm->context.flush_mm)
-        if (mm->context.flush_mm)
+                        __tlb_flush_mm(mm);
-                __tlb_flush_mm(mm);
+                preempt_enable();
-        preempt_enable();
+        }
+        set_fs(current->thread.mm_segment);
 }
 #define enter_lazy_tlb(mm,tsk)  do { } while (0)
diff --git a/arch/s390/include/asm/switch_to.h b/arch/s390/include/asm/switch_to.h
index 29c81f82705e..df38c70cd59e 100644
--- a/arch/s390/include/asm/switch_to.h
+++ b/arch/s390/include/asm/switch_to.h
@@ -134,8 +134,4 @@ static inline void restore_access_regs(unsigned int *acrs)
        prev = __switch_to(prev,next);                                  \
 } while (0)
-#define finish_arch_switch(prev) do {                                        \
-        set_fs(current->thread.mm_segment);                                  \
-} while (0)
 #endif /* __ASM_SWITCH_TO_H */
diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild
index 6a9a9eb645f5..736637363d31 100644
--- a/arch/s390/include/uapi/asm/Kbuild
+++ b/arch/s390/include/uapi/asm/Kbuild
@@ -36,6 +36,7 @@ header-y += signal.h
 header-y += socket.h
 header-y += sockios.h
 header-y += sclp_ctl.h
+header-y += sie.h
 header-y += stat.h
 header-y += statfs.h
 header-y += swab.h
diff --git a/arch/s390/include/uapi/asm/sie.h b/arch/s390/include/uapi/asm/sie.h
index 3d97f610198d..5d9cc19462c4 100644
--- a/arch/s390/include/uapi/asm/sie.h
+++ b/arch/s390/include/uapi/asm/sie.h
@@ -1,8 +1,6 @@
 #ifndef _UAPI_ASM_S390_SIE_H
 #define _UAPI_ASM_S390_SIE_H
-#include <asm/sigp.h>
 #define diagnose_codes                                          \
        { 0x10, "DIAG (0x10) release pages" },                  \
        { 0x44, "DIAG (0x44) time slice end" },                 \
@@ -13,18 +11,18 @@
        { 0x500, "DIAG (0x500) KVM virtio functions" },         \
        { 0x501, "DIAG (0x501) KVM breakpoint" }
-#define sigp_order_codes                                                \
+#define sigp_order_codes                                        \
-        { SIGP_SENSE, "SIGP sense" },                                   \
+        { 0x01, "SIGP sense" },                                 \
-        { SIGP_EXTERNAL_CALL, "SIGP external call" },                   \
+        { 0x02, "SIGP external call" },                         \
-        { SIGP_EMERGENCY_SIGNAL, "SIGP emergency signal" },             \
+        { 0x03, "SIGP emergency signal" },                      \
-        { SIGP_STOP, "SIGP stop" },                                     \
+        { 0x05, "SIGP stop" },                                  \
-        { SIGP_STOP_AND_STORE_STATUS, "SIGP stop and store status" },   \
+        { 0x06, "SIGP restart" },                               \
-        { SIGP_SET_ARCHITECTURE, "SIGP set architecture" },             \
+        { 0x09, "SIGP stop and store status" },                 \
-        { SIGP_SET_PREFIX, "SIGP set prefix" },                         \
+        { 0x0b, "SIGP initial cpu reset" },                     \
-        { SIGP_SENSE_RUNNING, "SIGP sense running" },                   \
+        { 0x0d, "SIGP set prefix" },                            \
-        { SIGP_RESTART, "SIGP restart" },                               \
+        { 0x0e, "SIGP store status at address" },               \
-        { SIGP_INITIAL_CPU_RESET, "SIGP initial cpu reset" },           \
+        { 0x12, "SIGP set architecture" },                      \
-        { SIGP_STORE_STATUS_AT_ADDRESS, "SIGP store status at address" }
+        { 0x15, "SIGP sense running" }
 #define icpt_prog_codes                                         \
        { 0x0001, "Prog Operation" },                           \
diff --git a/arch/s390/include/uapi/asm/ucontext.h b/arch/s390/include/uapi/asm/ucontext.h
index 200e06325c6a..3e077b2a4705 100644
--- a/arch/s390/include/uapi/asm/ucontext.h
+++ b/arch/s390/include/uapi/asm/ucontext.h
@@ -16,7 +16,9 @@ struct ucontext_extended {
        struct ucontext  *uc_link;
        stack_t           uc_stack;
        _sigregs          uc_mcontext;
-        unsigned long     uc_sigmask[2];
+        sigset_t          uc_sigmask;
+        /* Allow for uc_sigmask growth.  Glibc uses a 1024-bit sigset_t.  */
+        unsigned char     __unused[128 - sizeof(sigset_t)];
        unsigned long     uc_gprs_high[16];
 };
@@ -27,7 +29,9 @@ struct ucontext {
        struct ucontext  *uc_link;
        stack_t           uc_stack;
        _sigregs          uc_mcontext;
-        sigset_t          uc_sigmask;   /* mask last for extensibility */
+        sigset_t          uc_sigmask;
+        /* Allow for uc_sigmask growth.  Glibc uses a 1024-bit sigset_t.  */
+        unsigned char     __unused[128 - sizeof(sigset_t)];
 };
 #endif /* !_ASM_S390_UCONTEXT_H */
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h
index 39ddfdb40ae8..70d4b7c4beaa 100644
--- a/arch/s390/kernel/compat_linux.h
+++ b/arch/s390/kernel/compat_linux.h
@@ -69,7 +69,9 @@ struct ucontext32 {
        __u32                   uc_link;        /* pointer */   
        compat_stack_t          uc_stack;
        _sigregs32              uc_mcontext;
-        compat_sigset_t         uc_sigmask;     /* mask last for extensibility */
+        compat_sigset_t         uc_sigmask;
+        /* Allow for uc_sigmask growth.  Glibc uses a 1024-bit sigset_t.  */
+        unsigned char           __unused[128 - sizeof(compat_sigset_t)];
 };
 struct stat64_emu31;
diff --git a/arch/sparc/crypto/aes_glue.c b/arch/sparc/crypto/aes_glue.c
index 503e6d96ad4e..df922f52d76d 100644
--- a/arch/sparc/crypto/aes_glue.c
+++ b/arch/sparc/crypto/aes_glue.c
@@ -124,7 +124,7 @@ extern void aes_sparc64_ctr_crypt_256(const u64 *key, const u64 *input,
                                      u64 *output, unsigned int len,
                                      u64 *iv);
-struct aes_ops aes128_ops = {
+static struct aes_ops aes128_ops = {
        .encrypt                = aes_sparc64_encrypt_128,
        .decrypt                = aes_sparc64_decrypt_128,
        .load_encrypt_keys      = aes_sparc64_load_encrypt_keys_128,
@@ -136,7 +136,7 @@ struct aes_ops aes128_ops = {
        .ctr_crypt              = aes_sparc64_ctr_crypt_128,
 };
-struct aes_ops aes192_ops = {
+static struct aes_ops aes192_ops = {
        .encrypt                = aes_sparc64_encrypt_192,
        .decrypt                = aes_sparc64_decrypt_192,
        .load_encrypt_keys      = aes_sparc64_load_encrypt_keys_192,
@@ -148,7 +148,7 @@ struct aes_ops aes192_ops = {
        .ctr_crypt              = aes_sparc64_ctr_crypt_192,
 };
-struct aes_ops aes256_ops = {
+static struct aes_ops aes256_ops = {
        .encrypt                = aes_sparc64_encrypt_256,
        .decrypt                = aes_sparc64_decrypt_256,
        .load_encrypt_keys      = aes_sparc64_load_encrypt_keys_256,
diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h
index f08fe51b264d..7aed2be45b44 100644
--- a/arch/sparc/include/asm/atomic_32.h
+++ b/arch/sparc/include/asm/atomic_32.h
@@ -20,11 +20,11 @@
 #define ATOMIC_INIT(i)  { (i) }
-extern int __atomic_add_return(int, atomic_t *);
+int __atomic_add_return(int, atomic_t *);
-extern int atomic_cmpxchg(atomic_t *, int, int);
+int atomic_cmpxchg(atomic_t *, int, int);
 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
-extern int __atomic_add_unless(atomic_t *, int, int);
+int __atomic_add_unless(atomic_t *, int, int);
-extern void atomic_set(atomic_t *, int);
+void atomic_set(atomic_t *, int);
 #define atomic_read(v)          (*(volatile int *)&(v)->counter)
diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
index 8b2f1bde2889..bb894c8bec56 100644
--- a/arch/sparc/include/asm/atomic_64.h
+++ b/arch/sparc/include/asm/atomic_64.h
@@ -20,15 +20,15 @@
 #define atomic_set(v, i)        (((v)->counter) = i)
 #define atomic64_set(v, i)      (((v)->counter) = i)
-extern void atomic_add(int, atomic_t *);
+void atomic_add(int, atomic_t *);
-extern void atomic64_add(long, atomic64_t *);
+void atomic64_add(long, atomic64_t *);
-extern void atomic_sub(int, atomic_t *);
+void atomic_sub(int, atomic_t *);
-extern void atomic64_sub(long, atomic64_t *);
+void atomic64_sub(long, atomic64_t *);
-extern int atomic_add_ret(int, atomic_t *);
+int atomic_add_ret(int, atomic_t *);
-extern long atomic64_add_ret(long, atomic64_t *);
+long atomic64_add_ret(long, atomic64_t *);
-extern int atomic_sub_ret(int, atomic_t *);
+int atomic_sub_ret(int, atomic_t *);
-extern long atomic64_sub_ret(long, atomic64_t *);
+long atomic64_sub_ret(long, atomic64_t *);
 #define atomic_dec_return(v) atomic_sub_ret(1, v)
 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
@@ -107,6 +107,6 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-extern long atomic64_dec_if_positive(atomic64_t *v);
+long atomic64_dec_if_positive(atomic64_t *v);
 #endif /* !(__ARCH_SPARC64_ATOMIC__) */
diff --git a/arch/sparc/include/asm/auxio.h b/arch/sparc/include/asm/auxio.h
index 13dc67f03011..3e09a07b77e9 100644
--- a/arch/sparc/include/asm/auxio.h
+++ b/arch/sparc/include/asm/auxio.h
@@ -1,5 +1,12 @@
 #ifndef ___ASM_SPARC_AUXIO_H
 #define ___ASM_SPARC_AUXIO_H
+#ifndef __ASSEMBLY__
+extern void __iomem *auxio_register;
+#endif /* ifndef __ASSEMBLY__ */
 #if defined(__sparc__) && defined(__arch64__)
 #include <asm/auxio_64.h>
 #else
diff --git a/arch/sparc/include/asm/auxio_32.h b/arch/sparc/include/asm/auxio_32.h
index 3a319775ae37..5d685df427b4 100644
--- a/arch/sparc/include/asm/auxio_32.h
+++ b/arch/sparc/include/asm/auxio_32.h
@@ -34,8 +34,8 @@
 * NOTE: these routines are implementation dependent--
 * understand the hardware you are querying!
 */
-extern void set_auxio(unsigned char bits_on, unsigned char bits_off);
+void set_auxio(unsigned char bits_on, unsigned char bits_off);
-extern unsigned char get_auxio(void); /* .../asm/floppy.h */
+unsigned char get_auxio(void); /* .../asm/floppy.h */
 /*
 * The following routines are provided for driver-compatibility
@@ -78,7 +78,7 @@ do { \
 /* AUXIO2 (Power Off Control) */
-extern __volatile__ unsigned char * auxio_power_register;
+extern volatile u8 __iomem *auxio_power_register;
 #define AUXIO_POWER_DETECT_FAILURE      32
 #define AUXIO_POWER_CLEAR_FAILURE       2
diff --git a/arch/sparc/include/asm/auxio_64.h b/arch/sparc/include/asm/auxio_64.h
index f61cd1e3e395..6079e59a7ad1 100644
--- a/arch/sparc/include/asm/auxio_64.h
+++ b/arch/sparc/include/asm/auxio_64.h
@@ -75,8 +75,6 @@
 #ifndef __ASSEMBLY__
-extern void __iomem *auxio_register;
 #define AUXIO_LTE_ON    1
 #define AUXIO_LTE_OFF   0
@@ -84,7 +82,7 @@ extern void __iomem *auxio_register;
 *
 * on - AUXIO_LTE_ON or AUXIO_LTE_OFF
 */
-extern void auxio_set_lte(int on);
+void auxio_set_lte(int on);
 #define AUXIO_LED_ON    1
 #define AUXIO_LED_OFF   0
@@ -93,7 +91,7 @@ extern void auxio_set_lte(int on);
 *
 * on - AUXIO_LED_ON or AUXIO_LED_OFF
 */
-extern void auxio_set_led(int on);
+void auxio_set_led(int on);
 #endif /* ifndef __ASSEMBLY__ */
diff --git a/arch/sparc/include/asm/bitext.h b/arch/sparc/include/asm/bitext.h
index 297b2f2fcb49..9c988bf3adb6 100644
--- a/arch/sparc/include/asm/bitext.h
+++ b/arch/sparc/include/asm/bitext.h
@@ -20,8 +20,8 @@ struct bit_map {
        int num_colors;
 };
-extern int bit_map_string_get(struct bit_map *t, int len, int align);
+int bit_map_string_get(struct bit_map *t, int len, int align);
-extern void bit_map_clear(struct bit_map *t, int offset, int len);
+void bit_map_clear(struct bit_map *t, int offset, int len);
-extern void bit_map_init(struct bit_map *t, unsigned long *map, int size);
+void bit_map_init(struct bit_map *t, unsigned long *map, int size);
 #endif /* defined(_SPARC_BITEXT_H) */
diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h
index 88c9a962502c..600ed1d9c8c8 100644
--- a/arch/sparc/include/asm/bitops_32.h
+++ b/arch/sparc/include/asm/bitops_32.h
@@ -18,9 +18,9 @@
 #error only <linux/bitops.h> can be included directly
 #endif
-extern unsigned long ___set_bit(unsigned long *addr, unsigned long mask);
+unsigned long ___set_bit(unsigned long *addr, unsigned long mask);
-extern unsigned long ___clear_bit(unsigned long *addr, unsigned long mask);
+unsigned long ___clear_bit(unsigned long *addr, unsigned long mask);
-extern unsigned long ___change_bit(unsigned long *addr, unsigned long mask);
+unsigned long ___change_bit(unsigned long *addr, unsigned long mask);
 /*
 * Set bit 'nr' in 32-bit quantity at address 'addr' where bit '0'
diff --git a/arch/sparc/include/asm/bitops_64.h b/arch/sparc/include/asm/bitops_64.h
index f1a051ca301a..2d522402a937 100644
--- a/arch/sparc/include/asm/bitops_64.h
+++ b/arch/sparc/include/asm/bitops_64.h
@@ -15,12 +15,12 @@
 #include <asm/byteorder.h>
 #include <asm/barrier.h>
-extern int test_and_set_bit(unsigned long nr, volatile unsigned long *addr);
+int test_and_set_bit(unsigned long nr, volatile unsigned long *addr);
-extern int test_and_clear_bit(unsigned long nr, volatile unsigned long *addr);
+int test_and_clear_bit(unsigned long nr, volatile unsigned long *addr);
-extern int test_and_change_bit(unsigned long nr, volatile unsigned long *addr);
+int test_and_change_bit(unsigned long nr, volatile unsigned long *addr);
-extern void set_bit(unsigned long nr, volatile unsigned long *addr);
+void set_bit(unsigned long nr, volatile unsigned long *addr);
-extern void clear_bit(unsigned long nr, volatile unsigned long *addr);
+void clear_bit(unsigned long nr, volatile unsigned long *addr);
-extern void change_bit(unsigned long nr, volatile unsigned long *addr);
+void change_bit(unsigned long nr, volatile unsigned long *addr);
 #include <asm-generic/bitops/non-atomic.h>
@@ -30,8 +30,8 @@ extern void change_bit(unsigned long nr, volatile unsigned long *addr);
 #ifdef __KERNEL__
-extern int ffs(int x);
+int ffs(int x);
-extern unsigned long __ffs(unsigned long);
+unsigned long __ffs(unsigned long);
 #include <asm-generic/bitops/ffz.h>
 #include <asm-generic/bitops/sched.h>
@@ -41,10 +41,10 @@ extern unsigned long __ffs(unsigned long);
 * of bits set) of a N-bit word
 */
-extern unsigned long __arch_hweight64(__u64 w);
+unsigned long __arch_hweight64(__u64 w);
-extern unsigned int __arch_hweight32(unsigned int w);
+unsigned int __arch_hweight32(unsigned int w);
-extern unsigned int __arch_hweight16(unsigned int w);
+unsigned int __arch_hweight16(unsigned int w);
-extern unsigned int __arch_hweight8(unsigned int w);
+unsigned int __arch_hweight8(unsigned int w);
 #include <asm-generic/bitops/const_hweight.h>
 #include <asm-generic/bitops/lock.h>
diff --git a/arch/sparc/include/asm/btext.h b/arch/sparc/include/asm/btext.h
index 9b2bc6b6ed0a..75a32b109e15 100644
--- a/arch/sparc/include/asm/btext.h
+++ b/arch/sparc/include/asm/btext.h
@@ -1,6 +1,6 @@
 #ifndef _SPARC_BTEXT_H
 #define _SPARC_BTEXT_H
-extern int btext_find_display(void);
+int btext_find_display(void);
 #endif /* _SPARC_BTEXT_H */
diff --git a/arch/sparc/include/asm/bug.h b/arch/sparc/include/asm/bug.h
index 6bd9f43cb5a5..eaa8f8d38125 100644
--- a/arch/sparc/include/asm/bug.h
+++ b/arch/sparc/include/asm/bug.h
@@ -5,7 +5,7 @@
 #include <linux/compiler.h>
 #ifdef CONFIG_DEBUG_BUGVERBOSE
-extern void do_BUG(const char *file, int line);
+void do_BUG(const char *file, int line);
 #define BUG() do {                                      \
        do_BUG(__FILE__, __LINE__);                     \
        __builtin_trap();                               \
@@ -20,6 +20,6 @@ extern void do_BUG(const char *file, int line);
 #include <asm-generic/bug.h>
 struct pt_regs;
-extern void die_if_kernel(char *str, struct pt_regs *regs) __attribute__ ((noreturn));
+void __noreturn die_if_kernel(char *str, struct pt_regs *regs);
 #endif
diff --git a/arch/sparc/include/asm/cacheflush_32.h b/arch/sparc/include/asm/cacheflush_32.h
index bb014c24f318..12164006181c 100644
--- a/arch/sparc/include/asm/cacheflush_32.h
+++ b/arch/sparc/include/asm/cacheflush_32.h
@@ -36,7 +36,7 @@
 #define flush_page_for_dma(addr) \
        sparc32_cachetlb_ops->page_for_dma(addr)
-extern void sparc_flush_page_to_ram(struct page *page);
+void sparc_flush_page_to_ram(struct page *page);
 #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1
 #define flush_dcache_page(page)                 sparc_flush_page_to_ram(page)
@@ -51,8 +51,8 @@ extern void sparc_flush_page_to_ram(struct page *page);
 * way the windows are all clean for the next process and the stack
 * frames are up to date.
 */
-extern void flush_user_windows(void);
+void flush_user_windows(void);
-extern void kill_user_windows(void);
+void kill_user_windows(void);
-extern void flushw_all(void);
+void flushw_all(void);
 #endif /* _SPARC_CACHEFLUSH_H */
diff --git a/arch/sparc/include/asm/cacheflush_64.h b/arch/sparc/include/asm/cacheflush_64.h
index 301736d9e7a1..38965379e350 100644
--- a/arch/sparc/include/asm/cacheflush_64.h
+++ b/arch/sparc/include/asm/cacheflush_64.h
@@ -10,7 +10,7 @@
 /* Cache flush operations. */
 #define flushw_all()    __asm__ __volatile__("flushw")
-extern void __flushw_user(void);
+void __flushw_user(void);
 #define flushw_user() __flushw_user()
 #define flush_user_windows flushw_user
@@ -30,29 +30,29 @@ extern void __flushw_user(void);
 * use block commit stores (which invalidate icache lines) during
 * module load, so we need this.
 */
-extern void flush_icache_range(unsigned long start, unsigned long end);
+void flush_icache_range(unsigned long start, unsigned long end);
-extern void __flush_icache_page(unsigned long);
+void __flush_icache_page(unsigned long);
-extern void __flush_dcache_page(void *addr, int flush_icache);
+void __flush_dcache_page(void *addr, int flush_icache);
-extern void flush_dcache_page_impl(struct page *page);
+void flush_dcache_page_impl(struct page *page);
 #ifdef CONFIG_SMP
-extern void smp_flush_dcache_page_impl(struct page *page, int cpu);
+void smp_flush_dcache_page_impl(struct page *page, int cpu);
-extern void flush_dcache_page_all(struct mm_struct *mm, struct page *page);
+void flush_dcache_page_all(struct mm_struct *mm, struct page *page);
 #else
 #define smp_flush_dcache_page_impl(page,cpu) flush_dcache_page_impl(page)
 #define flush_dcache_page_all(mm,page) flush_dcache_page_impl(page)
 #endif
-extern void __flush_dcache_range(unsigned long start, unsigned long end);
+void __flush_dcache_range(unsigned long start, unsigned long end);
 #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1
-extern void flush_dcache_page(struct page *page);
+void flush_dcache_page(struct page *page);
 #define flush_icache_page(vma, pg)      do { } while(0)
 #define flush_icache_user_range(vma,pg,adr,len) do { } while (0)
-extern void flush_ptrace_access(struct vm_area_struct *, struct page *,
+void flush_ptrace_access(struct vm_area_struct *, struct page *,
-                                unsigned long uaddr, void *kaddr,
+                         unsigned long uaddr, void *kaddr,
-                                unsigned long len, int write);
+                         unsigned long len, int write);
 #define copy_to_user_page(vma, page, vaddr, dst, src, len)              \
        do {                                                            \
diff --git a/arch/sparc/include/asm/checksum_32.h b/arch/sparc/include/asm/checksum_32.h
index 04471dc64847..426b2389a1c2 100644
--- a/arch/sparc/include/asm/checksum_32.h
+++ b/arch/sparc/include/asm/checksum_32.h
@@ -29,7 +29,7 @@
 *
 * it's best to have buff aligned on a 32-bit boundary
 */
-extern __wsum csum_partial(const void *buff, int len, __wsum sum);
+__wsum csum_partial(const void *buff, int len, __wsum sum);
 /* the same as csum_partial, but copies from fs:src while it
 * checksums
@@ -38,7 +38,7 @@ extern __wsum csum_partial(const void *buff, int len, __wsum sum);
 * better 64-bit) boundary
 */
-extern unsigned int __csum_partial_copy_sparc_generic (const unsigned char *, unsigned char *);
+unsigned int __csum_partial_copy_sparc_generic (const unsigned char *, unsigned char *);
 static inline __wsum
 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
diff --git a/arch/sparc/include/asm/checksum_64.h b/arch/sparc/include/asm/checksum_64.h
index 2ff81ae8f3af..b8779a6a5911 100644
--- a/arch/sparc/include/asm/checksum_64.h
+++ b/arch/sparc/include/asm/checksum_64.h
@@ -29,7 +29,7 @@
 *
 * it's best to have buff aligned on a 32-bit boundary
 */
-extern __wsum csum_partial(const void * buff, int len, __wsum sum);
+__wsum csum_partial(const void * buff, int len, __wsum sum);
 /* the same as csum_partial, but copies from user space while it
 * checksums
@@ -37,12 +37,12 @@ extern __wsum csum_partial(const void * buff, int len, __wsum sum);
 * here even more important to align src and dst on a 32-bit (or even
 * better 64-bit) boundary
 */
-extern __wsum csum_partial_copy_nocheck(const void *src, void *dst,
+__wsum csum_partial_copy_nocheck(const void *src, void *dst,
-                                              int len, __wsum sum);
+                                 int len, __wsum sum);
-extern long __csum_partial_copy_from_user(const void __user *src,
+long __csum_partial_copy_from_user(const void __user *src,
-                                          void *dst, int len,
+                                   void *dst, int len,
-                                          __wsum sum);
+                                   __wsum sum);
 static inline __wsum
 csum_partial_copy_from_user(const void __user *src,
@@ -59,9 +59,9 @@ csum_partial_copy_from_user(const void __user *src,
 *      Copy and checksum to user
 */
 #define HAVE_CSUM_COPY_USER
-extern long __csum_partial_copy_to_user(const void *src,
+long __csum_partial_copy_to_user(const void *src,
-                                        void __user *dst, int len,
+                                 void __user *dst, int len,
-                                          __wsum sum);
+                                 __wsum sum);
 static inline __wsum
 csum_and_copy_to_user(const void *src,
@@ -77,7 +77,7 @@ csum_and_copy_to_user(const void *src,
 /* ihl is always 5 or greater, almost always is 5, and iph is word aligned
 * the majority of the time.
 */
-extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl);
+__sum16 ip_fast_csum(const void *iph, unsigned int ihl);
 /* Fold a partial checksum without adding pseudo headers. */
 static inline __sum16 csum_fold(__wsum sum)
@@ -96,9 +96,9 @@ static inline __sum16 csum_fold(__wsum sum)
 }
 static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                                               unsigned int len,
+                                        unsigned int len,
-                                               unsigned short proto,
+                                        unsigned short proto,
-                                               __wsum sum)
+                                        __wsum sum)
 {
        __asm__ __volatile__(
 "       addcc           %1, %0, %0\n"
@@ -116,9 +116,9 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
 * returns a 16-bit checksum, already complemented
 */
 static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
-                                                   unsigned short len,
+                                        unsigned short len,
-                                                   unsigned short proto,
+                                        unsigned short proto,
-                                                   __wsum sum)
+                                        __wsum sum)
 {
        return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
 }
diff --git a/arch/sparc/include/asm/cmpxchg_32.h b/arch/sparc/include/asm/cmpxchg_32.h
index 1fae1a02e3c2..32c29a133f9d 100644
--- a/arch/sparc/include/asm/cmpxchg_32.h
+++ b/arch/sparc/include/asm/cmpxchg_32.h
@@ -20,7 +20,7 @@ static inline unsigned long xchg_u32(__volatile__ unsigned long *m, unsigned lon
        return val;
 }
-extern void __xchg_called_with_bad_pointer(void);
+void __xchg_called_with_bad_pointer(void);
 static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr, int size)
 {
@@ -45,9 +45,9 @@ static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr, int
 #define __HAVE_ARCH_CMPXCHG     1
 /* bug catcher for when unsupported size is used - won't link */
-extern void __cmpxchg_called_with_bad_pointer(void);
+void __cmpxchg_called_with_bad_pointer(void);
 /* we only need to support cmpxchg of a u32 on sparc */
-extern unsigned long __cmpxchg_u32(volatile u32 *m, u32 old, u32 new_);
+unsigned long __cmpxchg_u32(volatile u32 *m, u32 old, u32 new_);
 /* don't worry...optimizer will get rid of most of this */
 static inline unsigned long
diff --git a/arch/sparc/include/asm/cmpxchg_64.h b/arch/sparc/include/asm/cmpxchg_64.h
index 4adefe8e2885..0e1ed6cfbf68 100644
--- a/arch/sparc/include/asm/cmpxchg_64.h
+++ b/arch/sparc/include/asm/cmpxchg_64.h
@@ -42,7 +42,7 @@ static inline unsigned long xchg64(__volatile__ unsigned long *m, unsigned long
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-extern void __xchg_called_with_bad_pointer(void);
+void __xchg_called_with_bad_pointer(void);
 static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr,
                                       int size)
@@ -91,7 +91,7 @@ __cmpxchg_u64(volatile long *m, unsigned long old, unsigned long new)
 /* This function doesn't exist, so you'll get a linker error
   if something tries to do an invalid cmpxchg().  */
-extern void __cmpxchg_called_with_bad_pointer(void);
+void __cmpxchg_called_with_bad_pointer(void);
 static inline unsigned long
 __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
diff --git a/arch/sparc/include/asm/cpudata.h b/arch/sparc/include/asm/cpudata.h
index b5976de7cacd..128b56b08676 100644
--- a/arch/sparc/include/asm/cpudata.h
+++ b/arch/sparc/include/asm/cpudata.h
@@ -1,5 +1,15 @@
 #ifndef ___ASM_SPARC_CPUDATA_H
 #define ___ASM_SPARC_CPUDATA_H
+#ifndef __ASSEMBLY__
+#include <linux/threads.h>
+#include <linux/percpu.h>
+extern const struct seq_operations cpuinfo_op;
+#endif /* !(__ASSEMBLY__) */
 #if defined(__sparc__) && defined(__arch64__)
 #include <asm/cpudata_64.h>
 #else
diff --git a/arch/sparc/include/asm/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h
index 050ef35b9dcf..0e594076912c 100644
--- a/arch/sparc/include/asm/cpudata_64.h
+++ b/arch/sparc/include/asm/cpudata_64.h
@@ -8,9 +8,6 @@
 #ifndef __ASSEMBLY__
-#include <linux/percpu.h>
-#include <linux/threads.h>
 typedef struct {
        /* Dcache line 1 */
        unsigned int    __softirq_pending; /* must be 1st, see rtrap.S */
@@ -35,8 +32,6 @@ DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
 #define cpu_data(__cpu)         per_cpu(__cpu_data, (__cpu))
 #define local_cpu_data()        __get_cpu_var(__cpu_data)
-extern const struct seq_operations cpuinfo_op;
 #endif /* !(__ASSEMBLY__) */
 #include <asm/trap_block.h>
diff --git a/arch/sparc/include/asm/delay_32.h b/arch/sparc/include/asm/delay_32.h
index bc9aba2bead6..3fb8ca144b4f 100644
--- a/arch/sparc/include/asm/delay_32.h
+++ b/arch/sparc/include/asm/delay_32.h
@@ -20,8 +20,8 @@ static inline void __delay(unsigned long loops)
 }
 /* This is too messy with inline asm on the Sparc. */
-extern void __udelay(unsigned long usecs, unsigned long lpj);
+void __udelay(unsigned long usecs, unsigned long lpj);
-extern void __ndelay(unsigned long nsecs, unsigned long lpj);
+void __ndelay(unsigned long nsecs, unsigned long lpj);
 #ifdef CONFIG_SMP
 #define __udelay_val    cpu_data(smp_processor_id()).udelay_val
diff --git a/arch/sparc/include/asm/delay_64.h b/arch/sparc/include/asm/delay_64.h
index a77aa622d762..0ba5424856d8 100644
--- a/arch/sparc/include/asm/delay_64.h
+++ b/arch/sparc/include/asm/delay_64.h
@@ -8,8 +8,8 @@
 #ifndef __ASSEMBLY__
-extern void __delay(unsigned long loops);
+void __delay(unsigned long loops);
-extern void udelay(unsigned long usecs);
+void udelay(unsigned long usecs);
 #define mdelay(n)       udelay((n) * 1000)
 #endif /* !__ASSEMBLY__ */
diff --git a/arch/sparc/include/asm/device.h b/arch/sparc/include/asm/device.h
index daa6a8a5e9cd..bb3f0b0c6754 100644
--- a/arch/sparc/include/asm/device.h
+++ b/arch/sparc/include/asm/device.h
@@ -19,7 +19,7 @@ struct dev_archdata {
        int                     numa_node;
 };
-extern void of_propagate_archdata(struct platform_device *bus);
+void of_propagate_archdata(struct platform_device *bus);
 struct pdev_archdata {
        struct resource         resource[PROMREG_MAX];
diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
index 05fe53f5346e..1ee02710b2dc 100644
--- a/arch/sparc/include/asm/dma-mapping.h
+++ b/arch/sparc/include/asm/dma-mapping.h
@@ -7,7 +7,7 @@
 #define DMA_ERROR_CODE  (~(dma_addr_t)0x0)
-extern int dma_supported(struct device *dev, u64 mask);
+int dma_supported(struct device *dev, u64 mask);
 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
diff --git a/arch/sparc/include/asm/ebus_dma.h b/arch/sparc/include/asm/ebus_dma.h
index f07a5b541c98..fcfb4948147f 100644
--- a/arch/sparc/include/asm/ebus_dma.h
+++ b/arch/sparc/include/asm/ebus_dma.h
@@ -22,14 +22,14 @@ struct ebus_dma_info {
        unsigned char   name[64];
 };
-extern int ebus_dma_register(struct ebus_dma_info *p);
+int ebus_dma_register(struct ebus_dma_info *p);
-extern int ebus_dma_irq_enable(struct ebus_dma_info *p, int on);
+int ebus_dma_irq_enable(struct ebus_dma_info *p, int on);
-extern void ebus_dma_unregister(struct ebus_dma_info *p);
+void ebus_dma_unregister(struct ebus_dma_info *p);
-extern int ebus_dma_request(struct ebus_dma_info *p, dma_addr_t bus_addr,
+int ebus_dma_request(struct ebus_dma_info *p, dma_addr_t bus_addr,
                            size_t len);
-extern void ebus_dma_prepare(struct ebus_dma_info *p, int write);
+void ebus_dma_prepare(struct ebus_dma_info *p, int write);
-extern unsigned int ebus_dma_residue(struct ebus_dma_info *p);
+unsigned int ebus_dma_residue(struct ebus_dma_info *p);
-extern unsigned int ebus_dma_addr(struct ebus_dma_info *p);
+unsigned int ebus_dma_addr(struct ebus_dma_info *p);
-extern void ebus_dma_enable(struct ebus_dma_info *p, int on);
+void ebus_dma_enable(struct ebus_dma_info *p, int on);
 #endif /* __ASM_SPARC_EBUS_DMA_H */
diff --git a/arch/sparc/include/asm/floppy_32.h b/arch/sparc/include/asm/floppy_32.h
index fb3f16954c69..071b83e52f15 100644
--- a/arch/sparc/include/asm/floppy_32.h
+++ b/arch/sparc/include/asm/floppy_32.h
@@ -9,11 +9,12 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
-#include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/idprom.h>
 #include <asm/oplib.h>
 #include <asm/auxio.h>
+#include <asm/setup.h>
+#include <asm/page.h>
 #include <asm/irq.h>
 /* We don't need no stinkin' I/O port allocation crap. */
@@ -49,7 +50,6 @@ struct sun_flpy_controller {
 /* You'll only ever find one controller on a SparcStation anyways. */
 static struct sun_flpy_controller *sun_fdc = NULL;
-extern volatile unsigned char *fdc_status;
 struct sun_floppy_ops {
        unsigned char (*fd_inb)(int port);
@@ -212,13 +212,6 @@ static void sun_82077_fd_outb(unsigned char value, int port)
 * underruns.  If non-zero, doing_pdma encodes the direction of
 * the transfer for debugging.  1=read 2=write
 */
-extern char *pdma_vaddr;
-extern unsigned long pdma_size;
-extern volatile int doing_pdma;
-/* This is software state */
-extern char *pdma_base;
-extern unsigned long pdma_areasize;
 /* Common routines to all controller types on the Sparc. */
 static inline void virtual_dma_init(void)
@@ -263,8 +256,7 @@ static inline void sun_fd_enable_dma(void)
        pdma_areasize = pdma_size;
 }
-extern int sparc_floppy_request_irq(unsigned int irq,
+int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler);
-                                    irq_handler_t irq_handler);
 static int sun_fd_request_irq(void)
 {
diff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/floppy_64.h
index 7c90c50c200d..625756406a7e 100644
--- a/arch/sparc/include/asm/floppy_64.h
+++ b/arch/sparc/include/asm/floppy_64.h
@@ -296,7 +296,7 @@ struct sun_pci_dma_op {
 static struct sun_pci_dma_op sun_pci_dma_current = { -1U, 0, 0, NULL};
 static struct sun_pci_dma_op sun_pci_dma_pending = { -1U, 0, 0, NULL};
-extern irqreturn_t floppy_interrupt(int irq, void *dev_id);
+irqreturn_t floppy_interrupt(int irq, void *dev_id);
 static unsigned char sun_pci_fd_inb(unsigned long port)
 {
diff --git a/arch/sparc/include/asm/ftrace.h b/arch/sparc/include/asm/ftrace.h
index b0f18e9893db..9ec94ad116fb 100644
--- a/arch/sparc/include/asm/ftrace.h
+++ b/arch/sparc/include/asm/ftrace.h
@@ -6,7 +6,7 @@
 #define MCOUNT_INSN_SIZE        4 /* sizeof mcount call */
 #ifndef __ASSEMBLY__
-extern void _mcount(void);
+void _mcount(void);
 #endif
 #endif
@@ -22,4 +22,8 @@ struct dyn_arch_ftrace {
 };
 #endif /*  CONFIG_DYNAMIC_FTRACE */
+unsigned long prepare_ftrace_return(unsigned long parent,
+                                    unsigned long self_addr,
+                                    unsigned long frame_pointer);
 #endif /* _ASM_SPARC64_FTRACE */
diff --git a/arch/sparc/include/asm/highmem.h b/arch/sparc/include/asm/highmem.h
index 4f9e15c757e2..92ded294a4ec 100644
--- a/arch/sparc/include/asm/highmem.h
+++ b/arch/sparc/include/asm/highmem.h
@@ -31,7 +31,7 @@ extern unsigned long highstart_pfn, highend_pfn;
 extern pgprot_t kmap_prot;
 extern pte_t *pkmap_page_table;
-extern void kmap_init(void) __init;
+void kmap_init(void) __init;
 /*
 * Right now we initialize only a single pte table. It can be extended
@@ -49,8 +49,8 @@ extern void kmap_init(void) __init;
 #define PKMAP_END (PKMAP_ADDR(LAST_PKMAP))
-extern void *kmap_high(struct page *page);
+void *kmap_high(struct page *page);
-extern void kunmap_high(struct page *page);
+void kunmap_high(struct page *page);
 static inline void *kmap(struct page *page)
 {
@@ -68,8 +68,8 @@ static inline void kunmap(struct page *page)
        kunmap_high(page);
 }
-extern void *kmap_atomic(struct page *page);
+void *kmap_atomic(struct page *page);
-extern void __kunmap_atomic(void *kvaddr);
+void __kunmap_atomic(void *kvaddr);
 #define flush_cache_kmaps()     flush_cache_all()
diff --git a/arch/sparc/include/asm/hvtramp.h b/arch/sparc/include/asm/hvtramp.h
index b2b9b947b3a4..04b56f862bbe 100644
--- a/arch/sparc/include/asm/hvtramp.h
+++ b/arch/sparc/include/asm/hvtramp.h
@@ -19,7 +19,7 @@ struct hvtramp_descr {
        struct hvtramp_mapping  maps[1];
 };
-extern void hv_cpu_startup(unsigned long hvdescr_pa);
+void hv_cpu_startup(unsigned long hvdescr_pa);
 #endif
diff --git a/arch/sparc/include/asm/hypervisor.h b/arch/sparc/include/asm/hypervisor.h
index ca121f0fa3ec..94b39caea3eb 100644
--- a/arch/sparc/include/asm/hypervisor.h
+++ b/arch/sparc/include/asm/hypervisor.h
@@ -98,7 +98,7 @@
 #define HV_FAST_MACH_EXIT               0x00
 #ifndef __ASSEMBLY__
-extern void sun4v_mach_exit(unsigned long exit_code);
+void sun4v_mach_exit(unsigned long exit_code);
 #endif
 /* Domain services.  */
@@ -127,9 +127,9 @@ extern void sun4v_mach_exit(unsigned long exit_code);
 #define HV_FAST_MACH_DESC               0x01
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_mach_desc(unsigned long buffer_pa,
+unsigned long sun4v_mach_desc(unsigned long buffer_pa,
-                                     unsigned long buf_len,
+                              unsigned long buf_len,
-                                     unsigned long *real_buf_len);
+                              unsigned long *real_buf_len);
 #endif
 /* mach_sir()
@@ -148,7 +148,7 @@ extern unsigned long sun4v_mach_desc(unsigned long buffer_pa,
 #define HV_FAST_MACH_SIR                0x02
 #ifndef __ASSEMBLY__
-extern void sun4v_mach_sir(void);
+void sun4v_mach_sir(void);
 #endif
 /* mach_set_watchdog()
@@ -204,8 +204,8 @@ extern void sun4v_mach_sir(void);
 #define HV_FAST_MACH_SET_WATCHDOG       0x05
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_mach_set_watchdog(unsigned long timeout,
+unsigned long sun4v_mach_set_watchdog(unsigned long timeout,
-                                             unsigned long *orig_timeout);
+                                      unsigned long *orig_timeout);
 #endif
 /* CPU services.
@@ -250,10 +250,10 @@ extern unsigned long sun4v_mach_set_watchdog(unsigned long timeout,
 #define HV_FAST_CPU_START               0x10
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_cpu_start(unsigned long cpuid,
+unsigned long sun4v_cpu_start(unsigned long cpuid,
-                                     unsigned long pc,
+                              unsigned long pc,
-                                     unsigned long rtba,
+                              unsigned long rtba,
-                                     unsigned long arg0);
+                              unsigned long arg0);
 #endif
 /* cpu_stop()
@@ -278,7 +278,7 @@ extern unsigned long sun4v_cpu_start(unsigned long cpuid,
 #define HV_FAST_CPU_STOP                0x11
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_cpu_stop(unsigned long cpuid);
+unsigned long sun4v_cpu_stop(unsigned long cpuid);
 #endif
 /* cpu_yield()
@@ -295,7 +295,7 @@ extern unsigned long sun4v_cpu_stop(unsigned long cpuid);
 #define HV_FAST_CPU_YIELD               0x12
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_cpu_yield(void);
+unsigned long sun4v_cpu_yield(void);
 #endif
 /* cpu_qconf()
@@ -341,9 +341,9 @@ extern unsigned long sun4v_cpu_yield(void);
 #define  HV_CPU_QUEUE_NONRES_ERROR       0x3f
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_cpu_qconf(unsigned long type,
+unsigned long sun4v_cpu_qconf(unsigned long type,
-                                     unsigned long queue_paddr,
+                              unsigned long queue_paddr,
-                                     unsigned long num_queue_entries);
+                              unsigned long num_queue_entries);
 #endif
 /* cpu_qinfo()
@@ -394,7 +394,9 @@ extern unsigned long sun4v_cpu_qconf(unsigned long type,
 #define HV_FAST_CPU_MONDO_SEND          0x42
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count, unsigned long cpu_list_pa, unsigned long mondo_block_pa);
+unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count,
+                                   unsigned long cpu_list_pa,
+                                   unsigned long mondo_block_pa);
 #endif
 /* cpu_myid()
@@ -425,7 +427,7 @@ extern unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count, unsigned long
 #define  HV_CPU_STATE_ERROR              0x03
 #ifndef __ASSEMBLY__
-extern long sun4v_cpu_state(unsigned long cpuid);
+long sun4v_cpu_state(unsigned long cpuid);
 #endif
 /* cpu_set_rtba()
@@ -625,8 +627,8 @@ struct hv_fault_status {
 #define HV_FAST_MMU_TSB_CTX0            0x20
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,
+unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,
-                                        unsigned long tsb_desc_ra);
+                                 unsigned long tsb_desc_ra);
 #endif
 /* mmu_tsb_ctxnon0()
@@ -710,7 +712,7 @@ extern unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,
 #define HV_FAST_MMU_DEMAP_ALL           0x24
 #ifndef __ASSEMBLY__
-extern void sun4v_mmu_demap_all(void);
+void sun4v_mmu_demap_all(void);
 #endif
 /* mmu_map_perm_addr()
@@ -740,10 +742,10 @@ extern void sun4v_mmu_demap_all(void);
 #define HV_FAST_MMU_MAP_PERM_ADDR       0x25
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
+unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
-                                             unsigned long set_to_zero,
+                                      unsigned long set_to_zero,
-                                             unsigned long tte,
+                                      unsigned long tte,
-                                             unsigned long flags);
+                                      unsigned long flags);
 #endif
 /* mmu_fault_area_conf()
@@ -945,7 +947,7 @@ extern unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
 #define HV_FAST_TOD_GET                 0x50
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_tod_get(unsigned long *time);
+unsigned long sun4v_tod_get(unsigned long *time);
 #endif
 /* tod_set()
@@ -962,7 +964,7 @@ extern unsigned long sun4v_tod_get(unsigned long *time);
 #define HV_FAST_TOD_SET                 0x51
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_tod_set(unsigned long time);
+unsigned long sun4v_tod_set(unsigned long time);
 #endif
 /* Console services */
@@ -1038,14 +1040,14 @@ extern unsigned long sun4v_tod_set(unsigned long time);
 #define HV_FAST_CONS_WRITE              0x63
 #ifndef __ASSEMBLY__
-extern long sun4v_con_getchar(long *status);
+long sun4v_con_getchar(long *status);
-extern long sun4v_con_putchar(long c);
+long sun4v_con_putchar(long c);
-extern long sun4v_con_read(unsigned long buffer,
+long sun4v_con_read(unsigned long buffer,
-                           unsigned long size,
+                    unsigned long size,
-                           unsigned long *bytes_read);
+                    unsigned long *bytes_read);
-extern unsigned long sun4v_con_write(unsigned long buffer,
+unsigned long sun4v_con_write(unsigned long buffer,
-                                     unsigned long size,
+                              unsigned long size,
-                                     unsigned long *bytes_written);
+                              unsigned long *bytes_written);
 #endif
 /* mach_set_soft_state()
@@ -1080,8 +1082,8 @@ extern unsigned long sun4v_con_write(unsigned long buffer,
 #define  HV_SOFT_STATE_TRANSITION        0x02
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_mach_set_soft_state(unsigned long soft_state,
+unsigned long sun4v_mach_set_soft_state(unsigned long soft_state,
-                                               unsigned long msg_string_ra);
+                                        unsigned long msg_string_ra);
 #endif
 /* mach_get_soft_state()
@@ -1159,20 +1161,20 @@ extern unsigned long sun4v_mach_set_soft_state(unsigned long soft_state,
 #define HV_FAST_SVC_CLRSTATUS           0x84
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_svc_send(unsigned long svc_id,
+unsigned long sun4v_svc_send(unsigned long svc_id,
-                                    unsigned long buffer,
+                             unsigned long buffer,
-                                    unsigned long buffer_size,
+                             unsigned long buffer_size,
-                                    unsigned long *sent_bytes);
+                             unsigned long *sent_bytes);
-extern unsigned long sun4v_svc_recv(unsigned long svc_id,
+unsigned long sun4v_svc_recv(unsigned long svc_id,
-                                    unsigned long buffer,
+                             unsigned long buffer,
-                                    unsigned long buffer_size,
+                             unsigned long buffer_size,
-                                    unsigned long *recv_bytes);
+                             unsigned long *recv_bytes);
-extern unsigned long sun4v_svc_getstatus(unsigned long svc_id,
+unsigned long sun4v_svc_getstatus(unsigned long svc_id,
-                                         unsigned long *status_bits);
+                                  unsigned long *status_bits);
-extern unsigned long sun4v_svc_setstatus(unsigned long svc_id,
+unsigned long sun4v_svc_setstatus(unsigned long svc_id,
-                                         unsigned long status_bits);
+                                  unsigned long status_bits);
-extern unsigned long sun4v_svc_clrstatus(unsigned long svc_id,
+unsigned long sun4v_svc_clrstatus(unsigned long svc_id,
-                                         unsigned long status_bits);
+                                  unsigned long status_bits);
 #endif
 /* Trap trace services.
@@ -1458,8 +1460,8 @@ struct hv_trap_trace_entry {
 #define HV_FAST_INTR_DEVINO2SYSINO      0xa0
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
+unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
-                                            unsigned long devino);
+                                     unsigned long devino);
 #endif
 /* intr_getenabled()
@@ -1476,7 +1478,7 @@ extern unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
 #define HV_FAST_INTR_GETENABLED         0xa1
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_intr_getenabled(unsigned long sysino);
+unsigned long sun4v_intr_getenabled(unsigned long sysino);
 #endif
 /* intr_setenabled()
@@ -1492,7 +1494,8 @@ extern unsigned long sun4v_intr_getenabled(unsigned long sysino);
 #define HV_FAST_INTR_SETENABLED         0xa2
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_intr_setenabled(unsigned long sysino, unsigned long intr_enabled);
+unsigned long sun4v_intr_setenabled(unsigned long sysino,
+                                    unsigned long intr_enabled);
 #endif
 /* intr_getstate()
@@ -1508,7 +1511,7 @@ extern unsigned long sun4v_intr_setenabled(unsigned long sysino, unsigned long i
 #define HV_FAST_INTR_GETSTATE           0xa3
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_intr_getstate(unsigned long sysino);
+unsigned long sun4v_intr_getstate(unsigned long sysino);
 #endif
 /* intr_setstate()
@@ -1528,7 +1531,7 @@ extern unsigned long sun4v_intr_getstate(unsigned long sysino);
 #define HV_FAST_INTR_SETSTATE           0xa4
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_intr_setstate(unsigned long sysino, unsigned long intr_state);
+unsigned long sun4v_intr_setstate(unsigned long sysino, unsigned long intr_state);
 #endif
 /* intr_gettarget()
@@ -1546,7 +1549,7 @@ extern unsigned long sun4v_intr_setstate(unsigned long sysino, unsigned long int
 #define HV_FAST_INTR_GETTARGET          0xa5
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_intr_gettarget(unsigned long sysino);
+unsigned long sun4v_intr_gettarget(unsigned long sysino);
 #endif
 /* intr_settarget()
@@ -1563,7 +1566,7 @@ extern unsigned long sun4v_intr_gettarget(unsigned long sysino);
 #define HV_FAST_INTR_SETTARGET          0xa6
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_intr_settarget(unsigned long sysino, unsigned long cpuid);
+unsigned long sun4v_intr_settarget(unsigned long sysino, unsigned long cpuid);
 #endif
 /* vintr_get_cookie()
@@ -1647,30 +1650,30 @@ extern unsigned long sun4v_intr_settarget(unsigned long sysino, unsigned long cp
 #define HV_FAST_VINTR_SET_TARGET        0xae
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_vintr_get_cookie(unsigned long dev_handle,
+unsigned long sun4v_vintr_get_cookie(unsigned long dev_handle,
-                                            unsigned long dev_ino,
+                                     unsigned long dev_ino,
-                                            unsigned long *cookie);
+                                     unsigned long *cookie);
-extern unsigned long sun4v_vintr_set_cookie(unsigned long dev_handle,
+unsigned long sun4v_vintr_set_cookie(unsigned long dev_handle,
-                                            unsigned long dev_ino,
+                                     unsigned long dev_ino,
-                                            unsigned long cookie);
+                                     unsigned long cookie);
-extern unsigned long sun4v_vintr_get_valid(unsigned long dev_handle,
+unsigned long sun4v_vintr_get_valid(unsigned long dev_handle,
-                                           unsigned long dev_ino,
+                                    unsigned long dev_ino,
-                                           unsigned long *valid);
+                                    unsigned long *valid);
-extern unsigned long sun4v_vintr_set_valid(unsigned long dev_handle,
+unsigned long sun4v_vintr_set_valid(unsigned long dev_handle,
-                                           unsigned long dev_ino,
+                                    unsigned long dev_ino,
-                                           unsigned long valid);
+                                    unsigned long valid);
-extern unsigned long sun4v_vintr_get_state(unsigned long dev_handle,
+unsigned long sun4v_vintr_get_state(unsigned long dev_handle,
-                                           unsigned long dev_ino,
+                                    unsigned long dev_ino,
-                                           unsigned long *state);
+                                    unsigned long *state);
-extern unsigned long sun4v_vintr_set_state(unsigned long dev_handle,
+unsigned long sun4v_vintr_set_state(unsigned long dev_handle,
-                                           unsigned long dev_ino,
+                                    unsigned long dev_ino,
-                                           unsigned long state);
+                                    unsigned long state);
-extern unsigned long sun4v_vintr_get_target(unsigned long dev_handle,
+unsigned long sun4v_vintr_get_target(unsigned long dev_handle,
-                                            unsigned long dev_ino,
+                                     unsigned long dev_ino,
-                                            unsigned long *cpuid);
+                                     unsigned long *cpuid);
-extern unsigned long sun4v_vintr_set_target(unsigned long dev_handle,
+unsigned long sun4v_vintr_set_target(unsigned long dev_handle,
-                                            unsigned long dev_ino,
+                                     unsigned long dev_ino,
-                                            unsigned long cpuid);
+                                     unsigned long cpuid);
 #endif
 /* PCI IO services.
@@ -2627,50 +2630,50 @@ struct ldc_mtable_entry {
 #define HV_FAST_LDC_REVOKE              0xef
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_ldc_tx_qconf(unsigned long channel,
+unsigned long sun4v_ldc_tx_qconf(unsigned long channel,
-                                        unsigned long ra,
+                                 unsigned long ra,
-                                        unsigned long num_entries);
+                                 unsigned long num_entries);
-extern unsigned long sun4v_ldc_tx_qinfo(unsigned long channel,
+unsigned long sun4v_ldc_tx_qinfo(unsigned long channel,
-                                        unsigned long *ra,
+                                 unsigned long *ra,
-                                        unsigned long *num_entries);
+                                 unsigned long *num_entries);
-extern unsigned long sun4v_ldc_tx_get_state(unsigned long channel,
+unsigned long sun4v_ldc_tx_get_state(unsigned long channel,
-                                            unsigned long *head_off,
+                                     unsigned long *head_off,
-                                            unsigned long *tail_off,
+                                     unsigned long *tail_off,
-                                            unsigned long *chan_state);
+                                     unsigned long *chan_state);
-extern unsigned long sun4v_ldc_tx_set_qtail(unsigned long channel,
+unsigned long sun4v_ldc_tx_set_qtail(unsigned long channel,
-                                            unsigned long tail_off);
+                                     unsigned long tail_off);
-extern unsigned long sun4v_ldc_rx_qconf(unsigned long channel,
+unsigned long sun4v_ldc_rx_qconf(unsigned long channel,
-                                        unsigned long ra,
+                                 unsigned long ra,
-                                        unsigned long num_entries);
+                                 unsigned long num_entries);
-extern unsigned long sun4v_ldc_rx_qinfo(unsigned long channel,
+unsigned long sun4v_ldc_rx_qinfo(unsigned long channel,
-                                        unsigned long *ra,
+                                 unsigned long *ra,
-                                        unsigned long *num_entries);
+                                 unsigned long *num_entries);
-extern unsigned long sun4v_ldc_rx_get_state(unsigned long channel,
+unsigned long sun4v_ldc_rx_get_state(unsigned long channel,
-                                            unsigned long *head_off,
+                                     unsigned long *head_off,
-                                            unsigned long *tail_off,
+                                     unsigned long *tail_off,
-                                            unsigned long *chan_state);
+                                     unsigned long *chan_state);
-extern unsigned long sun4v_ldc_rx_set_qhead(unsigned long channel,
+unsigned long sun4v_ldc_rx_set_qhead(unsigned long channel,
-                                            unsigned long head_off);
+                                     unsigned long head_off);
-extern unsigned long sun4v_ldc_set_map_table(unsigned long channel,
+unsigned long sun4v_ldc_set_map_table(unsigned long channel,
-                                             unsigned long ra,
+                                      unsigned long ra,
-                                             unsigned long num_entries);
+                                      unsigned long num_entries);
-extern unsigned long sun4v_ldc_get_map_table(unsigned long channel,
+unsigned long sun4v_ldc_get_map_table(unsigned long channel,
-                                             unsigned long *ra,
+                                      unsigned long *ra,
-                                             unsigned long *num_entries);
+                                      unsigned long *num_entries);
-extern unsigned long sun4v_ldc_copy(unsigned long channel,
+unsigned long sun4v_ldc_copy(unsigned long channel,
-                                    unsigned long dir_code,
+                             unsigned long dir_code,
-                                    unsigned long tgt_raddr,
+                             unsigned long tgt_raddr,
-                                    unsigned long lcl_raddr,
+                             unsigned long lcl_raddr,
-                                    unsigned long len,
+                             unsigned long len,
-                                    unsigned long *actual_len);
+                             unsigned long *actual_len);
-extern unsigned long sun4v_ldc_mapin(unsigned long channel,
+unsigned long sun4v_ldc_mapin(unsigned long channel,
-                                     unsigned long cookie,
+                              unsigned long cookie,
-                                     unsigned long *ra,
+                              unsigned long *ra,
-                                     unsigned long *perm);
+                              unsigned long *perm);
-extern unsigned long sun4v_ldc_unmap(unsigned long ra);
+unsigned long sun4v_ldc_unmap(unsigned long ra);
-extern unsigned long sun4v_ldc_revoke(unsigned long channel,
+unsigned long sun4v_ldc_revoke(unsigned long channel,
-                                      unsigned long cookie,
+                               unsigned long cookie,
-                                      unsigned long mte_cookie);
+                               unsigned long mte_cookie);
 #endif
 /* Performance counter services.  */
@@ -2727,14 +2730,14 @@ extern unsigned long sun4v_ldc_revoke(unsigned long channel,
 #define HV_FAST_N2_SET_PERFREG          0x105
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_niagara_getperf(unsigned long reg,
+unsigned long sun4v_niagara_getperf(unsigned long reg,
-                                           unsigned long *val);
+                                    unsigned long *val);
-extern unsigned long sun4v_niagara_setperf(unsigned long reg,
+unsigned long sun4v_niagara_setperf(unsigned long reg,
-                                           unsigned long val);
+                                    unsigned long val);
-extern unsigned long sun4v_niagara2_getperf(unsigned long reg,
+unsigned long sun4v_niagara2_getperf(unsigned long reg,
-                                            unsigned long *val);
+                                     unsigned long *val);
-extern unsigned long sun4v_niagara2_setperf(unsigned long reg,
+unsigned long sun4v_niagara2_setperf(unsigned long reg,
-                                            unsigned long val);
+                                     unsigned long val);
 #endif
 /* MMU statistics services.
@@ -2829,8 +2832,8 @@ struct hv_mmu_statistics {
 #define HV_FAST_MMUSTAT_INFO            0x103
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_mmustat_conf(unsigned long ra, unsigned long *orig_ra);
+unsigned long sun4v_mmustat_conf(unsigned long ra, unsigned long *orig_ra);
-extern unsigned long sun4v_mmustat_info(unsigned long *ra);
+unsigned long sun4v_mmustat_info(unsigned long *ra);
 #endif
 /* NCS crypto services  */
@@ -2919,9 +2922,9 @@ struct hv_ncs_qtail_update_arg {
 #define HV_FAST_NCS_REQUEST             0x110
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_ncs_request(unsigned long request,
+unsigned long sun4v_ncs_request(unsigned long request,
-                                       unsigned long arg_ra,
+                                unsigned long arg_ra,
-                                       unsigned long arg_size);
+                                unsigned long arg_size);
 #endif
 #define HV_FAST_FIRE_GET_PERFREG        0x120
@@ -2930,18 +2933,18 @@ extern unsigned long sun4v_ncs_request(unsigned long request,
 #define HV_FAST_REBOOT_DATA_SET         0x172
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_reboot_data_set(unsigned long ra,
+unsigned long sun4v_reboot_data_set(unsigned long ra,
-                                           unsigned long len);
+                                    unsigned long len);
 #endif
 #define HV_FAST_VT_GET_PERFREG          0x184
 #define HV_FAST_VT_SET_PERFREG          0x185
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_vt_get_perfreg(unsigned long reg_num,
+unsigned long sun4v_vt_get_perfreg(unsigned long reg_num,
-                                          unsigned long *reg_val);
+                                   unsigned long *reg_val);
-extern unsigned long sun4v_vt_set_perfreg(unsigned long reg_num,
+unsigned long sun4v_vt_set_perfreg(unsigned long reg_num,
-                                          unsigned long reg_val);
+                                   unsigned long reg_val);
 #endif
 /* Function numbers for HV_CORE_TRAP.  */
@@ -2978,21 +2981,21 @@ extern unsigned long sun4v_vt_set_perfreg(unsigned long reg_num,
 #define HV_GRP_DIAG                     0x0300
 #ifndef __ASSEMBLY__
-extern unsigned long sun4v_get_version(unsigned long group,
+unsigned long sun4v_get_version(unsigned long group,
-                                       unsigned long *major,
+                                unsigned long *major,
-                                       unsigned long *minor);
+                                unsigned long *minor);
-extern unsigned long sun4v_set_version(unsigned long group,
+unsigned long sun4v_set_version(unsigned long group,
-                                       unsigned long major,
+                                unsigned long major,
-                                       unsigned long minor,
+                                unsigned long minor,
-                                       unsigned long *actual_minor);
+                                unsigned long *actual_minor);
-extern int sun4v_hvapi_register(unsigned long group, unsigned long major,
+int sun4v_hvapi_register(unsigned long group, unsigned long major,
-                                unsigned long *minor);
+                         unsigned long *minor);
-extern void sun4v_hvapi_unregister(unsigned long group);
+void sun4v_hvapi_unregister(unsigned long group);
-extern int sun4v_hvapi_get(unsigned long group,
+int sun4v_hvapi_get(unsigned long group,
-                           unsigned long *major,
+                    unsigned long *major,
-                           unsigned long *minor);
+                    unsigned long *minor);
-extern void sun4v_hvapi_init(void);
+void sun4v_hvapi_init(void);
 #endif
 #endif /* !(_SPARC64_HYPERVISOR_H) */
diff --git a/arch/sparc/include/asm/idprom.h b/arch/sparc/include/asm/idprom.h
index 6976aa2439c6..3793f7f91c42 100644
--- a/arch/sparc/include/asm/idprom.h
+++ b/arch/sparc/include/asm/idprom.h
@@ -20,6 +20,6 @@ struct idprom {
 };
 extern struct idprom *idprom;
-extern void idprom_init(void);
+void idprom_init(void);
 #endif /* !(_SPARC_IDPROM_H) */
diff --git a/arch/sparc/include/asm/io-unit.h b/arch/sparc/include/asm/io-unit.h
index 01ab2f613e91..04a9701e7202 100644
--- a/arch/sparc/include/asm/io-unit.h
+++ b/arch/sparc/include/asm/io-unit.h
@@ -43,7 +43,7 @@
 struct iounit_struct {
        unsigned long           bmap[(IOUNIT_DMA_SIZE >> (PAGE_SHIFT + 3)) / sizeof(unsigned long)];
        spinlock_t              lock;
-        iopte_t                 *page_table;
+        iopte_t __iomem         *page_table;
        unsigned long           rotor[3];
        unsigned long           limit[4];
 };
diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h
index c1acbd891cbc..9f532902627c 100644
--- a/arch/sparc/include/asm/io_32.h
+++ b/arch/sparc/include/asm/io_32.h
@@ -2,191 +2,94 @@
 #define __SPARC_IO_H
 #include <linux/kernel.h>
-#include <linux/types.h>
 #include <linux/ioport.h>  /* struct resource */
-#include <asm/page.h>      /* IO address mapping routines need this */
+#define readb_relaxed(__addr)   readb(__addr)
-#include <asm-generic/pci_iomap.h>
+#define readw_relaxed(__addr)   readw(__addr)
+#define readl_relaxed(__addr)   readl(__addr)
-#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
-static inline u32 flip_dword (u32 l)
-{
-        return ((l&0xff)<<24) | (((l>>8)&0xff)<<16) | (((l>>16)&0xff)<<8)| ((l>>24)&0xff);
-}
-static inline u16 flip_word (u16 w)
-{
-        return ((w&0xff) << 8) | ((w>>8)&0xff);
-}
-#define mmiowb()
-/*
- * Memory mapped I/O to PCI
- */
-static inline u8 __raw_readb(const volatile void __iomem *addr)
-{
-        return *(__force volatile u8 *)addr;
-}
-static inline u16 __raw_readw(const volatile void __iomem *addr)
-{
-        return *(__force volatile u16 *)addr;
-}
-static inline u32 __raw_readl(const volatile void __iomem *addr)
-{
-        return *(__force volatile u32 *)addr;
-}
-static inline void __raw_writeb(u8 b, volatile void __iomem *addr)
+#define IO_SPACE_LIMIT 0xffffffff
-{
-        *(__force volatile u8 *)addr = b;
-}
-static inline void __raw_writew(u16 w, volatile void __iomem *addr)
+#define memset_io(d,c,sz)     _memset_io(d,c,sz)
-{
+#define memcpy_fromio(d,s,sz) _memcpy_fromio(d,s,sz)
-        *(__force volatile u16 *)addr = w;
+#define memcpy_toio(d,s,sz)   _memcpy_toio(d,s,sz)
-}
-static inline void __raw_writel(u32 l, volatile void __iomem *addr)
+#include <asm-generic/io.h>
-{
-        *(__force volatile u32 *)addr = l;
-}
-static inline u8 __readb(const volatile void __iomem *addr)
+static inline void _memset_io(volatile void __iomem *dst,
+                              int c, __kernel_size_t n)
 {
-        return *(__force volatile u8 *)addr;
+        volatile void __iomem *d = dst;
-}
-static inline u16 __readw(const volatile void __iomem *addr)
+        while (n--) {
-{
+                writeb(c, d);
-        return flip_word(*(__force volatile u16 *)addr);
+                d++;
+        }
 }
-static inline u32 __readl(const volatile void __iomem *addr)
+static inline void _memcpy_fromio(void *dst, const volatile void __iomem *src,
+                                  __kernel_size_t n)
 {
-        return flip_dword(*(__force volatile u32 *)addr);
+        char *d = dst;
-}
-static inline void __writeb(u8 b, volatile void __iomem *addr)
+        while (n--) {
-{
+                char tmp = readb(src);
-        *(__force volatile u8 *)addr = b;
+                *d++ = tmp;
+                src++;
+        }
 }
-static inline void __writew(u16 w, volatile void __iomem *addr)
+static inline void _memcpy_toio(volatile void __iomem *dst, const void *src,
+                                __kernel_size_t n)
 {
-        *(__force volatile u16 *)addr = flip_word(w);
+        const char *s = src;
-}
+        volatile void __iomem *d = dst;
-static inline void __writel(u32 l, volatile void __iomem *addr)
+        while (n--) {
-{
+                char tmp = *s++;
-        *(__force volatile u32 *)addr = flip_dword(l);
+                writeb(tmp, d);
+                d++;
+        }
 }
-#define readb(__addr)           __readb(__addr)
-#define readw(__addr)           __readw(__addr)
-#define readl(__addr)           __readl(__addr)
-#define readb_relaxed(__addr)   readb(__addr)
-#define readw_relaxed(__addr)   readw(__addr)
-#define readl_relaxed(__addr)   readl(__addr)
-#define writeb(__b, __addr)     __writeb((__b),(__addr))
-#define writew(__w, __addr)     __writew((__w),(__addr))
-#define writel(__l, __addr)     __writel((__l),(__addr))
-/*
- * I/O space operations
- *
- * Arrangement on a Sun is somewhat complicated.
- *
- * First of all, we want to use standard Linux drivers
- * for keyboard, PC serial, etc. These drivers think
- * they access I/O space and use inb/outb.
- * On the other hand, EBus bridge accepts PCI *memory*
- * cycles and converts them into ISA *I/O* cycles.
- * Ergo, we want inb & outb to generate PCI memory cycles.
- *
- * If we want to issue PCI *I/O* cycles, we do this
- * with a low 64K fixed window in PCIC. This window gets
- * mapped somewhere into virtual kernel space and we
- * can use inb/outb again.
- */
-#define inb_local(__addr)       __readb((void __iomem *)(unsigned long)(__addr))
-#define inb(__addr)             __readb((void __iomem *)(unsigned long)(__addr))
-#define inw(__addr)             __readw((void __iomem *)(unsigned long)(__addr))
-#define inl(__addr)             __readl((void __iomem *)(unsigned long)(__addr))
-#define outb_local(__b, __addr) __writeb(__b, (void __iomem *)(unsigned long)(__addr))
-#define outb(__b, __addr)       __writeb(__b, (void __iomem *)(unsigned long)(__addr))
-#define outw(__w, __addr)       __writew(__w, (void __iomem *)(unsigned long)(__addr))
-#define outl(__l, __addr)       __writel(__l, (void __iomem *)(unsigned long)(__addr))
-#define inb_p(__addr)           inb(__addr)
-#define outb_p(__b, __addr)     outb(__b, __addr)
-#define inw_p(__addr)           inw(__addr)
-#define outw_p(__w, __addr)     outw(__w, __addr)
-#define inl_p(__addr)           inl(__addr)
-#define outl_p(__l, __addr)     outl(__l, __addr)
-void outsb(unsigned long addr, const void *src, unsigned long cnt);
-void outsw(unsigned long addr, const void *src, unsigned long cnt);
-void outsl(unsigned long addr, const void *src, unsigned long cnt);
-void insb(unsigned long addr, void *dst, unsigned long count);
-void insw(unsigned long addr, void *dst, unsigned long count);
-void insl(unsigned long addr, void *dst, unsigned long count);
-#define IO_SPACE_LIMIT 0xffffffff
 /*
 * SBus accessors.
 *
 * SBus has only one, memory mapped, I/O space.
 * We do not need to flip bytes for SBus of course.
 */
-static inline u8 _sbus_readb(const volatile void __iomem *addr)
+static inline u8 sbus_readb(const volatile void __iomem *addr)
 {
        return *(__force volatile u8 *)addr;
 }
-static inline u16 _sbus_readw(const volatile void __iomem *addr)
+static inline u16 sbus_readw(const volatile void __iomem *addr)
 {
        return *(__force volatile u16 *)addr;
 }
-static inline u32 _sbus_readl(const volatile void __iomem *addr)
+static inline u32 sbus_readl(const volatile void __iomem *addr)
 {
        return *(__force volatile u32 *)addr;
 }
-static inline void _sbus_writeb(u8 b, volatile void __iomem *addr)
+static inline void sbus_writeb(u8 b, volatile void __iomem *addr)
 {
        *(__force volatile u8 *)addr = b;
 }
-static inline void _sbus_writew(u16 w, volatile void __iomem *addr)
+static inline void sbus_writew(u16 w, volatile void __iomem *addr)
 {
        *(__force volatile u16 *)addr = w;
 }
-static inline void _sbus_writel(u32 l, volatile void __iomem *addr)
+static inline void sbus_writel(u32 l, volatile void __iomem *addr)
 {
        *(__force volatile u32 *)addr = l;
 }
-/*
+static inline void sbus_memset_io(volatile void __iomem *__dst, int c,
- * The only reason for #define's is to hide casts to unsigned long.
+                                  __kernel_size_t n)
- */
-#define sbus_readb(__addr)              _sbus_readb(__addr)
-#define sbus_readw(__addr)              _sbus_readw(__addr)
-#define sbus_readl(__addr)              _sbus_readl(__addr)
-#define sbus_writeb(__b, __addr)        _sbus_writeb(__b, __addr)
-#define sbus_writew(__w, __addr)        _sbus_writew(__w, __addr)
-#define sbus_writel(__l, __addr)        _sbus_writel(__l, __addr)
-static inline void sbus_memset_io(volatile void __iomem *__dst, int c, __kernel_size_t n)
 {
        while(n--) {
                sbus_writeb(c, __dst);
@@ -194,22 +97,9 @@ static inline void sbus_memset_io(volatile void __iomem *__dst, int c, __kernel_
        }
 }
-static inline void
+static inline void sbus_memcpy_fromio(void *dst,
-_memset_io(volatile void __iomem *dst, int c, __kernel_size_t n)
+                                      const volatile void __iomem *src,
-{
+                                      __kernel_size_t n)
-        volatile void __iomem *d = dst;
-        while (n--) {
-                writeb(c, d);
-                d++;
-        }
-}
-#define memset_io(d,c,sz)       _memset_io(d,c,sz)
-static inline void
-_sbus_memcpy_fromio(void *dst, const volatile void __iomem *src,
-                    __kernel_size_t n)
 {
        char *d = dst;
@@ -220,25 +110,9 @@ _sbus_memcpy_fromio(void *dst, const volatile void __iomem *src,
        }
 }
-#define sbus_memcpy_fromio(d, s, sz)    _sbus_memcpy_fromio(d, s, sz)
+static inline void sbus_memcpy_toio(volatile void __iomem *dst,
+                                    const void *src,
-static inline void
+                                    __kernel_size_t n)
-_memcpy_fromio(void *dst, const volatile void __iomem *src, __kernel_size_t n)
-{
-        char *d = dst;
-        while (n--) {
-                char tmp = readb(src);
-                *d++ = tmp;
-                src++;
-        }
-}
-#define memcpy_fromio(d,s,sz)   _memcpy_fromio(d,s,sz)
-static inline void
-_sbus_memcpy_toio(volatile void __iomem *dst, const void *src,
-                  __kernel_size_t n)
 {
        const char *s = src;
        volatile void __iomem *d = dst;
@@ -250,81 +124,26 @@ _sbus_memcpy_toio(volatile void __iomem *dst, const void *src,
        }
 }
-#define sbus_memcpy_toio(d, s, sz)      _sbus_memcpy_toio(d, s, sz)
-static inline void
-_memcpy_toio(volatile void __iomem *dst, const void *src, __kernel_size_t n)
-{
-        const char *s = src;
-        volatile void __iomem *d = dst;
-        while (n--) {
-                char tmp = *s++;
-                writeb(tmp, d);
-                d++;
-        }
-}
-#define memcpy_toio(d,s,sz)     _memcpy_toio(d,s,sz)
 #ifdef __KERNEL__
 /*
 * Bus number may be embedded in the higher bits of the physical address.
 * This is why we have no bus number argument to ioremap().
 */
-extern void __iomem *ioremap(unsigned long offset, unsigned long size);
+void __iomem *ioremap(unsigned long offset, unsigned long size);
 #define ioremap_nocache(X,Y)    ioremap((X),(Y))
 #define ioremap_wc(X,Y)         ioremap((X),(Y))
-extern void iounmap(volatile void __iomem *addr);
+void iounmap(volatile void __iomem *addr);
-#define ioread8(X)                      readb(X)
-#define ioread16(X)                     readw(X)
-#define ioread16be(X)                   __raw_readw(X)
-#define ioread32(X)                     readl(X)
-#define ioread32be(X)                   __raw_readl(X)
-#define iowrite8(val,X)                 writeb(val,X)
-#define iowrite16(val,X)                writew(val,X)
-#define iowrite16be(val,X)              __raw_writew(val,X)
-#define iowrite32(val,X)                writel(val,X)
-#define iowrite32be(val,X)              __raw_writel(val,X)
-static inline void ioread8_rep(void __iomem *port, void *buf, unsigned long count)
-{
-        insb((unsigned long __force)port, buf, count);
-}
-static inline void ioread16_rep(void __iomem *port, void *buf, unsigned long count)
-{
-        insw((unsigned long __force)port, buf, count);
-}
-static inline void ioread32_rep(void __iomem *port, void *buf, unsigned long count)
-{
-        insl((unsigned long __force)port, buf, count);
-}
-static inline void iowrite8_rep(void __iomem *port, const void *buf, unsigned long count)
-{
-        outsb((unsigned long __force)port, buf, count);
-}
-static inline void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count)
-{
-        outsw((unsigned long __force)port, buf, count);
-}
-static inline void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count)
-{
-        outsl((unsigned long __force)port, buf, count);
-}
 /* Create a virtual mapping cookie for an IO port range */
-extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
+void __iomem *ioport_map(unsigned long port, unsigned int nr);
-extern void ioport_unmap(void __iomem *);
+void ioport_unmap(void __iomem *);
 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
 struct pci_dev;
-extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
+void pci_iounmap(struct pci_dev *dev, void __iomem *);
 /*
 * At the moment, we do not use CMOS_READ anywhere outside of rtc.c,
@@ -343,21 +162,11 @@ static inline int sbus_can_burst64(void)
        return 0; /* actually, sparc_cpu_model==sun4d */
 }
 struct device;
-extern void sbus_set_sbus64(struct device *, int);
+void sbus_set_sbus64(struct device *, int);
 #endif
 #define __ARCH_HAS_NO_PAGE_ZERO_MAPPED          1
-/*
- * Convert a physical pointer to a virtual kernel pointer for /dev/mem
- * access
- */
-#define xlate_dev_mem_ptr(p)    __va(p)
-/*
- * Convert a virtual cached pointer to an uncached pointer
- */
-#define xlate_dev_kmem_ptr(p)   p
 #endif /* !(__SPARC_IO_H) */
diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h
index 09b0b88aeb2a..05381c3a4228 100644
--- a/arch/sparc/include/asm/io_64.h
+++ b/arch/sparc/include/asm/io_64.h
@@ -15,7 +15,6 @@
 /* BIO layer definitions. */
 extern unsigned long kern_base, kern_size;
-#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
 static inline u8 _inb(unsigned long addr)
 {
@@ -91,12 +90,12 @@ static inline void _outl(u32 l, unsigned long addr)
 #define inl_p(__addr)           inl(__addr)
 #define outl_p(__l, __addr)     outl(__l, __addr)
-extern void outsb(unsigned long, const void *, unsigned long);
+void outsb(unsigned long, const void *, unsigned long);
-extern void outsw(unsigned long, const void *, unsigned long);
+void outsw(unsigned long, const void *, unsigned long);
-extern void outsl(unsigned long, const void *, unsigned long);
+void outsl(unsigned long, const void *, unsigned long);
-extern void insb(unsigned long, void *, unsigned long);
+void insb(unsigned long, void *, unsigned long);
-extern void insw(unsigned long, void *, unsigned long);
+void insw(unsigned long, void *, unsigned long);
-extern void insl(unsigned long, void *, unsigned long);
+void insl(unsigned long, void *, unsigned long);
 static inline void ioread8_rep(void __iomem *port, void *buf, unsigned long count)
 {
@@ -509,12 +508,12 @@ static inline void iounmap(volatile void __iomem *addr)
 #define iowrite32be(val,X)              __raw_writel(val,X)
 /* Create a virtual mapping cookie for an IO port range */
-extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
+void __iomem *ioport_map(unsigned long port, unsigned int nr);
-extern void ioport_unmap(void __iomem *);
+void ioport_unmap(void __iomem *);
 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
 struct pci_dev;
-extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
+void pci_iounmap(struct pci_dev *dev, void __iomem *);
 static inline int sbus_can_dma_64bit(void)
 {
@@ -525,7 +524,7 @@ static inline int sbus_can_burst64(void)
        return 1;
 }
 struct device;
-extern void sbus_set_sbus64(struct device *, int);
+void sbus_set_sbus64(struct device *, int);
 /*
 * Convert a physical pointer to a virtual kernel pointer for /dev/mem
diff --git a/arch/sparc/include/asm/iommu_32.h b/arch/sparc/include/asm/iommu_32.h
index 70c589c05a10..f6c066b52fd6 100644
--- a/arch/sparc/include/asm/iommu_32.h
+++ b/arch/sparc/include/asm/iommu_32.h
@@ -99,7 +99,7 @@ struct iommu_regs {
 #define IOPTE_WAZ           0x00000001 /* Write as zeros */
 struct iommu_struct {
-        struct iommu_regs *regs;
+        struct iommu_regs __iomem *regs;
        iopte_t *page_table;
        /* For convenience */
        unsigned long start; /* First managed virtual address */
@@ -108,14 +108,14 @@ struct iommu_struct {
        struct bit_map usemap;
 };
-static inline void iommu_invalidate(struct iommu_regs *regs)
+static inline void iommu_invalidate(struct iommu_regs __iomem *regs)
 {
-        regs->tlbflush = 0;
+        sbus_writel(0, &regs->tlbflush);
 }
-static inline void iommu_invalidate_page(struct iommu_regs *regs, unsigned long ba)
+static inline void iommu_invalidate_page(struct iommu_regs __iomem *regs, unsigned long ba)
 {
-        regs->pageflush = (ba & PAGE_MASK);
+        sbus_writel(ba & PAGE_MASK, &regs->pageflush);
 }
 #endif /* !(_SPARC_IOMMU_H) */
diff --git a/arch/sparc/include/asm/iommu_64.h b/arch/sparc/include/asm/iommu_64.h
index caf798b56191..2b9321ab064d 100644
--- a/arch/sparc/include/asm/iommu_64.h
+++ b/arch/sparc/include/asm/iommu_64.h
@@ -58,8 +58,8 @@ struct strbuf {
        volatile unsigned long  __flushflag_buf[(64+(64-1)) / sizeof(long)];
 };
-extern int iommu_table_init(struct iommu *iommu, int tsbsize,
+int iommu_table_init(struct iommu *iommu, int tsbsize,
-                            u32 dma_offset, u32 dma_addr_mask,
+                     u32 dma_offset, u32 dma_addr_mask,
-                            int numa_node);
+                     int numa_node);
 #endif /* !(_SPARC64_IOMMU_H) */
diff --git a/arch/sparc/include/asm/irq_32.h b/arch/sparc/include/asm/irq_32.h
index 2ae3acaeb1b3..eecd3d8442c9 100644
--- a/arch/sparc/include/asm/irq_32.h
+++ b/arch/sparc/include/asm/irq_32.h
@@ -16,7 +16,8 @@
 #define irq_canonicalize(irq)   (irq)
-extern void __init init_IRQ(void);
+void __init init_IRQ(void);
+void __init sun4d_init_sbi_irq(void);
 #define NO_IRQ          0xffffffff
diff --git a/arch/sparc/include/asm/irq_64.h b/arch/sparc/include/asm/irq_64.h
index abf6afe82ca8..91d219381306 100644
--- a/arch/sparc/include/asm/irq_64.h
+++ b/arch/sparc/include/asm/irq_64.h
@@ -39,32 +39,32 @@
 */
 #define NR_IRQS    255
-extern void irq_install_pre_handler(int irq,
+void irq_install_pre_handler(int irq,
-                                    void (*func)(unsigned int, void *, void *),
+                             void (*func)(unsigned int, void *, void *),
-                                    void *arg1, void *arg2);
+                             void *arg1, void *arg2);
 #define irq_canonicalize(irq)   (irq)
-extern unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap);
+unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap);
-extern unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino);
+unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino);
-extern unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino);
+unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino);
-extern unsigned int sun4v_build_msi(u32 devhandle, unsigned int *irq_p,
+unsigned int sun4v_build_msi(u32 devhandle, unsigned int *irq_p,
-                                    unsigned int msi_devino_start,
+                             unsigned int msi_devino_start,
-                                    unsigned int msi_devino_end);
+                             unsigned int msi_devino_end);
-extern void sun4v_destroy_msi(unsigned int irq);
+void sun4v_destroy_msi(unsigned int irq);
-extern unsigned int sun4u_build_msi(u32 portid, unsigned int *irq_p,
+unsigned int sun4u_build_msi(u32 portid, unsigned int *irq_p,
-                                    unsigned int msi_devino_start,
+                             unsigned int msi_devino_start,
-                                    unsigned int msi_devino_end,
+                             unsigned int msi_devino_end,
-                                    unsigned long imap_base,
+                             unsigned long imap_base,
-                                    unsigned long iclr_base);
+                             unsigned long iclr_base);
-extern void sun4u_destroy_msi(unsigned int irq);
+void sun4u_destroy_msi(unsigned int irq);
-extern unsigned char irq_alloc(unsigned int dev_handle,
+unsigned char irq_alloc(unsigned int dev_handle,
-                                    unsigned int dev_ino);
+                        unsigned int dev_ino);
 #ifdef CONFIG_PCI_MSI
-extern void irq_free(unsigned int irq);
+void irq_free(unsigned int irq);
 #endif
-extern void __init init_IRQ(void);
+void __init init_IRQ(void);
-extern void fixup_irqs(void);
+void fixup_irqs(void);
 static inline void set_softint(unsigned long bits)
 {
@@ -89,7 +89,7 @@ static inline unsigned long get_softint(void)
        return retval;
 }
-void arch_trigger_all_cpu_backtrace(void);
+void arch_trigger_all_cpu_backtrace(bool);
 #define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace
 extern void *hardirq_stack[NR_CPUS];
diff --git a/arch/sparc/include/asm/irqflags_32.h b/arch/sparc/include/asm/irqflags_32.h
index e414c06615c1..71cc284f55c5 100644
--- a/arch/sparc/include/asm/irqflags_32.h
+++ b/arch/sparc/include/asm/irqflags_32.h
@@ -15,9 +15,9 @@
 #include <linux/types.h>
 #include <asm/psr.h>
-extern void arch_local_irq_restore(unsigned long);
+void arch_local_irq_restore(unsigned long);
-extern unsigned long arch_local_irq_save(void);
+unsigned long arch_local_irq_save(void);
-extern void arch_local_irq_enable(void);
+void arch_local_irq_enable(void);
 static inline notrace unsigned long arch_local_save_flags(void)
 {
diff --git a/arch/sparc/include/asm/kdebug_64.h b/arch/sparc/include/asm/kdebug_64.h
index feb3578e12c4..04465de8f3b5 100644
--- a/arch/sparc/include/asm/kdebug_64.h
+++ b/arch/sparc/include/asm/kdebug_64.h
@@ -3,7 +3,7 @@
 struct pt_regs;
-extern void bad_trap(struct pt_regs *, long);
+void bad_trap(struct pt_regs *, long);
 /* Grossly misnamed. */
 enum die_val {
diff --git a/arch/sparc/include/asm/kgdb.h b/arch/sparc/include/asm/kgdb.h
index b6ef301d05bf..47366af7a589 100644
--- a/arch/sparc/include/asm/kgdb.h
+++ b/arch/sparc/include/asm/kgdb.h
@@ -28,9 +28,12 @@ enum regnames {
 #define NUMREGBYTES             ((GDB_CSR + 1) * 4)
 #else
 #define NUMREGBYTES             ((GDB_Y + 1) * 8)
+struct pt_regs;
+asmlinkage void kgdb_trap(unsigned long trap_level, struct pt_regs *regs);
 #endif
-extern void arch_kgdb_breakpoint(void);
+void arch_kgdb_breakpoint(void);
 #define BREAK_INSTR_SIZE        4
 #define CACHE_FLUSH_IS_SAFE     1
diff --git a/arch/sparc/include/asm/kprobes.h b/arch/sparc/include/asm/kprobes.h
index 5879d71afdaa..a145d798e112 100644
--- a/arch/sparc/include/asm/kprobes.h
+++ b/arch/sparc/include/asm/kprobes.h
@@ -43,7 +43,9 @@ struct kprobe_ctlblk {
        struct prev_kprobe prev_kprobe;
 };
-extern int kprobe_exceptions_notify(struct notifier_block *self,
+int kprobe_exceptions_notify(struct notifier_block *self,
-                                    unsigned long val, void *data);
+                             unsigned long val, void *data);
-extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
+int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
+asmlinkage void __kprobes kprobe_trap(unsigned long trap_level,
+                                      struct pt_regs *regs);
 #endif /* _SPARC64_KPROBES_H */
diff --git a/arch/sparc/include/asm/ldc.h b/arch/sparc/include/asm/ldc.h
index bdb524a7b814..c8c67f621f4f 100644
--- a/arch/sparc/include/asm/ldc.h
+++ b/arch/sparc/include/asm/ldc.h
@@ -4,9 +4,9 @@
 #include <asm/hypervisor.h>
 extern int ldom_domaining_enabled;
-extern void ldom_set_var(const char *var, const char *value);
+void ldom_set_var(const char *var, const char *value);
-extern void ldom_reboot(const char *boot_command);
+void ldom_reboot(const char *boot_command);
-extern void ldom_power_off(void);
+void ldom_power_off(void);
 /* The event handler will be evoked when link state changes
 * or data becomes available on the receive side.
@@ -51,30 +51,30 @@ struct ldc_channel_config {
 struct ldc_channel;
 /* Allocate state for a channel.  */
-extern struct ldc_channel *ldc_alloc(unsigned long id,
+struct ldc_channel *ldc_alloc(unsigned long id,
-                                     const struct ldc_channel_config *cfgp,
+                              const struct ldc_channel_config *cfgp,
-                                     void *event_arg);
+                              void *event_arg);
 /* Shut down and free state for a channel.  */
-extern void ldc_free(struct ldc_channel *lp);
+void ldc_free(struct ldc_channel *lp);
 /* Register TX and RX queues of the link with the hypervisor.  */
-extern int ldc_bind(struct ldc_channel *lp, const char *name);
+int ldc_bind(struct ldc_channel *lp, const char *name);
 /* For non-RAW protocols we need to complete a handshake before
 * communication can proceed.  ldc_connect() does that, if the
 * handshake completes successfully, an LDC_EVENT_UP event will
 * be sent up to the driver.
 */
-extern int ldc_connect(struct ldc_channel *lp);
+int ldc_connect(struct ldc_channel *lp);
-extern int ldc_disconnect(struct ldc_channel *lp);
+int ldc_disconnect(struct ldc_channel *lp);
-extern int ldc_state(struct ldc_channel *lp);
+int ldc_state(struct ldc_channel *lp);
 /* Read and write operations.  Only valid when the link is up.  */
-extern int ldc_write(struct ldc_channel *lp, const void *buf,
+int ldc_write(struct ldc_channel *lp, const void *buf,
-                     unsigned int size);
+              unsigned int size);
-extern int ldc_read(struct ldc_channel *lp, void *buf, unsigned int size);
+int ldc_read(struct ldc_channel *lp, void *buf, unsigned int size);
 #define LDC_MAP_SHADOW  0x01
 #define LDC_MAP_DIRECT  0x02
@@ -92,22 +92,22 @@ struct ldc_trans_cookie {
 };
 struct scatterlist;
-extern int ldc_map_sg(struct ldc_channel *lp,
+int ldc_map_sg(struct ldc_channel *lp,
-                      struct scatterlist *sg, int num_sg,
+               struct scatterlist *sg, int num_sg,
-                      struct ldc_trans_cookie *cookies, int ncookies,
+               struct ldc_trans_cookie *cookies, int ncookies,
-                      unsigned int map_perm);
+               unsigned int map_perm);
-extern int ldc_map_single(struct ldc_channel *lp,
+int ldc_map_single(struct ldc_channel *lp,
-                          void *buf, unsigned int len,
+                   void *buf, unsigned int len,
-                          struct ldc_trans_cookie *cookies, int ncookies,
+                   struct ldc_trans_cookie *cookies, int ncookies,
-                          unsigned int map_perm);
+                   unsigned int map_perm);
-extern void ldc_unmap(struct ldc_channel *lp, struct ldc_trans_cookie *cookies,
+void ldc_unmap(struct ldc_channel *lp, struct ldc_trans_cookie *cookies,
-                      int ncookies);
+               int ncookies);
-extern int ldc_copy(struct ldc_channel *lp, int copy_dir,
+int ldc_copy(struct ldc_channel *lp, int copy_dir,
-                    void *buf, unsigned int len, unsigned long offset,
+             void *buf, unsigned int len, unsigned long offset,
-                    struct ldc_trans_cookie *cookies, int ncookies);
+             struct ldc_trans_cookie *cookies, int ncookies);
 static inline int ldc_get_dring_entry(struct ldc_channel *lp,
                                      void *buf, unsigned int len,
@@ -127,12 +127,12 @@ static inline int ldc_put_dring_entry(struct ldc_channel *lp,
        return ldc_copy(lp, LDC_COPY_OUT, buf, len, offset, cookies, ncookies);
 }
-extern void *ldc_alloc_exp_dring(struct ldc_channel *lp, unsigned int len,
+void *ldc_alloc_exp_dring(struct ldc_channel *lp, unsigned int len,
-                                 struct ldc_trans_cookie *cookies,
+                          struct ldc_trans_cookie *cookies,
-                                 int *ncookies, unsigned int map_perm);
+                          int *ncookies, unsigned int map_perm);
-extern void ldc_free_exp_dring(struct ldc_channel *lp, void *buf,
+void ldc_free_exp_dring(struct ldc_channel *lp, void *buf,
-                               unsigned int len,
+                        unsigned int len,
-                               struct ldc_trans_cookie *cookies, int ncookies);
+                        struct ldc_trans_cookie *cookies, int ncookies);
 #endif /* _SPARC64_LDC_H */
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h
index c2f6ff6d7a35..204771cd74a5 100644
--- a/arch/sparc/include/asm/leon.h
+++ b/arch/sparc/include/asm/leon.h
@@ -82,8 +82,8 @@ static inline unsigned long leon_load_reg(unsigned long paddr)
 #define LEON_BYPASS_LOAD_PA(x)      leon_load_reg((unsigned long)(x))
 #define LEON_BYPASS_STORE_PA(x, v)  leon_store_reg((unsigned long)(x), (unsigned long)(v))
-extern void leon_switch_mm(void);
+void leon_switch_mm(void);
-extern void leon_init_IRQ(void);
+void leon_init_IRQ(void);
 static inline unsigned long sparc_leon3_get_dcachecfg(void)
 {
@@ -196,14 +196,14 @@ static inline int sparc_leon3_cpuid(void)
 #ifndef __ASSEMBLY__
 struct vm_area_struct;
-extern unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr);
+unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr);
-extern void leon_flush_icache_all(void);
+void leon_flush_icache_all(void);
-extern void leon_flush_dcache_all(void);
+void leon_flush_dcache_all(void);
-extern void leon_flush_cache_all(void);
+void leon_flush_cache_all(void);
-extern void leon_flush_tlb_all(void);
+void leon_flush_tlb_all(void);
 extern int leon_flush_during_switch;
-extern int leon_flush_needed(void);
+int leon_flush_needed(void);
-extern void leon_flush_pcache_all(struct vm_area_struct *vma, unsigned long page);
+void leon_flush_pcache_all(struct vm_area_struct *vma, unsigned long page);
 /* struct that hold LEON3 cache configuration registers */
 struct leon3_cacheregs {
@@ -217,29 +217,29 @@ struct leon3_cacheregs {
 struct device_node;
 struct task_struct;
-extern unsigned int leon_build_device_irq(unsigned int real_irq,
+unsigned int leon_build_device_irq(unsigned int real_irq,
-                                           irq_flow_handler_t flow_handler,
+                                   irq_flow_handler_t flow_handler,
-                                           const char *name, int do_ack);
+                                   const char *name, int do_ack);
-extern void leon_update_virq_handling(unsigned int virq,
+void leon_update_virq_handling(unsigned int virq,
-                              irq_flow_handler_t flow_handler,
+                               irq_flow_handler_t flow_handler,
-                              const char *name, int do_ack);
+                               const char *name, int do_ack);
-extern void leon_init_timers(void);
+void leon_init_timers(void);
-extern void leon_trans_init(struct device_node *dp);
+void leon_trans_init(struct device_node *dp);
-extern void leon_node_init(struct device_node *dp, struct device_node ***nextp);
+void leon_node_init(struct device_node *dp, struct device_node ***nextp);
-extern void init_leon(void);
+void init_leon(void);
-extern void poke_leonsparc(void);
+void poke_leonsparc(void);
-extern void leon3_getCacheRegs(struct leon3_cacheregs *regs);
+void leon3_getCacheRegs(struct leon3_cacheregs *regs);
 extern int leon3_ticker_irq;
 #ifdef CONFIG_SMP
-extern int leon_smp_nrcpus(void);
+int leon_smp_nrcpus(void);
-extern void leon_clear_profile_irq(int cpu);
+void leon_clear_profile_irq(int cpu);
-extern void leon_smp_done(void);
+void leon_smp_done(void);
-extern void leon_boot_cpus(void);
+void leon_boot_cpus(void);
-extern int leon_boot_one_cpu(int i, struct task_struct *);
+int leon_boot_one_cpu(int i, struct task_struct *);
 void leon_init_smp(void);
 void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu);
-extern irqreturn_t leon_percpu_timer_interrupt(int irq, void *unused);
+irqreturn_t leon_percpu_timer_interrupt(int irq, void *unused);
 extern unsigned int smpleon_ipi[];
 extern unsigned int linux_trap_ipi15_leon[];
diff --git a/arch/sparc/include/asm/leon_pci.h b/arch/sparc/include/asm/leon_pci.h
index bfd3ab3092b5..049d067ed8be 100644
--- a/arch/sparc/include/asm/leon_pci.h
+++ b/arch/sparc/include/asm/leon_pci.h
@@ -16,7 +16,7 @@ struct leon_pci_info {
        int (*map_irq)(const struct pci_dev *dev, u8 slot, u8 pin);
 };
-extern void leon_pci_init(struct platform_device *ofdev,
+void leon_pci_init(struct platform_device *ofdev,
-                                struct leon_pci_info *info);
+                   struct leon_pci_info *info);
 #endif /* _ASM_LEON_PCI_H_ */
diff --git a/arch/sparc/include/asm/mc146818rtc.h b/arch/sparc/include/asm/mc146818rtc.h
index 67ed9e3a0235..d8e72f37dc4b 100644
--- a/arch/sparc/include/asm/mc146818rtc.h
+++ b/arch/sparc/include/asm/mc146818rtc.h
@@ -1,5 +1,10 @@
 #ifndef ___ASM_SPARC_MC146818RTC_H
 #define ___ASM_SPARC_MC146818RTC_H
+#include <linux/spinlock.h>
+extern spinlock_t rtc_lock;
 #if defined(__sparc__) && defined(__arch64__)
 #include <asm/mc146818rtc_64.h>
 #else
diff --git a/arch/sparc/include/asm/mdesc.h b/arch/sparc/include/asm/mdesc.h
index 139097f3a67b..aebeb88f70db 100644
--- a/arch/sparc/include/asm/mdesc.h
+++ b/arch/sparc/include/asm/mdesc.h
@@ -12,13 +12,13 @@ struct mdesc_handle;
 * the first argument to all of the operational calls that work
 * on mdescs.
 */
-extern struct mdesc_handle *mdesc_grab(void);
+struct mdesc_handle *mdesc_grab(void);
-extern void mdesc_release(struct mdesc_handle *);
+void mdesc_release(struct mdesc_handle *);
 #define MDESC_NODE_NULL         (~(u64)0)
-extern u64 mdesc_node_by_name(struct mdesc_handle *handle,
+u64 mdesc_node_by_name(struct mdesc_handle *handle,
-                              u64 from_node, const char *name);
+                       u64 from_node, const char *name);
 #define mdesc_for_each_node_by_name(__hdl, __node, __name) \
        for (__node = mdesc_node_by_name(__hdl, MDESC_NODE_NULL, __name); \
             (__node) != MDESC_NODE_NULL; \
@@ -34,9 +34,9 @@ extern u64 mdesc_node_by_name(struct mdesc_handle *handle,
 *
 * These same rules apply to mdesc_node_name().
 */
-extern const void *mdesc_get_property(struct mdesc_handle *handle,
+const void *mdesc_get_property(struct mdesc_handle *handle,
-                                      u64 node, const char *name, int *lenp);
+                               u64 node, const char *name, int *lenp);
-extern const char *mdesc_node_name(struct mdesc_handle *hp, u64 node);
+const char *mdesc_node_name(struct mdesc_handle *hp, u64 node);
 /* MD arc iteration, the standard sequence is:
 *
@@ -50,16 +50,16 @@ extern const char *mdesc_node_name(struct mdesc_handle *hp, u64 node);
 #define MDESC_ARC_TYPE_FWD      "fwd"
 #define MDESC_ARC_TYPE_BACK     "back"
-extern u64 mdesc_next_arc(struct mdesc_handle *handle, u64 from,
+u64 mdesc_next_arc(struct mdesc_handle *handle, u64 from,
-                          const char *arc_type);
+                   const char *arc_type);
 #define mdesc_for_each_arc(__arc, __hdl, __node, __type) \
        for (__arc = mdesc_next_arc(__hdl, __node, __type); \
             (__arc) != MDESC_NODE_NULL; \
             __arc = mdesc_next_arc(__hdl, __arc, __type))
-extern u64 mdesc_arc_target(struct mdesc_handle *hp, u64 arc);
+u64 mdesc_arc_target(struct mdesc_handle *hp, u64 arc);
-extern void mdesc_update(void);
+void mdesc_update(void);
 struct mdesc_notifier_client {
        void (*add)(struct mdesc_handle *handle, u64 node);
@@ -69,12 +69,12 @@ struct mdesc_notifier_client {
        struct mdesc_notifier_client    *next;
 };
-extern void mdesc_register_notifier(struct mdesc_notifier_client *client);
+void mdesc_register_notifier(struct mdesc_notifier_client *client);
-extern void mdesc_fill_in_cpu_data(cpumask_t *mask);
+void mdesc_fill_in_cpu_data(cpumask_t *mask);
-extern void mdesc_populate_present_mask(cpumask_t *mask);
+void mdesc_populate_present_mask(cpumask_t *mask);
-extern void mdesc_get_page_sizes(cpumask_t *mask, unsigned long *pgsz_mask);
+void mdesc_get_page_sizes(cpumask_t *mask, unsigned long *pgsz_mask);
-extern void sun4v_mdesc_init(void);
+void sun4v_mdesc_init(void);
 #endif
diff --git a/arch/sparc/include/asm/mmu_64.h b/arch/sparc/include/asm/mmu_64.h
index f668797ae234..70067ce184b1 100644
--- a/arch/sparc/include/asm/mmu_64.h
+++ b/arch/sparc/include/asm/mmu_64.h
@@ -67,9 +67,9 @@ struct tsb {
        unsigned long pte;
 } __attribute__((aligned(TSB_ENTRY_ALIGNMENT)));
-extern void __tsb_insert(unsigned long ent, unsigned long tag, unsigned long pte);
+void __tsb_insert(unsigned long ent, unsigned long tag, unsigned long pte);
-extern void tsb_flush(unsigned long ent, unsigned long tag);
+void tsb_flush(unsigned long ent, unsigned long tag);
-extern void tsb_init(struct tsb *tsb, unsigned long size);
+void tsb_init(struct tsb *tsb, unsigned long size);
 struct tsb_config {
        struct tsb              *tsb;
diff --git a/arch/sparc/include/asm/mmu_context_64.h b/arch/sparc/include/asm/mmu_context_64.h
index 3d528f06e4b0..b84be675e507 100644
--- a/arch/sparc/include/asm/mmu_context_64.h
+++ b/arch/sparc/include/asm/mmu_context_64.h
@@ -17,20 +17,20 @@ extern spinlock_t ctx_alloc_lock;
 extern unsigned long tlb_context_cache;
 extern unsigned long mmu_context_bmap[];
-extern void get_new_mmu_context(struct mm_struct *mm);
+void get_new_mmu_context(struct mm_struct *mm);
 #ifdef CONFIG_SMP
-extern void smp_new_mmu_context_version(void);
+void smp_new_mmu_context_version(void);
 #else
 #define smp_new_mmu_context_version() do { } while (0)
 #endif
-extern int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
+int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
-extern void destroy_context(struct mm_struct *mm);
+void destroy_context(struct mm_struct *mm);
-extern void __tsb_context_switch(unsigned long pgd_pa,
+void __tsb_context_switch(unsigned long pgd_pa,
-                                 struct tsb_config *tsb_base,
+                          struct tsb_config *tsb_base,
-                                 struct tsb_config *tsb_huge,
+                          struct tsb_config *tsb_huge,
-                                 unsigned long tsb_descr_pa);
+                          unsigned long tsb_descr_pa);
 static inline void tsb_context_switch(struct mm_struct *mm)
 {
@@ -46,9 +46,11 @@ static inline void tsb_context_switch(struct mm_struct *mm)
                             , __pa(&mm->context.tsb_descr[0]));
 }
-extern void tsb_grow(struct mm_struct *mm, unsigned long tsb_index, unsigned long mm_rss);
+void tsb_grow(struct mm_struct *mm,
+              unsigned long tsb_index,
+              unsigned long mm_rss);
 #ifdef CONFIG_SMP
-extern void smp_tsb_sync(struct mm_struct *mm);
+void smp_tsb_sync(struct mm_struct *mm);
 #else
 #define smp_tsb_sync(__mm) do { } while (0)
 #endif
@@ -66,7 +68,7 @@ extern void smp_tsb_sync(struct mm_struct *mm);
        : "r" (CTX_HWBITS((__mm)->context)), \
          "r" (SECONDARY_CONTEXT), "i" (ASI_DMMU), "i" (ASI_MMU))
-extern void __flush_tlb_mm(unsigned long, unsigned long);
+void __flush_tlb_mm(unsigned long, unsigned long);
 /* Switch the current MM context. */
 static inline void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, struct task_struct *tsk)
diff --git a/arch/sparc/include/asm/nmi.h b/arch/sparc/include/asm/nmi.h
index 72e6500e7ab0..26ad2b2607c6 100644
--- a/arch/sparc/include/asm/nmi.h
+++ b/arch/sparc/include/asm/nmi.h
@@ -1,13 +1,13 @@
 #ifndef __NMI_H
 #define __NMI_H
-extern int __init nmi_init(void);
+int __init nmi_init(void);
-extern void perfctr_irq(int irq, struct pt_regs *regs);
+void perfctr_irq(int irq, struct pt_regs *regs);
-extern void nmi_adjust_hz(unsigned int new_hz);
+void nmi_adjust_hz(unsigned int new_hz);
 extern atomic_t nmi_active;
-extern void start_nmi_watchdog(void *unused);
+void start_nmi_watchdog(void *unused);
-extern void stop_nmi_watchdog(void *unused);
+void stop_nmi_watchdog(void *unused);
 #endif /* __NMI_H */
diff --git a/arch/sparc/include/asm/oplib_32.h b/arch/sparc/include/asm/oplib_32.h
index c72f3045820c..56a09b9d7b1b 100644
--- a/arch/sparc/include/asm/oplib_32.h
+++ b/arch/sparc/include/asm/oplib_32.h
@@ -43,28 +43,28 @@ extern struct linux_nodeops *prom_nodeops;
 /* You must call prom_init() before using any of the library services,
 * preferably as early as possible.  Pass it the romvec pointer.
 */
-extern void prom_init(struct linux_romvec *rom_ptr);
+void prom_init(struct linux_romvec *rom_ptr);
 /* Boot argument acquisition, returns the boot command line string. */
-extern char *prom_getbootargs(void);
+char *prom_getbootargs(void);
 /* Miscellaneous routines, don't really fit in any category per se. */
 /* Reboot the machine with the command line passed. */
-extern void prom_reboot(char *boot_command);
+void prom_reboot(char *boot_command);
 /* Evaluate the forth string passed. */
-extern void prom_feval(char *forth_string);
+void prom_feval(char *forth_string);
 /* Enter the prom, with possibility of continuation with the 'go'
 * command in newer proms.
 */
-extern void prom_cmdline(void);
+void prom_cmdline(void);
 /* Enter the prom, with no chance of continuation for the stand-alone
 * which calls this.
 */
-extern void __noreturn prom_halt(void);
+void __noreturn prom_halt(void);
 /* Set the PROM 'sync' callback function to the passed function pointer.
 * When the user gives the 'sync' command at the prom prompt while the
@@ -73,37 +73,37 @@ extern void __noreturn prom_halt(void);
 * XXX The arguments are different on V0 vs. V2->higher proms, grrr! XXX
 */
 typedef void (*sync_func_t)(void);
-extern void prom_setsync(sync_func_t func_ptr);
+void prom_setsync(sync_func_t func_ptr);
 /* Acquire the IDPROM of the root node in the prom device tree.  This
 * gets passed a buffer where you would like it stuffed.  The return value
 * is the format type of this idprom or 0xff on error.
 */
-extern unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size);
+unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size);
 /* Get the prom major version. */
-extern int prom_version(void);
+int prom_version(void);
 /* Get the prom plugin revision. */
-extern int prom_getrev(void);
+int prom_getrev(void);
 /* Get the prom firmware revision. */
-extern int prom_getprev(void);
+int prom_getprev(void);
 /* Write a buffer of characters to the console. */
-extern void prom_console_write_buf(const char *buf, int len);
+void prom_console_write_buf(const char *buf, int len);
 /* Prom's internal routines, don't use in kernel/boot code. */
-extern __printf(1, 2) void prom_printf(const char *fmt, ...);
+__printf(1, 2) void prom_printf(const char *fmt, ...);
-extern void prom_write(const char *buf, unsigned int len);
+void prom_write(const char *buf, unsigned int len);
 /* Multiprocessor operations... */
 /* Start the CPU with the given device tree node, context table, and context
 * at the passed program counter.
 */
-extern int prom_startcpu(int cpunode, struct linux_prom_registers *context_table,
+int prom_startcpu(int cpunode, struct linux_prom_registers *context_table,
-                         int context, char *program_counter);
+                  int context, char *program_counter);
 /* Initialize the memory lists based upon the prom version. */
 void prom_meminit(void);
@@ -111,65 +111,65 @@ void prom_meminit(void);
 /* PROM device tree traversal functions... */
 /* Get the child node of the given node, or zero if no child exists. */
-extern phandle prom_getchild(phandle parent_node);
+phandle prom_getchild(phandle parent_node);
 /* Get the next sibling node of the given node, or zero if no further
 * siblings exist.
 */
-extern phandle prom_getsibling(phandle node);
+phandle prom_getsibling(phandle node);
 /* Get the length, at the passed node, of the given property type.
 * Returns -1 on error (ie. no such property at this node).
 */
-extern int prom_getproplen(phandle thisnode, const char *property);
+int prom_getproplen(phandle thisnode, const char *property);
 /* Fetch the requested property using the given buffer.  Returns
 * the number of bytes the prom put into your buffer or -1 on error.
 */
-extern int __must_check prom_getproperty(phandle thisnode, const char *property,
+int __must_check prom_getproperty(phandle thisnode, const char *property,
-                                         char *prop_buffer, int propbuf_size);
+                                  char *prop_buffer, int propbuf_size);
 /* Acquire an integer property. */
-extern int prom_getint(phandle node, char *property);
+int prom_getint(phandle node, char *property);
 /* Acquire an integer property, with a default value. */
-extern int prom_getintdefault(phandle node, char *property, int defval);
+int prom_getintdefault(phandle node, char *property, int defval);
 /* Acquire a boolean property, 0=FALSE 1=TRUE. */
-extern int prom_getbool(phandle node, char *prop);
+int prom_getbool(phandle node, char *prop);
 /* Acquire a string property, null string on error. */
-extern void prom_getstring(phandle node, char *prop, char *buf, int bufsize);
+void prom_getstring(phandle node, char *prop, char *buf, int bufsize);
 /* Search all siblings starting at the passed node for "name" matching
 * the given string.  Returns the node on success, zero on failure.
 */
-extern phandle prom_searchsiblings(phandle node_start, char *name);
+phandle prom_searchsiblings(phandle node_start, char *name);
 /* Returns the next property after the passed property for the given
 * node.  Returns null string on failure.
 */
-extern char *prom_nextprop(phandle node, char *prev_property, char *buffer);
+char *prom_nextprop(phandle node, char *prev_property, char *buffer);
 /* Returns phandle of the path specified */
-extern phandle prom_finddevice(char *name);
+phandle prom_finddevice(char *name);
 /* Set the indicated property at the given node with the passed value.
 * Returns the number of bytes of your value that the prom took.
 */
-extern int prom_setprop(phandle node, const char *prop_name, char *prop_value,
+int prom_setprop(phandle node, const char *prop_name, char *prop_value,
-                        int value_size);
+                 int value_size);
-extern phandle prom_inst2pkg(int);
+phandle prom_inst2pkg(int);
 /* Dorking with Bus ranges... */
 /* Apply promlib probes OBIO ranges to registers. */
-extern void prom_apply_obio_ranges(struct linux_prom_registers *obioregs, int nregs);
+void prom_apply_obio_ranges(struct linux_prom_registers *obioregs, int nregs);
 /* Apply ranges of any prom node (and optionally parent node as well) to registers. */
-extern void prom_apply_generic_ranges(phandle node, phandle parent,
+void prom_apply_generic_ranges(phandle node, phandle parent,
-                                      struct linux_prom_registers *sbusregs, int nregs);
+                               struct linux_prom_registers *sbusregs, int nregs);
 void prom_ranges_init(void);
diff --git a/arch/sparc/include/asm/oplib_64.h b/arch/sparc/include/asm/oplib_64.h
index a12dbe3b7762..f34682430fcf 100644
--- a/arch/sparc/include/asm/oplib_64.h
+++ b/arch/sparc/include/asm/oplib_64.h
@@ -62,100 +62,100 @@ struct linux_mem_p1275 {
 /* You must call prom_init() before using any of the library services,
 * preferably as early as possible.  Pass it the romvec pointer.
 */
-extern void prom_init(void *cif_handler, void *cif_stack);
+void prom_init(void *cif_handler, void *cif_stack);
 /* Boot argument acquisition, returns the boot command line string. */
-extern char *prom_getbootargs(void);
+char *prom_getbootargs(void);
 /* Miscellaneous routines, don't really fit in any category per se. */
 /* Reboot the machine with the command line passed. */
-extern void prom_reboot(const char *boot_command);
+void prom_reboot(const char *boot_command);
 /* Evaluate the forth string passed. */
-extern void prom_feval(const char *forth_string);
+void prom_feval(const char *forth_string);
 /* Enter the prom, with possibility of continuation with the 'go'
 * command in newer proms.
 */
-extern void prom_cmdline(void);
+void prom_cmdline(void);
 /* Enter the prom, with no chance of continuation for the stand-alone
 * which calls this.
 */
-extern void prom_halt(void) __attribute__ ((noreturn));
+void prom_halt(void) __attribute__ ((noreturn));
 /* Halt and power-off the machine. */
-extern void prom_halt_power_off(void) __attribute__ ((noreturn));
+void prom_halt_power_off(void) __attribute__ ((noreturn));
 /* Acquire the IDPROM of the root node in the prom device tree.  This
 * gets passed a buffer where you would like it stuffed.  The return value
 * is the format type of this idprom or 0xff on error.
 */
-extern unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size);
+unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size);
 /* Write a buffer of characters to the console. */
-extern void prom_console_write_buf(const char *buf, int len);
+void prom_console_write_buf(const char *buf, int len);
 /* Prom's internal routines, don't use in kernel/boot code. */
-extern __printf(1, 2) void prom_printf(const char *fmt, ...);
+__printf(1, 2) void prom_printf(const char *fmt, ...);
-extern void prom_write(const char *buf, unsigned int len);
+void prom_write(const char *buf, unsigned int len);
 /* Multiprocessor operations... */
 #ifdef CONFIG_SMP
 /* Start the CPU with the given device tree node at the passed program
 * counter with the given arg passed in via register %o0.
 */
-extern void prom_startcpu(int cpunode, unsigned long pc, unsigned long arg);
+void prom_startcpu(int cpunode, unsigned long pc, unsigned long arg);
 /* Start the CPU with the given cpu ID at the passed program
 * counter with the given arg passed in via register %o0.
 */
-extern void prom_startcpu_cpuid(int cpuid, unsigned long pc, unsigned long arg);
+void prom_startcpu_cpuid(int cpuid, unsigned long pc, unsigned long arg);
 /* Stop the CPU with the given cpu ID.  */
-extern void prom_stopcpu_cpuid(int cpuid);
+void prom_stopcpu_cpuid(int cpuid);
 /* Stop the current CPU. */
-extern void prom_stopself(void);
+void prom_stopself(void);
 /* Idle the current CPU. */
-extern void prom_idleself(void);
+void prom_idleself(void);
 /* Resume the CPU with the passed device tree node. */
-extern void prom_resumecpu(int cpunode);
+void prom_resumecpu(int cpunode);
 #endif
 /* Power management interfaces. */
 /* Put the current CPU to sleep. */
-extern void prom_sleepself(void);
+void prom_sleepself(void);
 /* Put the entire system to sleep. */
-extern int prom_sleepsystem(void);
+int prom_sleepsystem(void);
 /* Initiate a wakeup event. */
-extern int prom_wakeupsystem(void);
+int prom_wakeupsystem(void);
 /* MMU and memory related OBP interfaces. */
 /* Get unique string identifying SIMM at given physical address. */
-extern int prom_getunumber(int syndrome_code,
+int prom_getunumber(int syndrome_code,
-                           unsigned long phys_addr,
+                    unsigned long phys_addr,
-                           char *buf, int buflen);
+                    char *buf, int buflen);
 /* Retain physical memory to the caller across soft resets. */
-extern int prom_retain(const char *name, unsigned long size,
+int prom_retain(const char *name, unsigned long size,
-                       unsigned long align, unsigned long *paddr);
+                unsigned long align, unsigned long *paddr);
 /* Load explicit I/D TLB entries into the calling processor. */
-extern long prom_itlb_load(unsigned long index,
+long prom_itlb_load(unsigned long index,
-                           unsigned long tte_data,
+                    unsigned long tte_data,
-                           unsigned long vaddr);
+                    unsigned long vaddr);
-extern long prom_dtlb_load(unsigned long index,
+long prom_dtlb_load(unsigned long index,
-                           unsigned long tte_data,
+                    unsigned long tte_data,
-                           unsigned long vaddr);
+                    unsigned long vaddr);
 /* Map/Unmap client program address ranges.  First the format of
 * the mapping mode argument.
@@ -170,81 +170,81 @@ extern long prom_dtlb_load(unsigned long index,
 #define PROM_MAP_IE     0x0100 /* Invert-Endianness */
 #define PROM_MAP_DEFAULT (PROM_MAP_WRITE | PROM_MAP_READ | PROM_MAP_EXEC | PROM_MAP_CACHED)
-extern int prom_map(int mode, unsigned long size,
+int prom_map(int mode, unsigned long size,
-                    unsigned long vaddr, unsigned long paddr);
+             unsigned long vaddr, unsigned long paddr);
-extern void prom_unmap(unsigned long size, unsigned long vaddr);
+void prom_unmap(unsigned long size, unsigned long vaddr);
 /* PROM device tree traversal functions... */
 /* Get the child node of the given node, or zero if no child exists. */
-extern phandle prom_getchild(phandle parent_node);
+phandle prom_getchild(phandle parent_node);
 /* Get the next sibling node of the given node, or zero if no further
 * siblings exist.
 */
-extern phandle prom_getsibling(phandle node);
+phandle prom_getsibling(phandle node);
 /* Get the length, at the passed node, of the given property type.
 * Returns -1 on error (ie. no such property at this node).
 */
-extern int prom_getproplen(phandle thisnode, const char *property);
+int prom_getproplen(phandle thisnode, const char *property);
 /* Fetch the requested property using the given buffer.  Returns
 * the number of bytes the prom put into your buffer or -1 on error.
 */
-extern int prom_getproperty(phandle thisnode, const char *property,
+int prom_getproperty(phandle thisnode, const char *property,
-                            char *prop_buffer, int propbuf_size);
+                     char *prop_buffer, int propbuf_size);
 /* Acquire an integer property. */
-extern int prom_getint(phandle node, const char *property);
+int prom_getint(phandle node, const char *property);
 /* Acquire an integer property, with a default value. */
-extern int prom_getintdefault(phandle node, const char *property, int defval);
+int prom_getintdefault(phandle node, const char *property, int defval);
 /* Acquire a boolean property, 0=FALSE 1=TRUE. */
-extern int prom_getbool(phandle node, const char *prop);
+int prom_getbool(phandle node, const char *prop);
 /* Acquire a string property, null string on error. */
-extern void prom_getstring(phandle node, const char *prop, char *buf,
+void prom_getstring(phandle node, const char *prop, char *buf,
-                           int bufsize);
+                    int bufsize);
 /* Does the passed node have the given "name"? YES=1 NO=0 */
-extern int prom_nodematch(phandle thisnode, const char *name);
+int prom_nodematch(phandle thisnode, const char *name);
 /* Search all siblings starting at the passed node for "name" matching
 * the given string.  Returns the node on success, zero on failure.
 */
-extern phandle prom_searchsiblings(phandle node_start, const char *name);
+phandle prom_searchsiblings(phandle node_start, const char *name);
 /* Return the first property type, as a string, for the given node.
 * Returns a null string on error. Buffer should be at least 32B long.
 */
-extern char *prom_firstprop(phandle node, char *buffer);
+char *prom_firstprop(phandle node, char *buffer);
 /* Returns the next property after the passed property for the given
 * node.  Returns null string on failure. Buffer should be at least 32B long.
 */
-extern char *prom_nextprop(phandle node, const char *prev_property, char *buf);
+char *prom_nextprop(phandle node, const char *prev_property, char *buf);
 /* Returns 1 if the specified node has given property. */
-extern int prom_node_has_property(phandle node, const char *property);
+int prom_node_has_property(phandle node, const char *property);
 /* Returns phandle of the path specified */
-extern phandle prom_finddevice(const char *name);
+phandle prom_finddevice(const char *name);
 /* Set the indicated property at the given node with the passed value.
 * Returns the number of bytes of your value that the prom took.
 */
-extern int prom_setprop(phandle node, const char *prop_name, char *prop_value,
+int prom_setprop(phandle node, const char *prop_name, char *prop_value,
-                        int value_size);
+                 int value_size);
-extern phandle prom_inst2pkg(int);
+phandle prom_inst2pkg(int);
-extern void prom_sun4v_guest_soft_state(void);
+void prom_sun4v_guest_soft_state(void);
-extern int prom_ihandle2path(int handle, char *buffer, int bufsize);
+int prom_ihandle2path(int handle, char *buffer, int bufsize);
 /* Client interface level routines. */
-extern void p1275_cmd_direct(unsigned long *);
+void p1275_cmd_direct(unsigned long *);
 #endif /* !(__SPARC64_OPLIB_H) */
diff --git a/arch/sparc/include/asm/page.h b/arch/sparc/include/asm/page.h
index f21de0349025..1be2fdec6268 100644
--- a/arch/sparc/include/asm/page.h
+++ b/arch/sparc/include/asm/page.h
@@ -1,5 +1,8 @@
 #ifndef ___ASM_SPARC_PAGE_H
 #define ___ASM_SPARC_PAGE_H
+#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
 #if defined(__sparc__) && defined(__arch64__)
 #include <asm/page_64.h>
 #else
diff --git a/arch/sparc/include/asm/page_64.h b/arch/sparc/include/asm/page_64.h
index aac53fcea807..bf109984a032 100644
--- a/arch/sparc/include/asm/page_64.h
+++ b/arch/sparc/include/asm/page_64.h
@@ -31,17 +31,17 @@
 #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
 struct pt_regs;
-extern void hugetlb_setup(struct pt_regs *regs);
+void hugetlb_setup(struct pt_regs *regs);
 #endif
 #define WANT_PAGE_VIRTUAL
-extern void _clear_page(void *page);
+void _clear_page(void *page);
 #define clear_page(X)   _clear_page((void *)(X))
 struct page;
-extern void clear_user_page(void *addr, unsigned long vaddr, struct page *page);
+void clear_user_page(void *addr, unsigned long vaddr, struct page *page);
 #define copy_page(X,Y)  memcpy((void *)(X), (void *)(Y), PAGE_SIZE)
-extern void copy_user_page(void *to, void *from, unsigned long vaddr, struct page *topage);
+void copy_user_page(void *to, void *from, unsigned long vaddr, struct page *topage);
 /* Unlike sparc32, sparc64's parameter passing API is more
 * sane in that structures which as small enough are passed
diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h
index c6c7396e7627..bd00a6226169 100644
--- a/arch/sparc/include/asm/pci_64.h
+++ b/arch/sparc/include/asm/pci_64.h
@@ -52,7 +52,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
 /* Return the index of the PCI controller for device PDEV. */
-extern int pci_domain_nr(struct pci_bus *bus);
+int pci_domain_nr(struct pci_bus *bus);
 static inline int pci_proc_domain(struct pci_bus *bus)
 {
        return 1;
@@ -64,9 +64,9 @@ static inline int pci_proc_domain(struct pci_bus *bus)
 #define HAVE_ARCH_PCI_GET_UNMAPPED_AREA
 #define get_pci_unmapped_area get_fb_unmapped_area
-extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
+int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
-                               enum pci_mmap_state mmap_state,
+                        enum pci_mmap_state mmap_state,
-                               int write_combine);
+                        int write_combine);
 static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 {
@@ -74,9 +74,9 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 }
 #define HAVE_ARCH_PCI_RESOURCE_TO_USER
-extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
+void pci_resource_to_user(const struct pci_dev *dev, int bar,
-                                 const struct resource *rsrc,
+                          const struct resource *rsrc,
-                                 resource_size_t *start, resource_size_t *end);
+                          resource_size_t *start, resource_size_t *end);
 #endif /* __KERNEL__ */
 #endif /* __SPARC64_PCI_H */
diff --git a/arch/sparc/include/asm/pcic.h b/arch/sparc/include/asm/pcic.h
index 6676cbcc8b6a..f41706792592 100644
--- a/arch/sparc/include/asm/pcic.h
+++ b/arch/sparc/include/asm/pcic.h
@@ -30,10 +30,10 @@ struct linux_pcic {
 };
 #ifdef CONFIG_PCIC_PCI
-extern int pcic_present(void);
+int pcic_present(void);
-extern int pcic_probe(void);
+int pcic_probe(void);
-extern void pci_time_init(void);
+void pci_time_init(void);
-extern void sun4m_pci_init_IRQ(void);
+void sun4m_pci_init_IRQ(void);
 #else
 static inline int pcic_present(void) { return 0; }
 static inline int pcic_probe(void) { return 0; }
diff --git a/arch/sparc/include/asm/pcr.h b/arch/sparc/include/asm/pcr.h
index 942bb17f60cd..cdf800c3326c 100644
--- a/arch/sparc/include/asm/pcr.h
+++ b/arch/sparc/include/asm/pcr.h
@@ -12,8 +12,8 @@ struct pcr_ops {
 };
 extern const struct pcr_ops *pcr_ops;
-extern void deferred_pcr_work_irq(int irq, struct pt_regs *regs);
+void deferred_pcr_work_irq(int irq, struct pt_regs *regs);
-extern void schedule_deferred_pcr_work(void);
+void schedule_deferred_pcr_work(void);
 #define PCR_PIC_PRIV            0x00000001 /* PIC access is privileged */
 #define PCR_STRACE              0x00000002 /* Trace supervisor events  */
@@ -45,6 +45,6 @@ extern void schedule_deferred_pcr_work(void);
 #define PCR_N4_PICNHT           0x00020000 /* PIC non-hypervisor trap  */
 #define PCR_N4_NTC              0x00040000 /* Next-To-Commit wrap      */
-extern int pcr_arch_init(void);
+int pcr_arch_init(void);
 #endif /* __PCR_H */
diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
index 9b1c36de0f18..a3890da94428 100644
--- a/arch/sparc/include/asm/pgalloc_32.h
+++ b/arch/sparc/include/asm/pgalloc_32.h
@@ -14,6 +14,8 @@ struct page;
 void *srmmu_get_nocache(int size, int align);
 void srmmu_free_nocache(void *addr, int size);
+extern struct resource sparc_iomap;
 #define check_pgt_cache()       do { } while (0)
 pgd_t *get_pgd_fast(void);
diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
index bcfe063bce23..39a7ac49b00c 100644
--- a/arch/sparc/include/asm/pgalloc_64.h
+++ b/arch/sparc/include/asm/pgalloc_64.h
@@ -38,12 +38,12 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
        kmem_cache_free(pgtable_cache, pmd);
 }
-extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
+pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
-                                   unsigned long address);
+                            unsigned long address);
-extern pgtable_t pte_alloc_one(struct mm_struct *mm,
+pgtable_t pte_alloc_one(struct mm_struct *mm,
-                               unsigned long address);
+                        unsigned long address);
-extern void pte_free_kernel(struct mm_struct *mm, pte_t *pte);
+void pte_free_kernel(struct mm_struct *mm, pte_t *pte);
-extern void pte_free(struct mm_struct *mm, pgtable_t ptepage);
+void pte_free(struct mm_struct *mm, pgtable_t ptepage);
 #define pmd_populate_kernel(MM, PMD, PTE)       pmd_set(MM, PMD, PTE)
 #define pmd_populate(MM, PMD, PTE)              pmd_set(MM, PMD, PTE)
@@ -51,12 +51,12 @@ extern void pte_free(struct mm_struct *mm, pgtable_t ptepage);
 #define check_pgt_cache()       do { } while (0)
-extern void pgtable_free(void *table, bool is_page);
+void pgtable_free(void *table, bool is_page);
 #ifdef CONFIG_SMP
 struct mmu_gather;
-extern void tlb_remove_table(struct mmu_gather *, void *);
+void tlb_remove_table(struct mmu_gather *, void *);
 static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, bool is_page)
 {
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
index 502f632f6cc7..b9b91ae19fe1 100644
--- a/arch/sparc/include/asm/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
@@ -25,8 +25,9 @@
 struct vm_area_struct;
 struct page;
-extern void load_mmu(void);
+void load_mmu(void);
-extern unsigned long calc_highpages(void);
+unsigned long calc_highpages(void);
+unsigned long __init bootmem_init(unsigned long *pages_avail);
 #define pte_ERROR(e)   __builtin_trap()
 #define pmd_ERROR(e)   __builtin_trap()
@@ -56,7 +57,7 @@ extern unsigned long calc_highpages(void);
 * srmmu.c will assign the real one (which is dynamically sized) */
 #define swapper_pg_dir NULL
-extern void paging_init(void);
+void paging_init(void);
 extern unsigned long ptr_in_current_pgd;
@@ -428,8 +429,8 @@ extern unsigned long *sparc_valid_addr_bitmap;
 #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,
+int remap_pfn_range(struct vm_area_struct *, unsigned long, unsigned long,
-                           unsigned long, pgprot_t);
+                    unsigned long, pgprot_t);
 static inline int io_remap_pfn_range(struct vm_area_struct *vma,
                                     unsigned long from, unsigned long pfn,
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
index 1a49ffdf9da9..3770bf5c6e1b 100644
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
@@ -210,9 +210,9 @@ static inline bool kern_addr_valid(unsigned long addr)
 #ifndef __ASSEMBLY__
-extern pte_t mk_pte_io(unsigned long, pgprot_t, int, unsigned long);
+pte_t mk_pte_io(unsigned long, pgprot_t, int, unsigned long);
-extern unsigned long pte_sz_bits(unsigned long size);
+unsigned long pte_sz_bits(unsigned long size);
 extern pgprot_t PAGE_KERNEL;
 extern pgprot_t PAGE_KERNEL_LOCKED;
@@ -780,8 +780,8 @@ static inline int pmd_present(pmd_t pmd)
                                         !__kern_addr_valid(pud_val(pud)))
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-extern void set_pmd_at(struct mm_struct *mm, unsigned long addr,
+void set_pmd_at(struct mm_struct *mm, unsigned long addr,
-                       pmd_t *pmdp, pmd_t pmd);
+                pmd_t *pmdp, pmd_t pmd);
 #else
 static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
                              pmd_t *pmdp, pmd_t pmd)
@@ -840,8 +840,8 @@ static inline unsigned long __pmd_page(pmd_t pmd)
 #define pte_unmap(pte)                  do { } while (0)
 /* Actual page table PTE updates.  */
-extern void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,
+void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,
-                          pte_t *ptep, pte_t orig, int fullmm);
+                   pte_t *ptep, pte_t orig, int fullmm);
 #define __HAVE_ARCH_PMDP_GET_AND_CLEAR
 static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm,
@@ -900,28 +900,28 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr,
 extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
 extern pmd_t swapper_low_pmd_dir[PTRS_PER_PMD];
-extern void paging_init(void);
+void paging_init(void);
-extern unsigned long find_ecache_flush_span(unsigned long size);
+unsigned long find_ecache_flush_span(unsigned long size);
 struct seq_file;
-extern void mmu_info(struct seq_file *);
+void mmu_info(struct seq_file *);
 struct vm_area_struct;
-extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t *);
+void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t *);
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-extern void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr,
+void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr,
-                                 pmd_t *pmd);
+                          pmd_t *pmd);
 #define __HAVE_ARCH_PMDP_INVALIDATE
 extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
                            pmd_t *pmdp);
 #define __HAVE_ARCH_PGTABLE_DEPOSIT
-extern void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,
+void pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,
-                                       pgtable_t pgtable);
+                                pgtable_t pgtable);
 #define __HAVE_ARCH_PGTABLE_WITHDRAW
-extern pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp);
+pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp);
 #endif
 /* Encode and de-code a swap entry */
@@ -937,12 +937,12 @@ extern pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp);
 #define __swp_entry_to_pte(x)           ((pte_t) { (x).val })
 /* File offset in PTE support. */
-extern unsigned long pte_file(pte_t);
+unsigned long pte_file(pte_t);
 #define pte_to_pgoff(pte)       (pte_val(pte) >> PAGE_SHIFT)
-extern pte_t pgoff_to_pte(unsigned long);
+pte_t pgoff_to_pte(unsigned long);
 #define PTE_FILE_MAX_BITS       (64UL - PAGE_SHIFT - 1UL)
-extern int page_in_phys_avail(unsigned long paddr);
+int page_in_phys_avail(unsigned long paddr);
 /*
 * For sparc32&64, the pfn in io_remap_pfn_range() carries <iospace> in
@@ -952,8 +952,8 @@ extern int page_in_phys_avail(unsigned long paddr);
 #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,
+int remap_pfn_range(struct vm_area_struct *, unsigned long, unsigned long,
-                           unsigned long, pgprot_t);
+                    unsigned long, pgprot_t);
 static inline int io_remap_pfn_range(struct vm_area_struct *vma,
                                     unsigned long from, unsigned long pfn,
@@ -981,20 +981,20 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,
 /* We provide a special get_unmapped_area for framebuffer mmaps to try and use
 * the largest alignment possible such that larget PTEs can be used.
 */
-extern unsigned long get_fb_unmapped_area(struct file *filp, unsigned long,
+unsigned long get_fb_unmapped_area(struct file *filp, unsigned long,
-                                          unsigned long, unsigned long,
+                                   unsigned long, unsigned long,
-                                          unsigned long);
+                                   unsigned long);
 #define HAVE_ARCH_FB_UNMAPPED_AREA
-extern void pgtable_cache_init(void);
+void pgtable_cache_init(void);
-extern void sun4v_register_fault_status(void);
+void sun4v_register_fault_status(void);
-extern void sun4v_ktsb_register(void);
+void sun4v_ktsb_register(void);
-extern void __init cheetah_ecache_flush_init(void);
+void __init cheetah_ecache_flush_init(void);
-extern void sun4v_patch_tlb_handlers(void);
+void sun4v_patch_tlb_handlers(void);
 extern unsigned long cmdline_memory_size;
-extern asmlinkage void do_sparc64_fault(struct pt_regs *regs);
+asmlinkage void do_sparc64_fault(struct pt_regs *regs);
 #endif /* !(__ASSEMBLY__) */
diff --git a/arch/sparc/include/asm/processor_32.h b/arch/sparc/include/asm/processor_32.h
index 2c7baa4c4505..a564817bbc2e 100644
--- a/arch/sparc/include/asm/processor_32.h
+++ b/arch/sparc/include/asm/processor_32.h
@@ -74,7 +74,7 @@ struct thread_struct {
 }
 /* Return saved PC of a blocked thread. */
-extern unsigned long thread_saved_pc(struct task_struct *t);
+unsigned long thread_saved_pc(struct task_struct *t);
 /* Do necessary setup to start up a newly executed thread. */
 static inline void start_thread(struct pt_regs * regs, unsigned long pc,
@@ -107,7 +107,7 @@ static inline void start_thread(struct pt_regs * regs, unsigned long pc,
 /* Free all resources held by a thread. */
 #define release_thread(tsk)             do { } while(0)
-extern unsigned long get_wchan(struct task_struct *);
+unsigned long get_wchan(struct task_struct *);
 #define task_pt_regs(tsk) ((tsk)->thread.kregs)
 #define KSTK_EIP(tsk)  ((tsk)->thread.kregs->pc)
@@ -116,6 +116,7 @@ extern unsigned long get_wchan(struct task_struct *);
 #ifdef __KERNEL__
 extern struct task_struct *last_task_used_math;
+int do_mathemu(struct pt_regs *regs, struct task_struct *fpt);
 #define cpu_relax()     barrier()
 extern void (*sparc_idle)(void);
diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/asm/processor_64.h
index 4c3f7f01c709..7028fe1a7c04 100644
--- a/arch/sparc/include/asm/processor_64.h
+++ b/arch/sparc/include/asm/processor_64.h
@@ -95,7 +95,7 @@ struct thread_struct {
 /* Return saved PC of a blocked thread. */
 struct task_struct;
-extern unsigned long thread_saved_pc(struct task_struct *);
+unsigned long thread_saved_pc(struct task_struct *);
 /* On Uniprocessor, even in RMO processes see TSO semantics */
 #ifdef CONFIG_SMP
@@ -194,7 +194,7 @@ do { \
 /* Free all resources held by a thread. */
 #define release_thread(tsk)             do { } while (0)
-extern unsigned long get_wchan(struct task_struct *task);
+unsigned long get_wchan(struct task_struct *task);
 #define task_pt_regs(tsk) (task_thread_info(tsk)->kregs)
 #define KSTK_EIP(tsk)  (task_pt_regs(tsk)->tpc)
@@ -253,6 +253,8 @@ static inline void prefetchw(const void *x)
 #define HAVE_ARCH_PICK_MMAP_LAYOUT
+int do_mathemu(struct pt_regs *regs, struct fpustate *f, bool illegal_insn_trap);
 #endif /* !(__ASSEMBLY__) */
 #endif /* !(__ASM_SPARC64_PROCESSOR_H) */
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h
index 11ebd659e7b6..d955c8df62d6 100644
--- a/arch/sparc/include/asm/prom.h
+++ b/arch/sparc/include/asm/prom.h
@@ -36,28 +36,28 @@ struct of_irq_controller {
        void            *data;
 };
-extern struct device_node *of_find_node_by_cpuid(int cpuid);
+struct device_node *of_find_node_by_cpuid(int cpuid);
-extern int of_set_property(struct device_node *node, const char *name, void *val, int len);
+int of_set_property(struct device_node *node, const char *name, void *val, int len);
 extern struct mutex of_set_property_mutex;
-extern int of_getintprop_default(struct device_node *np,
+int of_getintprop_default(struct device_node *np,
-                                 const char *name,
+                          const char *name,
                                 int def);
-extern int of_find_in_proplist(const char *list, const char *match, int len);
+int of_find_in_proplist(const char *list, const char *match, int len);
-extern void prom_build_devicetree(void);
+void prom_build_devicetree(void);
-extern void of_populate_present_mask(void);
+void of_populate_present_mask(void);
-extern void of_fill_in_cpu_data(void);
+void of_fill_in_cpu_data(void);
 struct resource;
-extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);
+void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);
-extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);
+void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);
 extern struct device_node *of_console_device;
 extern char *of_console_path;
 extern char *of_console_options;
-extern void irq_trans_init(struct device_node *dp);
+void irq_trans_init(struct device_node *dp);
-extern char *build_path_component(struct device_node *dp);
+char *build_path_component(struct device_node *dp);
 #endif /* __KERNEL__ */
 #endif /* _SPARC_PROM_H */
diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h
index bdfafd7af46f..bac6a946ee00 100644
--- a/arch/sparc/include/asm/ptrace.h
+++ b/arch/sparc/include/asm/ptrace.h
@@ -73,7 +73,7 @@ static inline long regs_return_value(struct pt_regs *regs)
        return regs->u_regs[UREG_I0];
 }
 #ifdef CONFIG_SMP
-extern unsigned long profile_pc(struct pt_regs *);
+unsigned long profile_pc(struct pt_regs *);
 #else
 #define profile_pc(regs) instruction_pointer(regs)
 #endif
diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
index 5e35e0517318..f5fffd84d0dd 100644
--- a/arch/sparc/include/asm/setup.h
+++ b/arch/sparc/include/asm/setup.h
@@ -4,8 +4,9 @@
 #ifndef _SPARC_SETUP_H
 #define _SPARC_SETUP_H
-#include <uapi/asm/setup.h>
+#include <linux/interrupt.h>
+#include <uapi/asm/setup.h>
 extern char reboot_command[];
@@ -22,9 +23,43 @@ static inline int con_is_present(void)
 {
        return serial_console ? 0 : 1;
 }
+/* from irq_32.c */
+extern volatile unsigned char *fdc_status;
+extern char *pdma_vaddr;
+extern unsigned long pdma_size;
+extern volatile int doing_pdma;
+/* This is software state */
+extern char *pdma_base;
+extern unsigned long pdma_areasize;
+int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler);
+/* setup_32.c */
+extern unsigned long cmdline_memory_size;
+/* devices.c */
+void __init device_scan(void);
+/* unaligned_32.c */
+unsigned long safe_compute_effective_address(struct pt_regs *, unsigned int);
+#endif
+#ifdef CONFIG_SPARC64
+/* unaligned_64.c */
+int handle_ldf_stq(u32 insn, struct pt_regs *regs);
+void handle_ld_nf(u32 insn, struct pt_regs *regs);
+/* init_64.c */
+extern atomic_t dcpage_flushes;
+extern atomic_t dcpage_flushes_xcall;
+extern int sysctl_tsb_ratio;
 #endif
-extern void sun_do_break(void);
+void sun_do_break(void);
 extern int stop_a_enabled;
 extern int scons_pwroff;
diff --git a/arch/sparc/include/asm/sfp-machine_32.h b/arch/sparc/include/asm/sfp-machine_32.h
index 01d9c3b5a73b..838c9d58f3b4 100644
--- a/arch/sparc/include/asm/sfp-machine_32.h
+++ b/arch/sparc/include/asm/sfp-machine_32.h
@@ -79,9 +79,9 @@
  __asm__ ("addcc %r7,%8,%2\n\t"                                        \
           "addxcc %r5,%6,%1\n\t"                                       \
           "addx %r3,%4,%0\n"                                           \
-           : "=r" ((USItype)(r2)),                                      \
+           : "=r" (r2),                                                 \
-             "=&r" ((USItype)(r1)),                                     \
+             "=&r" (r1),                                                \
-             "=&r" ((USItype)(r0))                                      \
+             "=&r" (r0)                                                 \
           : "%rJ" ((USItype)(x2)),                                     \
             "rI" ((USItype)(y2)),                                      \
             "%rJ" ((USItype)(x1)),                                     \
@@ -94,9 +94,9 @@
  __asm__ ("subcc %r7,%8,%2\n\t"                                        \
            "subxcc %r5,%6,%1\n\t"                                      \
            "subx %r3,%4,%0\n"                                          \
-           : "=r" ((USItype)(r2)),                                      \
+           : "=r" (r2),                                                 \
-             "=&r" ((USItype)(r1)),                                     \
+             "=&r" (r1),                                                \
-             "=&r" ((USItype)(r0))                                      \
+             "=&r" (r0)                                                 \
           : "%rJ" ((USItype)(x2)),                                     \
             "rI" ((USItype)(y2)),                                      \
             "%rJ" ((USItype)(x1)),                                     \
@@ -115,8 +115,8 @@
            "addxcc %r6,%7,%0\n\t"                                      \
            "addxcc %r4,%5,%%g2\n\t"                                    \
            "addx %r2,%3,%%g1\n\t"                                      \
-           : "=&r" ((USItype)(r1)),                                     \
+           : "=&r" (r1),                                                \
-             "=&r" ((USItype)(r0))                                      \
+             "=&r" (r0)                                                 \
           : "%rJ" ((USItype)(x3)),                                     \
             "rI" ((USItype)(y3)),                                      \
             "%rJ" ((USItype)(x2)),                                     \
@@ -140,8 +140,8 @@
            "subxcc %r6,%7,%0\n\t"                                      \
            "subxcc %r4,%5,%%g2\n\t"                                    \
            "subx %r2,%3,%%g1\n\t"                                      \
-           : "=&r" ((USItype)(r1)),                                     \
+           : "=&r" (r1),                                                \
-             "=&r" ((USItype)(r0))                                      \
+             "=&r" (r0)                                                 \
           : "%rJ" ((USItype)(x3)),                                     \
             "rI" ((USItype)(y3)),                                      \
             "%rJ" ((USItype)(x2)),                                     \
@@ -164,10 +164,10 @@
           "addxcc %2,%%g0,%2\n\t"                                      \
           "addxcc %1,%%g0,%1\n\t"                                      \
           "addx %0,%%g0,%0\n\t"                                        \
-           : "=&r" ((USItype)(x3)),                                     \
+           : "=&r" (x3),                                                \
-             "=&r" ((USItype)(x2)),                                     \
+             "=&r" (x2),                                                \
-             "=&r" ((USItype)(x1)),                                     \
+             "=&r" (x1),                                                \
-             "=&r" ((USItype)(x0))                                      \
+             "=&r" (x0)                                                 \
           : "rI" ((USItype)(i)),                                       \
             "0" ((USItype)(x3)),                                       \
             "1" ((USItype)(x2)),                                       \
diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/smp_32.h
index 3c8917f054de..7c24e08a88d2 100644
--- a/arch/sparc/include/asm/smp_32.h
+++ b/arch/sparc/include/asm/smp_32.h
@@ -93,15 +93,15 @@ static inline void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2,
                                    arg1, arg2, arg3, arg4);
 }
-extern void arch_send_call_function_single_ipi(int cpu);
+void arch_send_call_function_single_ipi(int cpu);
-extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
+void arch_send_call_function_ipi_mask(const struct cpumask *mask);
 static inline int cpu_logical_map(int cpu)
 {
        return cpu;
 }
-extern int hard_smp_processor_id(void);
+int hard_smp_processor_id(void);
 #define raw_smp_processor_id()          (current_thread_info()->cpu)
diff --git a/arch/sparc/include/asm/smp_64.h b/arch/sparc/include/asm/smp_64.h
index 05710393959f..26d9e7726867 100644
--- a/arch/sparc/include/asm/smp_64.h
+++ b/arch/sparc/include/asm/smp_64.h
@@ -33,29 +33,35 @@
 DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
 extern cpumask_t cpu_core_map[NR_CPUS];
-extern void arch_send_call_function_single_ipi(int cpu);
+void arch_send_call_function_single_ipi(int cpu);
-extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
+void arch_send_call_function_ipi_mask(const struct cpumask *mask);
 /*
 *      General functions that each host system must provide.
 */
-extern int hard_smp_processor_id(void);
+int hard_smp_processor_id(void);
 #define raw_smp_processor_id() (current_thread_info()->cpu)
-extern void smp_fill_in_sib_core_maps(void);
+void smp_fill_in_sib_core_maps(void);
-extern void cpu_play_dead(void);
+void cpu_play_dead(void);
-extern void smp_fetch_global_regs(void);
+void smp_fetch_global_regs(void);
-extern void smp_fetch_global_pmu(void);
+void smp_fetch_global_pmu(void);
 struct seq_file;
 void smp_bogo(struct seq_file *);
 void smp_info(struct seq_file *);
+void smp_callin(void);
+void cpu_panic(void);
+void smp_synchronize_tick_client(void);
+void smp_capture(void);
+void smp_release(void);
 #ifdef CONFIG_HOTPLUG_CPU
-extern int __cpu_disable(void);
+int __cpu_disable(void);
-extern void __cpu_die(unsigned int cpu);
+void __cpu_die(unsigned int cpu);
 #endif
 #endif /* !(__ASSEMBLY__) */
diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h
index 6b67e50fb9b4..3fc58691dbd0 100644
--- a/arch/sparc/include/asm/spitfire.h
+++ b/arch/sparc/include/asm/spitfire.h
@@ -62,7 +62,7 @@ extern enum ultra_tlb_layout tlb_type;
 extern int sun4v_chip_type;
 extern int cheetah_pcache_forced_on;
-extern void cheetah_enable_pcache(void);
+void cheetah_enable_pcache(void);
 #define sparc64_highest_locked_tlbent() \
        (tlb_type == spitfire ? \
diff --git a/arch/sparc/include/asm/stacktrace.h b/arch/sparc/include/asm/stacktrace.h
index 6cee39adf6d6..c30d066f3048 100644
--- a/arch/sparc/include/asm/stacktrace.h
+++ b/arch/sparc/include/asm/stacktrace.h
@@ -1,6 +1,6 @@
 #ifndef _SPARC64_STACKTRACE_H
 #define _SPARC64_STACKTRACE_H
-extern void stack_trace_flush(void);
+void stack_trace_flush(void);
 #endif /* _SPARC64_STACKTRACE_H */
diff --git a/arch/sparc/include/asm/starfire.h b/arch/sparc/include/asm/starfire.h
index d56ce60a5992..c100dc27a0a9 100644
--- a/arch/sparc/include/asm/starfire.h
+++ b/arch/sparc/include/asm/starfire.h
@@ -11,10 +11,10 @@
 extern int this_is_starfire;
-extern void check_if_starfire(void);
+void check_if_starfire(void);
-extern int starfire_hard_smp_processor_id(void);
+int starfire_hard_smp_processor_id(void);
-extern void starfire_hookup(int);
+void starfire_hookup(int);
-extern unsigned int starfire_translate(unsigned long imap, unsigned int upaid);
+unsigned int starfire_translate(unsigned long imap, unsigned int upaid);
 #endif
 #endif
diff --git a/arch/sparc/include/asm/string_32.h b/arch/sparc/include/asm/string_32.h
index 12f67857152e..69974e924611 100644
--- a/arch/sparc/include/asm/string_32.h
+++ b/arch/sparc/include/asm/string_32.h
@@ -15,7 +15,7 @@
 #ifdef __KERNEL__
-extern void __memmove(void *,const void *,__kernel_size_t);
+void __memmove(void *,const void *,__kernel_size_t);
 #ifndef EXPORT_SYMTAB_STROPS
@@ -40,8 +40,8 @@ extern void __memmove(void *,const void *,__kernel_size_t);
 #undef memscan
 #define memscan(__arg0, __char, __arg2)                                         \
 ({                                                                              \
-        extern void *__memscan_zero(void *, size_t);                            \
+        void *__memscan_zero(void *, size_t);                                   \
-        extern void *__memscan_generic(void *, int, size_t);                    \
+        void *__memscan_generic(void *, int, size_t);                           \
        void *__retval, *__addr = (__arg0);                                     \
        size_t __size = (__arg2);                                               \
                                                                                \
@@ -54,14 +54,14 @@ extern void __memmove(void *,const void *,__kernel_size_t);
 })
 #define __HAVE_ARCH_MEMCMP
-extern int memcmp(const void *,const void *,__kernel_size_t);
+int memcmp(const void *,const void *,__kernel_size_t);
 /* Now the str*() stuff... */
 #define __HAVE_ARCH_STRLEN
-extern __kernel_size_t strlen(const char *);
+__kernel_size_t strlen(const char *);
 #define __HAVE_ARCH_STRNCMP
-extern int strncmp(const char *, const char *, __kernel_size_t);
+int strncmp(const char *, const char *, __kernel_size_t);
 #endif /* !EXPORT_SYMTAB_STROPS */
diff --git a/arch/sparc/include/asm/string_64.h b/arch/sparc/include/asm/string_64.h
index 9623bc213158..5936b8ff3c05 100644
--- a/arch/sparc/include/asm/string_64.h
+++ b/arch/sparc/include/asm/string_64.h
@@ -19,7 +19,7 @@
 /* First the mem*() things. */
 #define __HAVE_ARCH_MEMMOVE
-extern void *memmove(void *, const void *, __kernel_size_t);
+void *memmove(void *, const void *, __kernel_size_t);
 #define __HAVE_ARCH_MEMCPY
 #define memcpy(t, f, n) __builtin_memcpy(t, f, n)
@@ -32,8 +32,8 @@ extern void *memmove(void *, const void *, __kernel_size_t);
 #undef memscan
 #define memscan(__arg0, __char, __arg2)                                 \
 ({                                                                      \
-        extern void *__memscan_zero(void *, size_t);                    \
+        void *__memscan_zero(void *, size_t);                           \
-        extern void *__memscan_generic(void *, int, size_t);            \
+        void *__memscan_generic(void *, int, size_t);                   \
        void *__retval, *__addr = (__arg0);                             \
        size_t __size = (__arg2);                                       \
                                                                        \
@@ -46,14 +46,14 @@ extern void *memmove(void *, const void *, __kernel_size_t);
 })
 #define __HAVE_ARCH_MEMCMP
-extern int memcmp(const void *,const void *,__kernel_size_t);
+int memcmp(const void *,const void *,__kernel_size_t);
 /* Now the str*() stuff... */
 #define __HAVE_ARCH_STRLEN
-extern __kernel_size_t strlen(const char *);
+__kernel_size_t strlen(const char *);
 #define __HAVE_ARCH_STRNCMP
-extern int strncmp(const char *, const char *, __kernel_size_t);
+int strncmp(const char *, const char *, __kernel_size_t);
 #endif /* !EXPORT_SYMTAB_STROPS */
diff --git a/arch/sparc/include/asm/switch_to_32.h b/arch/sparc/include/asm/switch_to_32.h
index e32e82b76eed..16f10374feb3 100644
--- a/arch/sparc/include/asm/switch_to_32.h
+++ b/arch/sparc/include/asm/switch_to_32.h
@@ -99,8 +99,8 @@ extern struct thread_info *current_set[NR_CPUS];
          "o0", "o1", "o2", "o3",                   "o7");      \
        } while(0)
-extern void fpsave(unsigned long *fpregs, unsigned long *fsr,
+void fpsave(unsigned long *fpregs, unsigned long *fsr,
-                   void *fpqueue, unsigned long *fpqdepth);
+            void *fpqueue, unsigned long *fpqdepth);
-extern void synchronize_user_stack(void);
+void synchronize_user_stack(void);
 #endif /* __SPARC_SWITCH_TO_H */
diff --git a/arch/sparc/include/asm/switch_to_64.h b/arch/sparc/include/asm/switch_to_64.h
index 8d284801f232..10e76332dc99 100644
--- a/arch/sparc/include/asm/switch_to_64.h
+++ b/arch/sparc/include/asm/switch_to_64.h
@@ -65,7 +65,7 @@ do {	save_and_clear_fpu();						\
          "o0", "o1", "o2", "o3", "o4", "o5",       "o7");              \
 } while(0)
-extern void synchronize_user_stack(void);
+void synchronize_user_stack(void);
-extern void fault_in_user_windows(void);
+void fault_in_user_windows(void);
 #endif /* __SPARC64_SWITCH_TO_64_H */
diff --git a/arch/sparc/include/asm/syscalls.h b/arch/sparc/include/asm/syscalls.h
index bf8972adea17..b0a0db8ea61a 100644
--- a/arch/sparc/include/asm/syscalls.h
+++ b/arch/sparc/include/asm/syscalls.h
@@ -3,9 +3,9 @@
 struct pt_regs;
-extern asmlinkage long sparc_do_fork(unsigned long clone_flags,
+asmlinkage long sparc_do_fork(unsigned long clone_flags,
-                                     unsigned long stack_start,
+                              unsigned long stack_start,
-                                     struct pt_regs *regs,
+                              struct pt_regs *regs,
-                                     unsigned long stack_size);
+                              unsigned long stack_size);
 #endif /* _SPARC64_SYSCALLS_H */
diff --git a/arch/sparc/include/asm/timer_32.h b/arch/sparc/include/asm/timer_32.h
index 72f40a546de3..f8e708a0aa58 100644
--- a/arch/sparc/include/asm/timer_32.h
+++ b/arch/sparc/include/asm/timer_32.h
@@ -32,13 +32,13 @@ static inline unsigned int timer_value(unsigned int value)
        return (value + 1) << TIMER_VALUE_SHIFT;
 }
-extern __volatile__ unsigned int *master_l10_counter;
+extern volatile u32 __iomem *master_l10_counter;
-extern irqreturn_t notrace timer_interrupt(int dummy, void *dev_id);
+irqreturn_t notrace timer_interrupt(int dummy, void *dev_id);
 #ifdef CONFIG_SMP
 DECLARE_PER_CPU(struct clock_event_device, sparc32_clockevent);
-extern void register_percpu_ce(int cpu);
+void register_percpu_ce(int cpu);
 #endif
 #endif /* !(_SPARC_TIMER_H) */
diff --git a/arch/sparc/include/asm/timer_64.h b/arch/sparc/include/asm/timer_64.h
index 01197d8215c4..fce415034000 100644
--- a/arch/sparc/include/asm/timer_64.h
+++ b/arch/sparc/include/asm/timer_64.h
@@ -23,8 +23,8 @@ struct sparc64_tick_ops {
 extern struct sparc64_tick_ops *tick_ops;
-extern unsigned long sparc64_get_clock_tick(unsigned int cpu);
+unsigned long sparc64_get_clock_tick(unsigned int cpu);
-extern void setup_sparc64_timer(void);
+void setup_sparc64_timer(void);
-extern void __init time_init(void);
+void __init time_init(void);
 #endif /* _SPARC64_TIMER_H */
diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
index 190e18913cc6..4cb392f75d2b 100644
--- a/arch/sparc/include/asm/tlb_64.h
+++ b/arch/sparc/include/asm/tlb_64.h
@@ -8,19 +8,19 @@
 #include <asm/mmu_context.h>
 #ifdef CONFIG_SMP
-extern void smp_flush_tlb_pending(struct mm_struct *,
+void smp_flush_tlb_pending(struct mm_struct *,
                                  unsigned long, unsigned long *);
 #endif
 #ifdef CONFIG_SMP
-extern void smp_flush_tlb_mm(struct mm_struct *mm);
+void smp_flush_tlb_mm(struct mm_struct *mm);
 #define do_flush_tlb_mm(mm) smp_flush_tlb_mm(mm)
 #else
 #define do_flush_tlb_mm(mm) __flush_tlb_mm(CTX_HWBITS(mm->context), SECONDARY_CONTEXT)
 #endif
-extern void __flush_tlb_pending(unsigned long, unsigned long, unsigned long *);
+void __flush_tlb_pending(unsigned long, unsigned long, unsigned long *);
-extern void flush_tlb_pending(void);
+void flush_tlb_pending(void);
 #define tlb_start_vma(tlb, vma) do { } while (0)
 #define tlb_end_vma(tlb, vma)   do { } while (0)
diff --git a/arch/sparc/include/asm/tlbflush_64.h b/arch/sparc/include/asm/tlbflush_64.h
index 3c3c89f52643..816d8202fa0a 100644
--- a/arch/sparc/include/asm/tlbflush_64.h
+++ b/arch/sparc/include/asm/tlbflush_64.h
@@ -14,9 +14,9 @@ struct tlb_batch {
        unsigned long vaddrs[TLB_BATCH_NR];
 };
-extern void flush_tsb_kernel_range(unsigned long start, unsigned long end);
+void flush_tsb_kernel_range(unsigned long start, unsigned long end);
-extern void flush_tsb_user(struct tlb_batch *tb);
+void flush_tsb_user(struct tlb_batch *tb);
-extern void flush_tsb_user_page(struct mm_struct *mm, unsigned long vaddr);
+void flush_tsb_user_page(struct mm_struct *mm, unsigned long vaddr);
 /* TLB flush operations. */
@@ -36,15 +36,15 @@ static inline void flush_tlb_range(struct vm_area_struct *vma,
 #define __HAVE_ARCH_ENTER_LAZY_MMU_MODE
-extern void flush_tlb_pending(void);
+void flush_tlb_pending(void);
-extern void arch_enter_lazy_mmu_mode(void);
+void arch_enter_lazy_mmu_mode(void);
-extern void arch_leave_lazy_mmu_mode(void);
+void arch_leave_lazy_mmu_mode(void);
 #define arch_flush_lazy_mmu_mode()      do {} while (0)
 /* Local cpu only.  */
-extern void __flush_tlb_all(void);
+void __flush_tlb_all(void);
-extern void __flush_tlb_page(unsigned long context, unsigned long vaddr);
+void __flush_tlb_page(unsigned long context, unsigned long vaddr);
-extern void __flush_tlb_kernel_range(unsigned long start, unsigned long end);
+void __flush_tlb_kernel_range(unsigned long start, unsigned long end);
 #ifndef CONFIG_SMP
@@ -60,8 +60,8 @@ static inline void global_flush_tlb_page(struct mm_struct *mm, unsigned long vad
 #else /* CONFIG_SMP */
-extern void smp_flush_tlb_kernel_range(unsigned long start, unsigned long end);
+void smp_flush_tlb_kernel_range(unsigned long start, unsigned long end);
-extern void smp_flush_tlb_page(struct mm_struct *mm, unsigned long vaddr);
+void smp_flush_tlb_page(struct mm_struct *mm, unsigned long vaddr);
 #define flush_tlb_kernel_range(start, end) \
 do {    flush_tsb_kernel_range(start,end); \
diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h
index a2d10fc64faf..ed8f071132e4 100644
--- a/arch/sparc/include/asm/topology_64.h
+++ b/arch/sparc/include/asm/topology_64.h
@@ -18,7 +18,7 @@ static inline int cpu_to_node(int cpu)
 struct pci_bus;
 #ifdef CONFIG_PCI
-extern int pcibus_to_node(struct pci_bus *pbus);
+int pcibus_to_node(struct pci_bus *pbus);
 #else
 static inline int pcibus_to_node(struct pci_bus *pbus)
 {
diff --git a/arch/sparc/include/asm/trap_block.h b/arch/sparc/include/asm/trap_block.h
index 7e26b2db6211..6fd4436d32f0 100644
--- a/arch/sparc/include/asm/trap_block.h
+++ b/arch/sparc/include/asm/trap_block.h
@@ -51,11 +51,11 @@ struct trap_per_cpu {
        unsigned long           __per_cpu_base;
 } __attribute__((aligned(64)));
 extern struct trap_per_cpu trap_block[NR_CPUS];
-extern void init_cur_cpu_trap(struct thread_info *);
+void init_cur_cpu_trap(struct thread_info *);
-extern void setup_tba(void);
+void setup_tba(void);
 extern int ncpus_probed;
-extern unsigned long real_hard_smp_processor_id(void);
+unsigned long real_hard_smp_processor_id(void);
 struct cpuid_patch_entry {
        unsigned int    addr;
diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
index 0167d26d0d1d..bd56c28fff9f 100644
--- a/arch/sparc/include/asm/uaccess.h
+++ b/arch/sparc/include/asm/uaccess.h
@@ -9,6 +9,6 @@
 #define user_addr_max() \
        (segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL)
-extern long strncpy_from_user(char *dest, const char __user *src, long count);
+long strncpy_from_user(char *dest, const char __user *src, long count);
 #endif
diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
index 53a28dd59f59..9634d086fc56 100644
--- a/arch/sparc/include/asm/uaccess_32.h
+++ b/arch/sparc/include/asm/uaccess_32.h
@@ -78,9 +78,9 @@ struct exception_table_entry
 };
 /* Returns 0 if exception not found and fixup otherwise.  */
-extern unsigned long search_extables_range(unsigned long addr, unsigned long *g2);
+unsigned long search_extables_range(unsigned long addr, unsigned long *g2);
-extern void __ret_efault(void);
+void __ret_efault(void);
 /* Uh, these should become the main single-value transfer routines..
 * They automatically use the right size if we just have the right
@@ -152,7 +152,7 @@ __asm__ __volatile__(							\
       : "=&r" (ret) : "r" (x), "m" (*__m(addr)),                       \
         "i" (-EFAULT))
-extern int __put_user_bad(void);
+int __put_user_bad(void);
 #define __get_user_check(x,addr,size,type) ({ \
 register int __gu_ret; \
@@ -244,9 +244,9 @@ __asm__ __volatile__(							\
        ".previous\n\t"                                                 \
       : "=&r" (x) : "m" (*__m(addr)), "i" (retval))
-extern int __get_user_bad(void);
+int __get_user_bad(void);
-extern unsigned long __copy_user(void __user *to, const void __user *from, unsigned long size);
+unsigned long __copy_user(void __user *to, const void __user *from, unsigned long size);
 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
 {
@@ -306,8 +306,8 @@ static inline unsigned long clear_user(void __user *addr, unsigned long n)
                return n;
 }
-extern __must_check long strlen_user(const char __user *str);
+__must_check long strlen_user(const char __user *str);
-extern __must_check long strnlen_user(const char __user *str, long n);
+__must_check long strnlen_user(const char __user *str, long n);
 #endif  /* __ASSEMBLY__ */
diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
index ad7e178337f1..c990a5e577f0 100644
--- a/arch/sparc/include/asm/uaccess_64.h
+++ b/arch/sparc/include/asm/uaccess_64.h
@@ -76,8 +76,8 @@ struct exception_table_entry {
        unsigned int insn, fixup;
 };
-extern void __ret_efault(void);
+void __ret_efault(void);
-extern void __retl_efault(void);
+void __retl_efault(void);
 /* Uh, these should become the main single-value transfer routines..
 * They automatically use the right size if we just have the right
@@ -134,7 +134,7 @@ __asm__ __volatile__(							\
       : "=r" (ret) : "r" (x), "r" (__m(addr)),                         \
         "i" (-EFAULT))
-extern int __put_user_bad(void);
+int __put_user_bad(void);
 #define __get_user_nocheck(data,addr,size,type) ({ \
 register int __gu_ret; \
@@ -204,13 +204,13 @@ __asm__ __volatile__(							\
        ".previous\n\t"                                                 \
       : "=r" (x) : "r" (__m(addr)), "i" (retval))
-extern int __get_user_bad(void);
+int __get_user_bad(void);
-extern unsigned long __must_check ___copy_from_user(void *to,
+unsigned long __must_check ___copy_from_user(void *to,
-                                                    const void __user *from,
+                                             const void __user *from,
-                                                    unsigned long size);
+                                             unsigned long size);
-extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
+unsigned long copy_from_user_fixup(void *to, const void __user *from,
-                                          unsigned long size);
+                                   unsigned long size);
 static inline unsigned long __must_check
 copy_from_user(void *to, const void __user *from, unsigned long size)
 {
@@ -223,11 +223,11 @@ copy_from_user(void *to, const void __user *from, unsigned long size)
 }
 #define __copy_from_user copy_from_user
-extern unsigned long __must_check ___copy_to_user(void __user *to,
+unsigned long __must_check ___copy_to_user(void __user *to,
-                                                  const void *from,
+                                           const void *from,
-                                                  unsigned long size);
+                                           unsigned long size);
-extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
+unsigned long copy_to_user_fixup(void __user *to, const void *from,
-                                        unsigned long size);
+                                 unsigned long size);
 static inline unsigned long __must_check
 copy_to_user(void __user *to, const void *from, unsigned long size)
 {
@@ -239,11 +239,11 @@ copy_to_user(void __user *to, const void *from, unsigned long size)
 }
 #define __copy_to_user copy_to_user
-extern unsigned long __must_check ___copy_in_user(void __user *to,
+unsigned long __must_check ___copy_in_user(void __user *to,
-                                                  const void __user *from,
+                                           const void __user *from,
-                                                  unsigned long size);
+                                           unsigned long size);
-extern unsigned long copy_in_user_fixup(void __user *to, void __user *from,
+unsigned long copy_in_user_fixup(void __user *to, void __user *from,
-                                        unsigned long size);
+                                 unsigned long size);
 static inline unsigned long __must_check
 copy_in_user(void __user *to, void __user *from, unsigned long size)
 {
@@ -255,20 +255,20 @@ copy_in_user(void __user *to, void __user *from, unsigned long size)
 }
 #define __copy_in_user copy_in_user
-extern unsigned long __must_check __clear_user(void __user *, unsigned long);
+unsigned long __must_check __clear_user(void __user *, unsigned long);
 #define clear_user __clear_user
-extern __must_check long strlen_user(const char __user *str);
+__must_check long strlen_user(const char __user *str);
-extern __must_check long strnlen_user(const char __user *str, long n);
+__must_check long strnlen_user(const char __user *str, long n);
 #define __copy_to_user_inatomic __copy_to_user
 #define __copy_from_user_inatomic __copy_from_user
 struct pt_regs;
-extern unsigned long compute_effective_address(struct pt_regs *,
+unsigned long compute_effective_address(struct pt_regs *,
-                                               unsigned int insn,
+                                        unsigned int insn,
-                                               unsigned int rd);
+                                        unsigned int rd);
 #endif  /* __ASSEMBLY__ */
diff --git a/arch/sparc/include/asm/vio.h b/arch/sparc/include/asm/vio.h
index 432afa838861..e0f6c399f1d0 100644
--- a/arch/sparc/include/asm/vio.h
+++ b/arch/sparc/include/asm/vio.h
@@ -372,14 +372,14 @@ do {	if (vio->debug & VIO_DEBUG_##TYPE) \
                       vio->vdev->channel_id, ## a); \
 } while (0)
-extern int __vio_register_driver(struct vio_driver *drv, struct module *owner,
+int __vio_register_driver(struct vio_driver *drv, struct module *owner,
                                 const char *mod_name);
 /*
 * vio_register_driver must be a macro so that KBUILD_MODNAME can be expanded
 */
 #define vio_register_driver(driver)             \
        __vio_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)
-extern void vio_unregister_driver(struct vio_driver *drv);
+void vio_unregister_driver(struct vio_driver *drv);
 static inline struct vio_driver *to_vio_driver(struct device_driver *drv)
 {
@@ -391,21 +391,21 @@ static inline struct vio_dev *to_vio_dev(struct device *dev)
        return container_of(dev, struct vio_dev, dev);
 }
-extern int vio_ldc_send(struct vio_driver_state *vio, void *data, int len);
+int vio_ldc_send(struct vio_driver_state *vio, void *data, int len);
-extern void vio_link_state_change(struct vio_driver_state *vio, int event);
+void vio_link_state_change(struct vio_driver_state *vio, int event);
-extern void vio_conn_reset(struct vio_driver_state *vio);
+void vio_conn_reset(struct vio_driver_state *vio);
-extern int vio_control_pkt_engine(struct vio_driver_state *vio, void *pkt);
+int vio_control_pkt_engine(struct vio_driver_state *vio, void *pkt);
-extern int vio_validate_sid(struct vio_driver_state *vio,
+int vio_validate_sid(struct vio_driver_state *vio,
-                            struct vio_msg_tag *tp);
+                     struct vio_msg_tag *tp);
-extern u32 vio_send_sid(struct vio_driver_state *vio);
+u32 vio_send_sid(struct vio_driver_state *vio);
-extern int vio_ldc_alloc(struct vio_driver_state *vio,
+int vio_ldc_alloc(struct vio_driver_state *vio,
-                         struct ldc_channel_config *base_cfg, void *event_arg);
+                  struct ldc_channel_config *base_cfg, void *event_arg);
-extern void vio_ldc_free(struct vio_driver_state *vio);
+void vio_ldc_free(struct vio_driver_state *vio);
-extern int vio_driver_init(struct vio_driver_state *vio, struct vio_dev *vdev,
+int vio_driver_init(struct vio_driver_state *vio, struct vio_dev *vdev,
-                           u8 dev_class, struct vio_version *ver_table,
+                    u8 dev_class, struct vio_version *ver_table,
-                           int ver_table_size, struct vio_driver_ops *ops,
+                    int ver_table_size, struct vio_driver_ops *ops,
-                           char *name);
+                    char *name);
-extern void vio_port_up(struct vio_driver_state *vio);
+void vio_port_up(struct vio_driver_state *vio);
 #endif /* _SPARC64_VIO_H */
diff --git a/arch/sparc/include/asm/visasm.h b/arch/sparc/include/asm/visasm.h
index 39ca301920db..b26673759283 100644
--- a/arch/sparc/include/asm/visasm.h
+++ b/arch/sparc/include/asm/visasm.h
@@ -57,7 +57,8 @@ static inline void save_and_clear_fpu(void) {
 "               " : : "i" (FPRS_FEF|FPRS_DU) :
                "o5", "g1", "g2", "g3", "g7", "cc");
 }
-extern int vis_emul(struct pt_regs *, unsigned int);
+int vis_emul(struct pt_regs *, unsigned int);
 #endif
 #endif /* _SPARC64_ASI_H */
diff --git a/arch/sparc/include/asm/xor_64.h b/arch/sparc/include/asm/xor_64.h
index ee8edc68423e..50c882856031 100644
--- a/arch/sparc/include/asm/xor_64.h
+++ b/arch/sparc/include/asm/xor_64.h
@@ -20,13 +20,13 @@
 #include <asm/spitfire.h>
-extern void xor_vis_2(unsigned long, unsigned long *, unsigned long *);
+void xor_vis_2(unsigned long, unsigned long *, unsigned long *);
-extern void xor_vis_3(unsigned long, unsigned long *, unsigned long *,
+void xor_vis_3(unsigned long, unsigned long *, unsigned long *,
-                      unsigned long *);
+               unsigned long *);
-extern void xor_vis_4(unsigned long, unsigned long *, unsigned long *,
+void xor_vis_4(unsigned long, unsigned long *, unsigned long *,
-                      unsigned long *, unsigned long *);
+               unsigned long *, unsigned long *);
-extern void xor_vis_5(unsigned long, unsigned long *, unsigned long *,
+void xor_vis_5(unsigned long, unsigned long *, unsigned long *,
-                      unsigned long *, unsigned long *, unsigned long *);
+               unsigned long *, unsigned long *, unsigned long *);
 /* XXX Ugh, write cheetah versions... -DaveM */
@@ -38,13 +38,13 @@ static struct xor_block_template xor_block_VIS = {
        .do_5   = xor_vis_5,
 };
-extern void xor_niagara_2(unsigned long, unsigned long *, unsigned long *);
+void xor_niagara_2(unsigned long, unsigned long *, unsigned long *);
-extern void xor_niagara_3(unsigned long, unsigned long *, unsigned long *,
+void xor_niagara_3(unsigned long, unsigned long *, unsigned long *,
-                          unsigned long *);
+                   unsigned long *);
-extern void xor_niagara_4(unsigned long, unsigned long *, unsigned long *,
+void xor_niagara_4(unsigned long, unsigned long *, unsigned long *,
-                          unsigned long *, unsigned long *);
+                   unsigned long *, unsigned long *);
-extern void xor_niagara_5(unsigned long, unsigned long *, unsigned long *,
+void xor_niagara_5(unsigned long, unsigned long *, unsigned long *,
-                          unsigned long *, unsigned long *, unsigned long *);
+                   unsigned long *, unsigned long *, unsigned long *);
 static struct xor_block_template xor_block_niagara = {
        .name   = "Niagara",
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index d15cc1794b0e..7cf9c6ea3f1f 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -42,7 +42,6 @@ obj-y                   += time_$(BITS).o
 obj-$(CONFIG_SPARC32)   += windows.o
 obj-y                   += cpu.o
 obj-$(CONFIG_SPARC32)   += devices.o
-obj-$(CONFIG_SPARC32)   += tadpole.o
 obj-y                   += ptrace_$(BITS).o
 obj-y                   += unaligned_$(BITS).o
 obj-y                   += una_asm_$(BITS).o
diff --git a/arch/sparc/kernel/audit.c b/arch/sparc/kernel/audit.c
index 8fff0ac63d56..24361b494a93 100644
--- a/arch/sparc/kernel/audit.c
+++ b/arch/sparc/kernel/audit.c
@@ -3,6 +3,8 @@
 #include <linux/audit.h>
 #include <asm/unistd.h>
+#include "kernel.h"
 static unsigned dir_class[] = {
 #include <asm-generic/audit_dir_write.h>
 ~0U
@@ -40,7 +42,6 @@ int audit_classify_arch(int arch)
 int audit_classify_syscall(int abi, unsigned syscall)
 {
 #ifdef CONFIG_COMPAT
-        extern int sparc32_classify_syscall(unsigned);
        if (abi == AUDIT_ARCH_SPARC)
                return sparc32_classify_syscall(syscall);
 #endif
@@ -61,11 +62,6 @@ int audit_classify_syscall(int abi, unsigned syscall)
 static int __init audit_classes_init(void)
 {
 #ifdef CONFIG_COMPAT
-        extern __u32 sparc32_dir_class[];
-        extern __u32 sparc32_write_class[];
-        extern __u32 sparc32_read_class[];
-        extern __u32 sparc32_chattr_class[];
-        extern __u32 sparc32_signal_class[];
        audit_register_class(AUDIT_CLASS_WRITE_32, sparc32_write_class);
        audit_register_class(AUDIT_CLASS_READ_32, sparc32_read_class);
        audit_register_class(AUDIT_CLASS_DIR_WRITE_32, sparc32_dir_class);
diff --git a/arch/sparc/kernel/auxio_32.c b/arch/sparc/kernel/auxio_32.c
index e20cc55fb768..ae88c223e4d3 100644
--- a/arch/sparc/kernel/auxio_32.c
+++ b/arch/sparc/kernel/auxio_32.c
@@ -9,12 +9,15 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/export.h>
 #include <asm/oplib.h>
 #include <asm/io.h>
 #include <asm/auxio.h>
 #include <asm/string.h>         /* memset(), Linux has no bzero() */
 #include <asm/cpu_type.h>
+#include "kernel.h"
 /* Probe and map in the Auxiliary I/O register */
 /* auxio_register is not static because it is referenced 
@@ -103,7 +106,7 @@ EXPORT_SYMBOL(set_auxio);
 /* sun4m power control register (AUXIO2) */
-volatile unsigned char * auxio_power_register = NULL;
+volatile u8 __iomem *auxio_power_register = NULL;
 void __init auxio_power_probe(void)
 {
@@ -127,8 +130,8 @@ void __init auxio_power_probe(void)
        r.flags = regs.which_io & 0xF;
        r.start = regs.phys_addr;
        r.end = regs.phys_addr + regs.reg_size - 1;
-        auxio_power_register = (unsigned char *) of_ioremap(&r, 0,
+        auxio_power_register =
-            regs.reg_size, "auxpower");
+                (u8 __iomem *)of_ioremap(&r, 0, regs.reg_size, "auxpower");
        /* Display a quick message on the console. */
        if (auxio_power_register)
diff --git a/arch/sparc/kernel/btext.c b/arch/sparc/kernel/btext.c
index 57073e56ba9e..987f7ec497cc 100644
--- a/arch/sparc/kernel/btext.c
+++ b/arch/sparc/kernel/btext.c
@@ -137,7 +137,7 @@ static void scrollscreen(void)
 }
 #endif /* ndef NO_SCROLL */
-void btext_drawchar(char c)
+static void btext_drawchar(char c)
 {
        int cline = 0;
 #ifdef NO_SCROLL
diff --git a/arch/sparc/kernel/compat_audit.c b/arch/sparc/kernel/compat_audit.c
index d865575b25bf..7062263d09c1 100644
--- a/arch/sparc/kernel/compat_audit.c
+++ b/arch/sparc/kernel/compat_audit.c
@@ -1,5 +1,6 @@
 #define __32bit_syscall_numbers__
 #include <asm/unistd.h>
+#include "kernel.h"
 unsigned sparc32_dir_class[] = {
 #include <asm-generic/audit_dir_write.h>
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index 5c5125895db8..82a3a71c451e 100644
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
@@ -22,6 +22,7 @@
 #include <asm/cpudata.h>
 #include "kernel.h"
+#include "entry.h"
 DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 };
 EXPORT_PER_CPU_SYMBOL(__cpu_data);
diff --git a/arch/sparc/kernel/cpumap.h b/arch/sparc/kernel/cpumap.h
index e639880ab864..9dac398c434a 100644
--- a/arch/sparc/kernel/cpumap.h
+++ b/arch/sparc/kernel/cpumap.h
@@ -2,8 +2,8 @@
 #define _CPUMAP_H
 #ifdef CONFIG_SMP
-extern void cpu_map_rebuild(void);
+void cpu_map_rebuild(void);
-extern int  map_to_cpu(unsigned int index);
+int map_to_cpu(unsigned int index);
 #define cpu_map_init() cpu_map_rebuild()
 #else
 #define cpu_map_init() do {} while (0)
diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c
index 3d465e87f7e2..8d5d09f09caf 100644
--- a/arch/sparc/kernel/devices.c
+++ b/arch/sparc/kernel/devices.c
@@ -19,8 +19,9 @@
 #include <asm/smp.h>
 #include <asm/cpudata.h>
 #include <asm/cpu_type.h>
+#include <asm/setup.h>
-extern void clock_stop_probe(void); /* tadpole.c */
+#include "kernel.h"
 static char *cpu_mid_prop(void)
 {
@@ -131,11 +132,6 @@ void __init device_scan(void)
        }
 #endif /* !CONFIG_SMP */
-        {
+        auxio_probe();
-                extern void auxio_probe(void);
+        auxio_power_probe();
-                extern void auxio_power_probe(void);
-                auxio_probe();
-                auxio_power_probe();
-        }
-        clock_stop_probe();
 }
diff --git a/arch/sparc/kernel/entry.h b/arch/sparc/kernel/entry.h
index 140966fbd303..ebaba6167dd4 100644
--- a/arch/sparc/kernel/entry.h
+++ b/arch/sparc/kernel/entry.h
@@ -6,40 +6,39 @@
 #include <linux/init.h>
 /* irq */
-extern void handler_irq(int irq, struct pt_regs *regs);
+void handler_irq(int irq, struct pt_regs *regs);
 #ifdef CONFIG_SPARC32
 /* traps */
-extern void do_hw_interrupt(struct pt_regs *regs, unsigned long type);
+void do_hw_interrupt(struct pt_regs *regs, unsigned long type);
-extern void do_illegal_instruction(struct pt_regs *regs, unsigned long pc,
+void do_illegal_instruction(struct pt_regs *regs, unsigned long pc,
-                                   unsigned long npc, unsigned long psr);
+                            unsigned long npc, unsigned long psr);
-extern void do_priv_instruction(struct pt_regs *regs, unsigned long pc,
+void do_priv_instruction(struct pt_regs *regs, unsigned long pc,
-                                unsigned long npc, unsigned long psr);
+                         unsigned long npc, unsigned long psr);
-extern void do_memaccess_unaligned(struct pt_regs *regs, unsigned long pc,
+void do_memaccess_unaligned(struct pt_regs *regs, unsigned long pc,
-                                   unsigned long npc,
+                            unsigned long npc, unsigned long psr);
-                                   unsigned long psr);
+void do_fpd_trap(struct pt_regs *regs, unsigned long pc,
-extern void do_fpd_trap(struct pt_regs *regs, unsigned long pc,
+                 unsigned long npc, unsigned long psr);
+void do_fpe_trap(struct pt_regs *regs, unsigned long pc,
+                 unsigned long npc, unsigned long psr);
+void handle_tag_overflow(struct pt_regs *regs, unsigned long pc,
+                         unsigned long npc, unsigned long psr);
+void handle_watchpoint(struct pt_regs *regs, unsigned long pc,
+                       unsigned long npc, unsigned long psr);
+void handle_reg_access(struct pt_regs *regs, unsigned long pc,
+                       unsigned long npc, unsigned long psr);
+void handle_cp_disabled(struct pt_regs *regs, unsigned long pc,
                        unsigned long npc, unsigned long psr);
-extern void do_fpe_trap(struct pt_regs *regs, unsigned long pc,
+void handle_cp_exception(struct pt_regs *regs, unsigned long pc,
-                        unsigned long npc, unsigned long psr);
+                         unsigned long npc, unsigned long psr);
-extern void handle_tag_overflow(struct pt_regs *regs, unsigned long pc,
-                                unsigned long npc, unsigned long psr);
-extern void handle_watchpoint(struct pt_regs *regs, unsigned long pc,
-                              unsigned long npc, unsigned long psr);
-extern void handle_reg_access(struct pt_regs *regs, unsigned long pc,
-                              unsigned long npc, unsigned long psr);
-extern void handle_cp_disabled(struct pt_regs *regs, unsigned long pc,
-                               unsigned long npc, unsigned long psr);
-extern void handle_cp_exception(struct pt_regs *regs, unsigned long pc,
-                                unsigned long npc, unsigned long psr);
 /* entry.S */
-extern void fpsave(unsigned long *fpregs, unsigned long *fsr,
+void fpsave(unsigned long *fpregs, unsigned long *fsr,
-                   void *fpqueue, unsigned long *fpqdepth);
+            void *fpqueue, unsigned long *fpqdepth);
-extern void fpload(unsigned long *fpregs, unsigned long *fsr);
+void fpload(unsigned long *fpregs, unsigned long *fsr);
 #else /* CONFIG_SPARC32 */
@@ -66,123 +65,123 @@ struct pause_patch_entry {
 extern struct pause_patch_entry __pause_3insn_patch,
        __pause_3insn_patch_end;
-extern void __init per_cpu_patch(void);
+void __init per_cpu_patch(void);
-extern void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *,
+void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *,
-                                    struct sun4v_1insn_patch_entry *);
+                             struct sun4v_1insn_patch_entry *);
-extern void sun4v_patch_2insn_range(struct sun4v_2insn_patch_entry *,
+void sun4v_patch_2insn_range(struct sun4v_2insn_patch_entry *,
-                                    struct sun4v_2insn_patch_entry *);
+                             struct sun4v_2insn_patch_entry *);
-extern void __init sun4v_patch(void);
+void __init sun4v_patch(void);
-extern void __init boot_cpu_id_too_large(int cpu);
+void __init boot_cpu_id_too_large(int cpu);
 extern unsigned int dcache_parity_tl1_occurred;
 extern unsigned int icache_parity_tl1_occurred;
-extern asmlinkage void sparc_breakpoint(struct pt_regs *regs);
+asmlinkage void sparc_breakpoint(struct pt_regs *regs);
-extern void timer_interrupt(int irq, struct pt_regs *regs);
+void timer_interrupt(int irq, struct pt_regs *regs);
-extern void do_notify_resume(struct pt_regs *regs,
+void do_notify_resume(struct pt_regs *regs,
-                             unsigned long orig_i0,
+                      unsigned long orig_i0,
-                             unsigned long thread_info_flags);
+                      unsigned long thread_info_flags);
-extern asmlinkage int syscall_trace_enter(struct pt_regs *regs);
+asmlinkage int syscall_trace_enter(struct pt_regs *regs);
-extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);
+asmlinkage void syscall_trace_leave(struct pt_regs *regs);
-extern void bad_trap_tl1(struct pt_regs *regs, long lvl);
+void bad_trap_tl1(struct pt_regs *regs, long lvl);
-extern void do_fpieee(struct pt_regs *regs);
+void do_fpieee(struct pt_regs *regs);
-extern void do_fpother(struct pt_regs *regs);
+void do_fpother(struct pt_regs *regs);
-extern void do_tof(struct pt_regs *regs);
+void do_tof(struct pt_regs *regs);
-extern void do_div0(struct pt_regs *regs);
+void do_div0(struct pt_regs *regs);
-extern void do_illegal_instruction(struct pt_regs *regs);
+void do_illegal_instruction(struct pt_regs *regs);
-extern void mem_address_unaligned(struct pt_regs *regs,
+void mem_address_unaligned(struct pt_regs *regs,
-                                  unsigned long sfar,
+                           unsigned long sfar,
-                                  unsigned long sfsr);
+                           unsigned long sfsr);
-extern void sun4v_do_mna(struct pt_regs *regs,
+void sun4v_do_mna(struct pt_regs *regs,
-                         unsigned long addr,
+                  unsigned long addr,
-                         unsigned long type_ctx);
+                  unsigned long type_ctx);
-extern void do_privop(struct pt_regs *regs);
+void do_privop(struct pt_regs *regs);
-extern void do_privact(struct pt_regs *regs);
+void do_privact(struct pt_regs *regs);
-extern void do_cee(struct pt_regs *regs);
+void do_cee(struct pt_regs *regs);
-extern void do_cee_tl1(struct pt_regs *regs);
+void do_cee_tl1(struct pt_regs *regs);
-extern void do_dae_tl1(struct pt_regs *regs);
+void do_dae_tl1(struct pt_regs *regs);
-extern void do_iae_tl1(struct pt_regs *regs);
+void do_iae_tl1(struct pt_regs *regs);
-extern void do_div0_tl1(struct pt_regs *regs);
+void do_div0_tl1(struct pt_regs *regs);
-extern void do_fpdis_tl1(struct pt_regs *regs);
+void do_fpdis_tl1(struct pt_regs *regs);
-extern void do_fpieee_tl1(struct pt_regs *regs);
+void do_fpieee_tl1(struct pt_regs *regs);
-extern void do_fpother_tl1(struct pt_regs *regs);
+void do_fpother_tl1(struct pt_regs *regs);
-extern void do_ill_tl1(struct pt_regs *regs);
+void do_ill_tl1(struct pt_regs *regs);
-extern void do_irq_tl1(struct pt_regs *regs);
+void do_irq_tl1(struct pt_regs *regs);
-extern void do_lddfmna_tl1(struct pt_regs *regs);
+void do_lddfmna_tl1(struct pt_regs *regs);
-extern void do_stdfmna_tl1(struct pt_regs *regs);
+void do_stdfmna_tl1(struct pt_regs *regs);
-extern void do_paw(struct pt_regs *regs);
+void do_paw(struct pt_regs *regs);
-extern void do_paw_tl1(struct pt_regs *regs);
+void do_paw_tl1(struct pt_regs *regs);
-extern void do_vaw(struct pt_regs *regs);
+void do_vaw(struct pt_regs *regs);
-extern void do_vaw_tl1(struct pt_regs *regs);
+void do_vaw_tl1(struct pt_regs *regs);
-extern void do_tof_tl1(struct pt_regs *regs);
+void do_tof_tl1(struct pt_regs *regs);
-extern void do_getpsr(struct pt_regs *regs);
+void do_getpsr(struct pt_regs *regs);
-extern void spitfire_insn_access_exception(struct pt_regs *regs,
+void spitfire_insn_access_exception(struct pt_regs *regs,
-                                           unsigned long sfsr,
+                                    unsigned long sfsr,
-                                           unsigned long sfar);
+                                    unsigned long sfar);
-extern void spitfire_insn_access_exception_tl1(struct pt_regs *regs,
+void spitfire_insn_access_exception_tl1(struct pt_regs *regs,
-                                               unsigned long sfsr,
+                                        unsigned long sfsr,
-                                               unsigned long sfar);
+                                        unsigned long sfar);
-extern void spitfire_data_access_exception(struct pt_regs *regs,
+void spitfire_data_access_exception(struct pt_regs *regs,
-                                           unsigned long sfsr,
+                                    unsigned long sfsr,
-                                           unsigned long sfar);
+                                    unsigned long sfar);
-extern void spitfire_data_access_exception_tl1(struct pt_regs *regs,
+void spitfire_data_access_exception_tl1(struct pt_regs *regs,
-                                               unsigned long sfsr,
+                                        unsigned long sfsr,
-                                               unsigned long sfar);
+                                        unsigned long sfar);
-extern void spitfire_access_error(struct pt_regs *regs,
+void spitfire_access_error(struct pt_regs *regs,
-                                  unsigned long status_encoded,
+                           unsigned long status_encoded,
-                                  unsigned long afar);
+                           unsigned long afar);
-extern void cheetah_fecc_handler(struct pt_regs *regs,
+void cheetah_fecc_handler(struct pt_regs *regs,
-                                 unsigned long afsr,
+                          unsigned long afsr,
-                                 unsigned long afar);
+                          unsigned long afar);
-extern void cheetah_cee_handler(struct pt_regs *regs,
+void cheetah_cee_handler(struct pt_regs *regs,
-                                unsigned long afsr,
+                         unsigned long afsr,
-                                unsigned long afar);
+                         unsigned long afar);
-extern void cheetah_deferred_handler(struct pt_regs *regs,
+void cheetah_deferred_handler(struct pt_regs *regs,
-                                     unsigned long afsr,
+                              unsigned long afsr,
-                                     unsigned long afar);
+                              unsigned long afar);
-extern void cheetah_plus_parity_error(int type, struct pt_regs *regs);
+void cheetah_plus_parity_error(int type, struct pt_regs *regs);
-extern void sun4v_insn_access_exception(struct pt_regs *regs,
+void sun4v_insn_access_exception(struct pt_regs *regs,
-                                        unsigned long addr,
+                                 unsigned long addr,
-                                        unsigned long type_ctx);
+                                 unsigned long type_ctx);
-extern void sun4v_insn_access_exception_tl1(struct pt_regs *regs,
+void sun4v_insn_access_exception_tl1(struct pt_regs *regs,
-                                            unsigned long addr,
+                                     unsigned long addr,
-                                            unsigned long type_ctx);
+                                     unsigned long type_ctx);
-extern void sun4v_data_access_exception(struct pt_regs *regs,
+void sun4v_data_access_exception(struct pt_regs *regs,
-                                        unsigned long addr,
+                                 unsigned long addr,
-                                        unsigned long type_ctx);
+                                 unsigned long type_ctx);
-extern void sun4v_data_access_exception_tl1(struct pt_regs *regs,
+void sun4v_data_access_exception_tl1(struct pt_regs *regs,
-                                            unsigned long addr,
+                                     unsigned long addr,
-                                            unsigned long type_ctx);
+                                     unsigned long type_ctx);
-extern void sun4v_resum_error(struct pt_regs *regs,
+void sun4v_resum_error(struct pt_regs *regs,
-                              unsigned long offset);
+                       unsigned long offset);
-extern void sun4v_resum_overflow(struct pt_regs *regs);
+void sun4v_resum_overflow(struct pt_regs *regs);
-extern void sun4v_nonresum_error(struct pt_regs *regs,
+void sun4v_nonresum_error(struct pt_regs *regs,
-                                 unsigned long offset);
+                          unsigned long offset);
-extern void sun4v_nonresum_overflow(struct pt_regs *regs);
+void sun4v_nonresum_overflow(struct pt_regs *regs);
 extern unsigned long sun4v_err_itlb_vaddr;
 extern unsigned long sun4v_err_itlb_ctx;
 extern unsigned long sun4v_err_itlb_pte;
 extern unsigned long sun4v_err_itlb_error;
-extern void sun4v_itlb_error_report(struct pt_regs *regs, int tl);
+void sun4v_itlb_error_report(struct pt_regs *regs, int tl);
 extern unsigned long sun4v_err_dtlb_vaddr;
 extern unsigned long sun4v_err_dtlb_ctx;
 extern unsigned long sun4v_err_dtlb_pte;
 extern unsigned long sun4v_err_dtlb_error;
-extern void sun4v_dtlb_error_report(struct pt_regs *regs, int tl);
+void sun4v_dtlb_error_report(struct pt_regs *regs, int tl);
-extern void hypervisor_tlbop_error(unsigned long err,
+void hypervisor_tlbop_error(unsigned long err,
-                                   unsigned long op);
+                            unsigned long op);
-extern void hypervisor_tlbop_error_xcall(unsigned long err,
+void hypervisor_tlbop_error_xcall(unsigned long err,
-                                         unsigned long op);
+                                  unsigned long op);
 /* WARNING: The error trap handlers in assembly know the precise
 *          layout of the following structure.
@@ -248,8 +247,8 @@ struct ino_bucket {
 extern struct ino_bucket *ivector_table;
 extern unsigned long ivector_table_pa;
-extern void init_irqwork_curcpu(void);
+void init_irqwork_curcpu(void);
-extern void sun4v_register_mondo_queues(int this_cpu);
+void sun4v_register_mondo_queues(int this_cpu);
 #endif /* CONFIG_SPARC32 */
 #endif /* _ENTRY_H */
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
index 76663b019eb5..bfa4d0c2df42 100644
--- a/arch/sparc/kernel/iommu.c
+++ b/arch/sparc/kernel/iommu.c
@@ -21,6 +21,7 @@
 #include <asm/iommu.h>
 #include "iommu_common.h"
+#include "kernel.h"
 #define STC_CTXMATCH_ADDR(STC, CTX)     \
        ((STC)->strbuf_ctxmatch_base + ((CTX) << 3))
@@ -840,8 +841,6 @@ static struct dma_map_ops sun4u_dma_ops = {
 struct dma_map_ops *dma_ops = &sun4u_dma_ops;
 EXPORT_SYMBOL(dma_ops);
-extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
 int dma_supported(struct device *dev, u64 device_mask)
 {
        struct iommu *iommu = dev->archdata.iommu;
diff --git a/arch/sparc/kernel/iommu_common.h b/arch/sparc/kernel/iommu_common.h
index 591f5879039c..1ec0de4156e7 100644
--- a/arch/sparc/kernel/iommu_common.h
+++ b/arch/sparc/kernel/iommu_common.h
@@ -48,12 +48,12 @@ static inline int is_span_boundary(unsigned long entry,
        return iommu_is_span_boundary(entry, nr, shift, boundary_size);
 }
-extern unsigned long iommu_range_alloc(struct device *dev,
+unsigned long iommu_range_alloc(struct device *dev,
-                                       struct iommu *iommu,
+                                struct iommu *iommu,
-                                       unsigned long npages,
+                                unsigned long npages,
-                                       unsigned long *handle);
+                                unsigned long *handle);
-extern void iommu_range_free(struct iommu *iommu,
+void iommu_range_free(struct iommu *iommu,
-                             dma_addr_t dma_addr,
+                      dma_addr_t dma_addr,
-                             unsigned long npages);
+                      unsigned long npages);
 #endif /* _IOMMU_COMMON_H */
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index e7e215dfa866..7f08ec8a7c68 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -186,7 +186,7 @@ static void __iomem *_sparc_alloc_io(unsigned int busno, unsigned long phys,
        if (name == NULL) name = "???";
-        if ((xres = xres_alloc()) != 0) {
+        if ((xres = xres_alloc()) != NULL) {
                tack = xres->xname;
                res = &xres->xres;
        } else {
@@ -400,7 +400,7 @@ static void sbus_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
        BUG();
 }
-struct dma_map_ops sbus_dma_ops = {
+static struct dma_map_ops sbus_dma_ops = {
        .alloc                  = sbus_alloc_coherent,
        .free                   = sbus_free_coherent,
        .map_page               = sbus_map_page,
@@ -681,7 +681,7 @@ static int sparc_io_proc_show(struct seq_file *m, void *v)
        const char *nm;
        for (r = root->child; r != NULL; r = r->sibling) {
-                if ((nm = r->name) == 0) nm = "???";
+                if ((nm = r->name) == NULL) nm = "???";
                seq_printf(m, "%016llx-%016llx: %s\n",
                                (unsigned long long)r->start,
                                (unsigned long long)r->end, nm);
diff --git a/arch/sparc/kernel/irq.h b/arch/sparc/kernel/irq.h
index b66b6aad1d6d..70a0b8ddd0ba 100644
--- a/arch/sparc/kernel/irq.h
+++ b/arch/sparc/kernel/irq.h
@@ -82,11 +82,20 @@ void handler_irq(unsigned int pil, struct pt_regs *regs);
 unsigned long leon_get_irqmask(unsigned int irq);
+/* irq_32.c */
+void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs);
+/* sun4m_irq.c */
+void sun4m_nmi(struct pt_regs *regs);
+/* sun4d_irq.c */
+void sun4d_handler_irq(unsigned int pil, struct pt_regs *regs);
 #ifdef CONFIG_SMP
 /* All SUN4D IPIs are sent on this IRQ, may be shared with hard IRQs */
 #define SUN4D_IPI_IRQ 13
-extern void sun4d_ipi_interrupt(void);
+void sun4d_ipi_interrupt(void);
 #endif
diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c
index c145f6fd123b..a979e99f8751 100644
--- a/arch/sparc/kernel/irq_32.c
+++ b/arch/sparc/kernel/irq_32.c
@@ -17,6 +17,7 @@
 #include <asm/cacheflush.h>
 #include <asm/cpudata.h>
+#include <asm/setup.h>
 #include <asm/pcic.h>
 #include <asm/leon.h>
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h
index a702d9ab019c..e7f652be9e61 100644
--- a/arch/sparc/kernel/kernel.h
+++ b/arch/sparc/kernel/kernel.h
@@ -2,6 +2,7 @@
 #define __SPARC_KERNEL_H
 #include <linux/interrupt.h>
+#include <linux/ftrace.h>
 #include <asm/traps.h>
 #include <asm/head.h>
@@ -15,62 +16,111 @@ extern int ncpus_probed;
 #ifdef CONFIG_SPARC64
 /* setup_64.c */
 struct seq_file;
-extern void cpucap_info(struct seq_file *);
+void cpucap_info(struct seq_file *);
-static inline unsigned long kimage_addr_to_ra(const char *p)
+static inline unsigned long kimage_addr_to_ra(const void *p)
 {
        unsigned long val = (unsigned long) p;
        return kern_base + (val - KERNBASE);
 }
+/* sys_sparc_64.c */
+asmlinkage long sys_kern_features(void);
+/* unaligned_64.c */
+asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn);
+int handle_popc(u32 insn, struct pt_regs *regs);
+void handle_lddfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr);
+void handle_stdfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr);
+/* smp_64.c */
+void __irq_entry smp_call_function_client(int irq, struct pt_regs *regs);
+void __irq_entry smp_call_function_single_client(int irq, struct pt_regs *regs);
+void __irq_entry smp_new_mmu_context_version_client(int irq, struct pt_regs *regs);
+void __irq_entry smp_penguin_jailcell(int irq, struct pt_regs *regs);
+void __irq_entry smp_receive_signal_client(int irq, struct pt_regs *regs);
+/* kgdb_64.c */
+void __irq_entry smp_kgdb_capture_client(int irq, struct pt_regs *regs);
+/* pci.c */
+int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
+/* signal32.c */
+void do_sigreturn32(struct pt_regs *regs);
+asmlinkage void do_rt_sigreturn32(struct pt_regs *regs);
+void do_signal32(struct pt_regs * regs);
+asmlinkage int do_sys32_sigstack(u32 u_ssptr, u32 u_ossptr, unsigned long sp);
+/* compat_audit.c */
+extern unsigned sparc32_dir_class[];
+extern unsigned sparc32_chattr_class[];
+extern unsigned sparc32_write_class[];
+extern unsigned sparc32_read_class[];
+extern unsigned sparc32_signal_class[];
+int sparc32_classify_syscall(unsigned syscall);
 #endif
 #ifdef CONFIG_SPARC32
 /* setup_32.c */
+struct linux_romvec;
 void sparc32_start_kernel(struct linux_romvec *rp);
 /* cpu.c */
-extern void cpu_probe(void);
+void cpu_probe(void);
 /* traps_32.c */
-extern void handle_hw_divzero(struct pt_regs *regs, unsigned long pc,
+void handle_hw_divzero(struct pt_regs *regs, unsigned long pc,
-                              unsigned long npc, unsigned long psr);
+                       unsigned long npc, unsigned long psr);
 /* irq_32.c */
 extern struct irqaction static_irqaction[];
 extern int static_irq_count;
 extern spinlock_t irq_action_lock;
-extern void unexpected_irq(int irq, void *dev_id, struct pt_regs * regs);
+void unexpected_irq(int irq, void *dev_id, struct pt_regs * regs);
-extern void init_IRQ(void);
+void init_IRQ(void);
 /* sun4m_irq.c */
-extern void sun4m_init_IRQ(void);
+void sun4m_init_IRQ(void);
-extern void sun4m_unmask_profile_irq(void);
+void sun4m_unmask_profile_irq(void);
-extern void sun4m_clear_profile_irq(int cpu);
+void sun4m_clear_profile_irq(int cpu);
 /* sun4m_smp.c */
 void sun4m_cpu_pre_starting(void *arg);
 void sun4m_cpu_pre_online(void *arg);
+void __init smp4m_boot_cpus(void);
+int smp4m_boot_one_cpu(int i, struct task_struct *idle);
+void __init smp4m_smp_done(void);
+void smp4m_cross_call_irq(void);
+void smp4m_percpu_timer_interrupt(struct pt_regs *regs);
 /* sun4d_irq.c */
 extern spinlock_t sun4d_imsk_lock;
-extern void sun4d_init_IRQ(void);
+void sun4d_init_IRQ(void);
-extern int sun4d_request_irq(unsigned int irq,
+int sun4d_request_irq(unsigned int irq,
-                             irq_handler_t handler,
+                      irq_handler_t handler,
-                             unsigned long irqflags,
+                      unsigned long irqflags,
-                             const char *devname, void *dev_id);
+                      const char *devname, void *dev_id);
-extern int show_sun4d_interrupts(struct seq_file *, void *);
+int show_sun4d_interrupts(struct seq_file *, void *);
-extern void sun4d_distribute_irqs(void);
+void sun4d_distribute_irqs(void);
-extern void sun4d_free_irq(unsigned int irq, void *dev_id);
+void sun4d_free_irq(unsigned int irq, void *dev_id);
 /* sun4d_smp.c */
 void sun4d_cpu_pre_starting(void *arg);
 void sun4d_cpu_pre_online(void *arg);
+void __init smp4d_boot_cpus(void);
+int smp4d_boot_one_cpu(int i, struct task_struct *idle);
+void __init smp4d_smp_done(void);
+void smp4d_cross_call_irq(void);
+void smp4d_percpu_timer_interrupt(struct pt_regs *regs);
 /* leon_smp.c */
 void leon_cpu_pre_starting(void *arg);
 void leon_cpu_pre_online(void *arg);
+void leonsmp_ipi_interrupt(void);
+void leon_cross_call_irq(void);
 /* head_32.S */
 extern unsigned int t_nmi[];
@@ -89,12 +139,48 @@ extern unsigned int real_irq_entry[];
 extern unsigned int smp4d_ticker[];
 extern unsigned int patchme_maybe_smp_msg[];
-extern void floppy_hardint(void);
+void floppy_hardint(void);
 /* trampoline_32.S */
 extern unsigned long sun4m_cpu_startup;
 extern unsigned long sun4d_cpu_startup;
+/* process_32.c */
+asmlinkage int sparc_do_fork(unsigned long clone_flags,
+                             unsigned long stack_start,
+                             struct pt_regs *regs,
+                             unsigned long stack_size);
+/* signal_32.c */
+asmlinkage void do_sigreturn(struct pt_regs *regs);
+asmlinkage void do_rt_sigreturn(struct pt_regs *regs);
+void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0,
+                      unsigned long thread_info_flags);
+asmlinkage int do_sys_sigstack(struct sigstack __user *ssptr,
+                               struct sigstack __user *ossptr,
+                               unsigned long sp);
+/* ptrace_32.c */
+asmlinkage int syscall_trace(struct pt_regs *regs, int syscall_exit_p);
+/* unaligned_32.c */
+asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn);
+asmlinkage void user_unaligned_trap(struct pt_regs *regs, unsigned int insn);
+/* windows.c */
+void try_to_clear_window_buffer(struct pt_regs *regs, int who);
+/* auxio_32.c */
+void __init auxio_probe(void);
+void __init auxio_power_probe(void);
+/* pcic.c */
+extern void __iomem *pcic_regs;
+void pcic_nmi(unsigned int pend, struct pt_regs *regs);
+/* time_32.c */
+void __init time_init(void);
 #else /* CONFIG_SPARC32 */
 #endif /* CONFIG_SPARC32 */
 #endif /* !(__SPARC_KERNEL_H) */
diff --git a/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c
index b45fe3fb4d2c..cbf21d0870e0 100644
--- a/arch/sparc/kernel/kgdb_64.c
+++ b/arch/sparc/kernel/kgdb_64.c
@@ -13,6 +13,8 @@
 #include <asm/ptrace.h>
 #include <asm/irq.h>
+#include "kernel.h"
 void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
 {
        struct reg_window *win;
diff --git a/arch/sparc/kernel/kprobes.c b/arch/sparc/kernel/kprobes.c
index 1b0973503197..98d712843413 100644
--- a/arch/sparc/kernel/kprobes.c
+++ b/arch/sparc/kernel/kprobes.c
@@ -512,7 +512,8 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
 /*
 * Called when the probe at kretprobe trampoline is hit
 */
-int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
+static int __kprobes trampoline_probe_handler(struct kprobe *p,
+                                              struct pt_regs *regs)
 {
        struct kretprobe_instance *ri = NULL;
        struct hlist_head *head, empty_rp;
@@ -576,7 +577,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
        return 1;
 }
-void kretprobe_trampoline_holder(void)
+static void __used kretprobe_trampoline_holder(void)
 {
        asm volatile(".global kretprobe_trampoline\n"
                     "kretprobe_trampoline:\n"
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
index b7c68976cbc7..683c4af999de 100644
--- a/arch/sparc/kernel/leon_kernel.c
+++ b/arch/sparc/kernel/leon_kernel.c
@@ -32,12 +32,12 @@ struct leon3_gptimer_regs_map *leon3_gptimer_regs; /* timer controller base addr
 int leondebug_irq_disable;
 int leon_debug_irqout;
-static int dummy_master_l10_counter;
+static volatile u32 dummy_master_l10_counter;
 unsigned long amba_system_id;
 static DEFINE_SPINLOCK(leon_irq_lock);
+static unsigned long leon3_gptimer_idx; /* Timer Index (0..6) within Timer Core */
 unsigned long leon3_gptimer_irq; /* interrupt controller irq number */
-unsigned long leon3_gptimer_idx; /* Timer Index (0..6) within Timer Core */
 unsigned int sparc_leon_eirq;
 #define LEON_IMASK(cpu) (&leon3_irqctrl_regs->mask[cpu])
 #define LEON_IACK (&leon3_irqctrl_regs->iclear)
@@ -65,7 +65,7 @@ static void leon_handle_ext_irq(unsigned int irq, struct irq_desc *desc)
 }
 /* The extended IRQ controller has been found, this function registers it */
-void leon_eirq_setup(unsigned int eirq)
+static void leon_eirq_setup(unsigned int eirq)
 {
        unsigned long mask, oldmask;
        unsigned int veirq;
@@ -270,7 +270,7 @@ static u32 leon_cycles_offset(void)
 #ifdef CONFIG_SMP
 /* smp clockevent irq */
-irqreturn_t leon_percpu_timer_ce_interrupt(int irq, void *unused)
+static irqreturn_t leon_percpu_timer_ce_interrupt(int irq, void *unused)
 {
        struct clock_event_device *ce;
        int cpu = smp_processor_id();
@@ -313,7 +313,7 @@ void __init leon_init_timers(void)
        leondebug_irq_disable = 0;
        leon_debug_irqout = 0;
-        master_l10_counter = (unsigned int *)&dummy_master_l10_counter;
+        master_l10_counter = (u32 __iomem *)&dummy_master_l10_counter;
        dummy_master_l10_counter = 0;
        rootnp = of_find_node_by_path("/ambapp0");
diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c
index e16c4157e1ae..899b7203a4e4 100644
--- a/arch/sparc/kernel/leon_pci.c
+++ b/arch/sparc/kernel/leon_pci.c
@@ -98,82 +98,3 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
 {
        return res->start;
 }
-/* in/out routines taken from pcic.c
- *
- * This probably belongs here rather than ioport.c because
- * we do not want this crud linked into SBus kernels.
- * Also, think for a moment about likes of floppy.c that
- * include architecture specific parts. They may want to redefine ins/outs.
- *
- * We do not use horrible macros here because we want to
- * advance pointer by sizeof(size).
- */
-void outsb(unsigned long addr, const void *src, unsigned long count)
-{
-        while (count) {
-                count -= 1;
-                outb(*(const char *)src, addr);
-                src += 1;
-                /* addr += 1; */
-        }
-}
-EXPORT_SYMBOL(outsb);
-void outsw(unsigned long addr, const void *src, unsigned long count)
-{
-        while (count) {
-                count -= 2;
-                outw(*(const short *)src, addr);
-                src += 2;
-                /* addr += 2; */
-        }
-}
-EXPORT_SYMBOL(outsw);
-void outsl(unsigned long addr, const void *src, unsigned long count)
-{
-        while (count) {
-                count -= 4;
-                outl(*(const long *)src, addr);
-                src += 4;
-                /* addr += 4; */
-        }
-}
-EXPORT_SYMBOL(outsl);
-void insb(unsigned long addr, void *dst, unsigned long count)
-{
-        while (count) {
-                count -= 1;
-                *(unsigned char *)dst = inb(addr);
-                dst += 1;
-                /* addr += 1; */
-        }
-}
-EXPORT_SYMBOL(insb);
-void insw(unsigned long addr, void *dst, unsigned long count)
-{
-        while (count) {
-                count -= 2;
-                *(unsigned short *)dst = inw(addr);
-                dst += 2;
-                /* addr += 2; */
-        }
-}
-EXPORT_SYMBOL(insw);
-void insl(unsigned long addr, void *dst, unsigned long count)
-{
-        while (count) {
-                count -= 4;
-                /*
-                 * XXX I am sure we are in for an unaligned trap here.
-                 */
-                *(unsigned long *)dst = inl(addr);
-                dst += 4;
-                /* addr += 4; */
-        }
-}
-EXPORT_SYMBOL(insl);
diff --git a/arch/sparc/kernel/leon_pci_grpci1.c b/arch/sparc/kernel/leon_pci_grpci1.c
index 6df26e37f879..c8bf26edfa7c 100644
--- a/arch/sparc/kernel/leon_pci_grpci1.c
+++ b/arch/sparc/kernel/leon_pci_grpci1.c
@@ -80,7 +80,7 @@ struct grpci1_regs {
 struct grpci1_priv {
        struct leon_pci_info    info; /* must be on top of this structure */
-        struct grpci1_regs      *regs;          /* GRPCI register map */
+        struct grpci1_regs __iomem *regs;               /* GRPCI register map */
        struct device           *dev;
        int                     pci_err_mask;   /* STATUS register error mask */
        int                     irq;            /* LEON irqctrl GRPCI IRQ */
@@ -101,7 +101,7 @@ static struct grpci1_priv *grpci1priv;
 static int grpci1_cfg_w32(struct grpci1_priv *priv, unsigned int bus,
                                unsigned int devfn, int where, u32 val);
-int grpci1_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+static int grpci1_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        struct grpci1_priv *priv = dev->bus->sysdata;
        int irq_group;
@@ -144,7 +144,7 @@ static int grpci1_cfg_r32(struct grpci1_priv *priv, unsigned int bus,
                grpci1_cfg_w32(priv, TGT, 0, PCI_COMMAND, tmp);
        } else {
                /* Bus always little endian (unaffected by byte-swapping) */
-                *val = flip_dword(tmp);
+                *val = swab32(tmp);
        }
        return 0;
@@ -197,7 +197,7 @@ static int grpci1_cfg_w32(struct grpci1_priv *priv, unsigned int bus,
        pci_conf = (unsigned int *) (priv->pci_conf |
                                                (devfn << 8) | (where & 0xfc));
-        LEON3_BYPASS_STORE_PA(pci_conf, flip_dword(val));
+        LEON3_BYPASS_STORE_PA(pci_conf, swab32(val));
        return 0;
 }
@@ -417,10 +417,10 @@ out:
 *  BAR1: peripheral DMA to host's memory (size at least 256MByte)
 *  BAR2..BAR5: not implemented in hardware
 */
-void grpci1_hw_init(struct grpci1_priv *priv)
+static void grpci1_hw_init(struct grpci1_priv *priv)
 {
        u32 ahbadr, bar_sz, data, pciadr;
-        struct grpci1_regs *regs = priv->regs;
+        struct grpci1_regs __iomem *regs = priv->regs;
        /* set 1:1 mapping between AHB -> PCI memory space */
        REGSTORE(regs->cfg_stat, priv->pci_area & 0xf0000000);
@@ -509,7 +509,7 @@ static irqreturn_t grpci1_err_interrupt(int irq, void *arg)
 static int grpci1_of_probe(struct platform_device *ofdev)
 {
-        struct grpci1_regs *regs;
+        struct grpci1_regs __iomem *regs;
        struct grpci1_priv *priv;
        int err, len;
        const int *tmp;
@@ -690,7 +690,7 @@ err3:
 err2:
        release_resource(&priv->info.mem_space);
 err1:
-        iounmap((void *)priv->pci_io_va);
+        iounmap((void __iomem *)priv->pci_io_va);
        grpci1priv = NULL;
        return err;
 }
diff --git a/arch/sparc/kernel/leon_pci_grpci2.c b/arch/sparc/kernel/leon_pci_grpci2.c
index 24d6a4446349..e433a4d69fe0 100644
--- a/arch/sparc/kernel/leon_pci_grpci2.c
+++ b/arch/sparc/kernel/leon_pci_grpci2.c
@@ -191,7 +191,7 @@ struct grpci2_cap_first {
 struct grpci2_priv {
        struct leon_pci_info    info; /* must be on top of this structure */
-        struct grpci2_regs      *regs;
+        struct grpci2_regs __iomem *regs;
        char                    irq;
        char                    irq_mode; /* IRQ Mode from CAPSTS REG */
        char                    bt_enabled;
@@ -215,10 +215,10 @@ struct grpci2_priv {
        struct grpci2_barcfg    tgtbars[6];
 };
-DEFINE_SPINLOCK(grpci2_dev_lock);
+static DEFINE_SPINLOCK(grpci2_dev_lock);
-struct grpci2_priv *grpci2priv;
+static struct grpci2_priv *grpci2priv;
-int grpci2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+static int grpci2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        struct grpci2_priv *priv = dev->bus->sysdata;
        int irq_group;
@@ -270,7 +270,7 @@ static int grpci2_cfg_r32(struct grpci2_priv *priv, unsigned int bus,
                *val = 0xffffffff;
        } else {
                /* Bus always little endian (unaffected by byte-swapping) */
-                *val = flip_dword(tmp);
+                *val = swab32(tmp);
        }
        return 0;
@@ -328,7 +328,7 @@ static int grpci2_cfg_w32(struct grpci2_priv *priv, unsigned int bus,
        pci_conf = (unsigned int *) (priv->pci_conf |
                                                (devfn << 8) | (where & 0xfc));
-        LEON3_BYPASS_STORE_PA(pci_conf, flip_dword(val));
+        LEON3_BYPASS_STORE_PA(pci_conf, swab32(val));
        /* Wait until GRPCI2 signals that CFG access is done, it should be
         * done instantaneously unless a DMA operation is ongoing...
@@ -561,10 +561,10 @@ out:
        return virq;
 }
-void grpci2_hw_init(struct grpci2_priv *priv)
+static void grpci2_hw_init(struct grpci2_priv *priv)
 {
        u32 ahbadr, pciadr, bar_sz, capptr, io_map, data;
-        struct grpci2_regs *regs = priv->regs;
+        struct grpci2_regs __iomem *regs = priv->regs;
        int i;
        struct grpci2_barcfg *barcfg = priv->tgtbars;
@@ -655,7 +655,7 @@ static irqreturn_t grpci2_jump_interrupt(int irq, void *arg)
 static irqreturn_t grpci2_err_interrupt(int irq, void *arg)
 {
        struct grpci2_priv *priv = arg;
-        struct grpci2_regs *regs = priv->regs;
+        struct grpci2_regs __iomem *regs = priv->regs;
        unsigned int status;
        status = REGLOAD(regs->sts_cap);
@@ -682,7 +682,7 @@ static irqreturn_t grpci2_err_interrupt(int irq, void *arg)
 static int grpci2_of_probe(struct platform_device *ofdev)
 {
-        struct grpci2_regs *regs;
+        struct grpci2_regs __iomem *regs;
        struct grpci2_priv *priv;
        int err, i, len;
        const int *tmp;
@@ -878,7 +878,7 @@ err4:
        release_resource(&priv->info.mem_space);
 err3:
        err = -ENOMEM;
-        iounmap((void *)priv->pci_io_va);
+        iounmap((void __iomem *)priv->pci_io_va);
 err2:
        kfree(priv);
 err1:
diff --git a/arch/sparc/kernel/leon_pmc.c b/arch/sparc/kernel/leon_pmc.c
index b0b3967a2dd2..ddcf950282ed 100644
--- a/arch/sparc/kernel/leon_pmc.c
+++ b/arch/sparc/kernel/leon_pmc.c
@@ -12,14 +12,14 @@
 #include <asm/processor.h>
 /* List of Systems that need fixup instructions around power-down instruction */
-unsigned int pmc_leon_fixup_ids[] = {
+static unsigned int pmc_leon_fixup_ids[] = {
        AEROFLEX_UT699,
        GAISLER_GR712RC,
        LEON4_NEXTREME1,
        0
 };
-int pmc_leon_need_fixup(void)
+static int pmc_leon_need_fixup(void)
 {
        unsigned int systemid = amba_system_id >> 16;
        unsigned int *id;
@@ -38,7 +38,7 @@ int pmc_leon_need_fixup(void)
 * CPU idle callback function for systems that need some extra handling
 * See .../arch/sparc/kernel/process.c
 */
-void pmc_leon_idle_fixup(void)
+static void pmc_leon_idle_fixup(void)
 {
        /* Prepare an address to a non-cachable region. APB is always
         * none-cachable. One instruction is executed after the Sleep
@@ -62,7 +62,7 @@ void pmc_leon_idle_fixup(void)
 * CPU idle callback function
 * See .../arch/sparc/kernel/process.c
 */
-void pmc_leon_idle(void)
+static void pmc_leon_idle(void)
 {
        /* Interrupts need to be enabled to not hang the CPU */
        local_irq_enable();
diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index 6edf955f987c..018ef11f57df 100644
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -130,7 +130,7 @@ void leon_configure_cache_smp(void)
        local_ops->tlb_all();
 }
-void leon_smp_setbroadcast(unsigned int mask)
+static void leon_smp_setbroadcast(unsigned int mask)
 {
        int broadcast =
            ((LEON3_BYPASS_LOAD_PA(&(leon3_irqctrl_regs->mpstatus)) >>
@@ -148,13 +148,6 @@ void leon_smp_setbroadcast(unsigned int mask)
        LEON_BYPASS_STORE_PA(&(leon3_irqctrl_regs->mpbroadcast), mask);
 }
-unsigned int leon_smp_getbroadcast(void)
-{
-        unsigned int mask;
-        mask = LEON_BYPASS_LOAD_PA(&(leon3_irqctrl_regs->mpbroadcast));
-        return mask;
-}
 int leon_smp_nrcpus(void)
 {
        int nrcpu =
@@ -266,10 +259,6 @@ void __init leon_smp_done(void)
 }
-void leon_irq_rotate(int cpu)
-{
-}
 struct leon_ipi_work {
        int single;
        int msk;
diff --git a/arch/sparc/kernel/of_device_common.c b/arch/sparc/kernel/of_device_common.c
index 3241f56331c2..de0ee3971f00 100644
--- a/arch/sparc/kernel/of_device_common.c
+++ b/arch/sparc/kernel/of_device_common.c
@@ -5,8 +5,10 @@
 #include <linux/mod_devicetable.h>
 #include <linux/errno.h>
 #include <linux/irq.h>
-#include <linux/of_device.h>
 #include <linux/of_platform.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include "of_device_common.h"
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 857ad77df9c0..539babf00bb2 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -28,6 +28,7 @@
 #include <asm/apb.h>
 #include "pci_impl.h"
+#include "kernel.h"
 /* List of all PCI controllers found in the system. */
 struct pci_pbm_info *pci_pbm_root = NULL;
diff --git a/arch/sparc/kernel/pci_impl.h b/arch/sparc/kernel/pci_impl.h
index 5f688531f48c..75803c780af3 100644
--- a/arch/sparc/kernel/pci_impl.h
+++ b/arch/sparc/kernel/pci_impl.h
@@ -48,8 +48,8 @@ struct sparc64_msiq_ops {
                              unsigned long devino);
 };
-extern void sparc64_pbm_msi_init(struct pci_pbm_info *pbm,
+void sparc64_pbm_msi_init(struct pci_pbm_info *pbm,
-                                 const struct sparc64_msiq_ops *ops);
+                          const struct sparc64_msiq_ops *ops);
 struct sparc64_msiq_cookie {
        struct pci_pbm_info *pbm;
@@ -158,23 +158,23 @@ extern struct pci_pbm_info *pci_pbm_root;
 extern int pci_num_pbms;
 /* PCI bus scanning and fixup support. */
-extern void pci_get_pbm_props(struct pci_pbm_info *pbm);
+void pci_get_pbm_props(struct pci_pbm_info *pbm);
-extern struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
+struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
-                                        struct device *parent);
+                                 struct device *parent);
-extern void pci_determine_mem_io_space(struct pci_pbm_info *pbm);
+void pci_determine_mem_io_space(struct pci_pbm_info *pbm);
 /* Error reporting support. */
-extern void pci_scan_for_target_abort(struct pci_pbm_info *, struct pci_bus *);
+void pci_scan_for_target_abort(struct pci_pbm_info *, struct pci_bus *);
-extern void pci_scan_for_master_abort(struct pci_pbm_info *, struct pci_bus *);
+void pci_scan_for_master_abort(struct pci_pbm_info *, struct pci_bus *);
-extern void pci_scan_for_parity_error(struct pci_pbm_info *, struct pci_bus *);
+void pci_scan_for_parity_error(struct pci_pbm_info *, struct pci_bus *);
 /* Configuration space access. */
-extern void pci_config_read8(u8 *addr, u8 *ret);
+void pci_config_read8(u8 *addr, u8 *ret);
-extern void pci_config_read16(u16 *addr, u16 *ret);
+void pci_config_read16(u16 *addr, u16 *ret);
-extern void pci_config_read32(u32 *addr, u32 *ret);
+void pci_config_read32(u32 *addr, u32 *ret);
-extern void pci_config_write8(u8 *addr, u8 val);
+void pci_config_write8(u8 *addr, u8 val);
-extern void pci_config_write16(u16 *addr, u16 val);
+void pci_config_write16(u16 *addr, u16 val);
-extern void pci_config_write32(u32 *addr, u32 val);
+void pci_config_write32(u32 *addr, u32 val);
 extern struct pci_ops sun4u_pci_ops;
 extern struct pci_ops sun4v_pci_ops;
diff --git a/arch/sparc/kernel/pci_sun4v.h b/arch/sparc/kernel/pci_sun4v.h
index 8e9fc3a5b4f5..5642212390b2 100644
--- a/arch/sparc/kernel/pci_sun4v.h
+++ b/arch/sparc/kernel/pci_sun4v.h
@@ -6,87 +6,87 @@
 #ifndef _PCI_SUN4V_H
 #define _PCI_SUN4V_H
-extern long pci_sun4v_iommu_map(unsigned long devhandle,
+long pci_sun4v_iommu_map(unsigned long devhandle,
-                                unsigned long tsbid,
+                         unsigned long tsbid,
-                                unsigned long num_ttes,
+                         unsigned long num_ttes,
-                                unsigned long io_attributes,
+                         unsigned long io_attributes,
-                                unsigned long io_page_list_pa);
+                         unsigned long io_page_list_pa);
-extern unsigned long pci_sun4v_iommu_demap(unsigned long devhandle,
+unsigned long pci_sun4v_iommu_demap(unsigned long devhandle,
-                                           unsigned long tsbid,
+                                    unsigned long tsbid,
-                                           unsigned long num_ttes);
+                                    unsigned long num_ttes);
-extern unsigned long pci_sun4v_iommu_getmap(unsigned long devhandle,
+unsigned long pci_sun4v_iommu_getmap(unsigned long devhandle,
-                                            unsigned long tsbid,
+                                     unsigned long tsbid,
-                                            unsigned long *io_attributes,
+                                     unsigned long *io_attributes,
-                                            unsigned long *real_address);
+                                     unsigned long *real_address);
-extern unsigned long pci_sun4v_config_get(unsigned long devhandle,
+unsigned long pci_sun4v_config_get(unsigned long devhandle,
-                                          unsigned long pci_device,
+                                   unsigned long pci_device,
-                                          unsigned long config_offset,
+                                   unsigned long config_offset,
-                                          unsigned long size);
+                                   unsigned long size);
-extern int pci_sun4v_config_put(unsigned long devhandle,
+int pci_sun4v_config_put(unsigned long devhandle,
-                                unsigned long pci_device,
+                         unsigned long pci_device,
-                                unsigned long config_offset,
+                         unsigned long config_offset,
-                                unsigned long size,
+                         unsigned long size,
-                                unsigned long data);
+                         unsigned long data);
-extern unsigned long pci_sun4v_msiq_conf(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_conf(unsigned long devhandle,
                                         unsigned long msiqid,
                                         unsigned long msiq_paddr,
                                         unsigned long num_entries);
-extern unsigned long pci_sun4v_msiq_info(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_info(unsigned long devhandle,
-                                         unsigned long msiqid,
+                                  unsigned long msiqid,
-                                         unsigned long *msiq_paddr,
+                                  unsigned long *msiq_paddr,
-                                         unsigned long *num_entries);
+                                  unsigned long *num_entries);
-extern unsigned long pci_sun4v_msiq_getvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_getvalid(unsigned long devhandle,
-                                             unsigned long msiqid,
+                                      unsigned long msiqid,
-                                             unsigned long *valid);
+                                      unsigned long *valid);
-extern unsigned long pci_sun4v_msiq_setvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_setvalid(unsigned long devhandle,
-                                             unsigned long msiqid,
+                                      unsigned long msiqid,
-                                             unsigned long valid);
+                                      unsigned long valid);
-extern unsigned long pci_sun4v_msiq_getstate(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_getstate(unsigned long devhandle,
-                                             unsigned long msiqid,
+                                      unsigned long msiqid,
-                                             unsigned long *state);
+                                      unsigned long *state);
-extern unsigned long pci_sun4v_msiq_setstate(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_setstate(unsigned long devhandle,
-                                             unsigned long msiqid,
+                                      unsigned long msiqid,
-                                             unsigned long state);
+                                      unsigned long state);
-extern unsigned long pci_sun4v_msiq_gethead(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_gethead(unsigned long devhandle,
-                                             unsigned long msiqid,
+                                     unsigned long msiqid,
-                                             unsigned long *head);
+                                     unsigned long *head);
-extern unsigned long pci_sun4v_msiq_sethead(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_sethead(unsigned long devhandle,
-                                             unsigned long msiqid,
+                                     unsigned long msiqid,
-                                             unsigned long head);
+                                     unsigned long head);
-extern unsigned long pci_sun4v_msiq_gettail(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_gettail(unsigned long devhandle,
-                                             unsigned long msiqid,
+                                      unsigned long msiqid,
-                                             unsigned long *head);
+                                      unsigned long *head);
-extern unsigned long pci_sun4v_msi_getvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msi_getvalid(unsigned long devhandle,
-                                            unsigned long msinum,
+                                     unsigned long msinum,
-                                            unsigned long *valid);
+                                     unsigned long *valid);
-extern unsigned long pci_sun4v_msi_setvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msi_setvalid(unsigned long devhandle,
-                                            unsigned long msinum,
+                                     unsigned long msinum,
-                                            unsigned long valid);
+                                     unsigned long valid);
-extern unsigned long pci_sun4v_msi_getmsiq(unsigned long devhandle,
+unsigned long pci_sun4v_msi_getmsiq(unsigned long devhandle,
-                                           unsigned long msinum,
+                                    unsigned long msinum,
-                                           unsigned long *msiq);
+                                    unsigned long *msiq);
-extern unsigned long pci_sun4v_msi_setmsiq(unsigned long devhandle,
+unsigned long pci_sun4v_msi_setmsiq(unsigned long devhandle,
-                                           unsigned long msinum,
+                                    unsigned long msinum,
-                                           unsigned long msiq,
+                                    unsigned long msiq,
-                                           unsigned long msitype);
+                                    unsigned long msitype);
-extern unsigned long pci_sun4v_msi_getstate(unsigned long devhandle,
+unsigned long pci_sun4v_msi_getstate(unsigned long devhandle,
-                                            unsigned long msinum,
+                                     unsigned long msinum,
-                                            unsigned long *state);
+                                     unsigned long *state);
-extern unsigned long pci_sun4v_msi_setstate(unsigned long devhandle,
+unsigned long pci_sun4v_msi_setstate(unsigned long devhandle,
-                                            unsigned long msinum,
+                                     unsigned long msinum,
-                                            unsigned long state);
+                                     unsigned long state);
-extern unsigned long pci_sun4v_msg_getmsiq(unsigned long devhandle,
+unsigned long pci_sun4v_msg_getmsiq(unsigned long devhandle,
-                                           unsigned long msinum,
+                                    unsigned long msinum,
-                                           unsigned long *msiq);
+                                    unsigned long *msiq);
-extern unsigned long pci_sun4v_msg_setmsiq(unsigned long devhandle,
+unsigned long pci_sun4v_msg_setmsiq(unsigned long devhandle,
-                                           unsigned long msinum,
+                                    unsigned long msinum,
-                                           unsigned long msiq);
+                                    unsigned long msiq);
-extern unsigned long pci_sun4v_msg_getvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msg_getvalid(unsigned long devhandle,
-                                            unsigned long msinum,
+                                     unsigned long msinum,
-                                            unsigned long *valid);
+                                     unsigned long *valid);
-extern unsigned long pci_sun4v_msg_setvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msg_setvalid(unsigned long devhandle,
-                                            unsigned long msinum,
+                                     unsigned long msinum,
-                                            unsigned long valid);
+                                     unsigned long valid);
 #endif /* !(_PCI_SUN4V_H) */
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 09f4fdd8d808..6cc78c213c01 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -36,6 +36,7 @@
 #include <asm/uaccess.h>
 #include <asm/irq_regs.h>
+#include "kernel.h"
 #include "irq.h"
 /*
@@ -162,8 +163,8 @@ static int pcic0_up;
 static struct linux_pcic pcic0;
 void __iomem *pcic_regs;
-volatile int pcic_speculative;
+static volatile int pcic_speculative;
-volatile int pcic_trapped;
+static volatile int pcic_trapped;
 /* forward */
 unsigned int pcic_build_device_irq(struct platform_device *op,
@@ -329,7 +330,7 @@ int __init pcic_probe(void)
        pcic->pcic_res_cfg_addr.name = "pcic_cfg_addr";
        if ((pcic->pcic_config_space_addr =
-            ioremap(regs[2].phys_addr, regs[2].reg_size * 2)) == 0) {
+            ioremap(regs[2].phys_addr, regs[2].reg_size * 2)) == NULL) {
                prom_printf("PCIC: Error, cannot map "
                            "PCI Configuration Space Address.\n");
                prom_halt();
@@ -341,7 +342,7 @@ int __init pcic_probe(void)
         */
        pcic->pcic_res_cfg_data.name = "pcic_cfg_data";
        if ((pcic->pcic_config_space_data =
-            ioremap(regs[3].phys_addr, regs[3].reg_size * 2)) == 0) {
+            ioremap(regs[3].phys_addr, regs[3].reg_size * 2)) == NULL) {
                prom_printf("PCIC: Error, cannot map "
                            "PCI Configuration Space Data.\n");
                prom_halt();
@@ -353,7 +354,6 @@ int __init pcic_probe(void)
        strcpy(pbm->prom_name, namebuf);
        {
-                extern volatile int t_nmi[4];
                extern int pcic_nmi_trap_patch[4];
                t_nmi[0] = pcic_nmi_trap_patch[0];
@@ -536,7 +536,7 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node)
                prom_getstring(node, "name", namebuf, sizeof(namebuf));
        }
-        if ((p = pcic->pcic_imap) == 0) {
+        if ((p = pcic->pcic_imap) == NULL) {
                dev->irq = 0;
                return;
        }
@@ -670,30 +670,6 @@ void pcibios_fixup_bus(struct pci_bus *bus)
        }
 }
-/*
- * pcic_pin_to_irq() is exported to bus probing code
- */
-unsigned int
-pcic_pin_to_irq(unsigned int pin, const char *name)
-{
-        struct linux_pcic *pcic = &pcic0;
-        unsigned int irq;
-        unsigned int ivec;
-        if (pin < 4) {
-                ivec = readw(pcic->pcic_regs+PCI_INT_SELECT_LO);
-                irq = ivec >> (pin << 2) & 0xF;
-        } else if (pin < 8) {
-                ivec = readw(pcic->pcic_regs+PCI_INT_SELECT_HI);
-                irq = ivec >> ((pin-4) << 2) & 0xF;
-        } else {                                        /* Corrupted map */
-                printk("PCIC: BAD PIN %d FOR %s\n", pin, name);
-                for (;;) {}     /* XXX Cannot panic properly in case of PROLL */
-        }
-/* P3 */ /* printk("PCIC: dev %s pin %d ivec 0x%x irq %x\n", name, pin, ivec, irq); */
-        return irq;
-}
 /* Makes compiler happy */
 static volatile int pcic_timer_dummy;
@@ -783,7 +759,7 @@ int pcibios_enable_device(struct pci_dev *pdev, int mask)
 void pcic_nmi(unsigned int pend, struct pt_regs *regs)
 {
-        pend = flip_dword(pend);
+        pend = swab32(pend);
        if (!pcic_speculative || (pend & PCI_SYS_INT_PENDING_PIO) == 0) {
                /*
@@ -875,82 +851,4 @@ void __init sun4m_pci_init_IRQ(void)
        sparc_config.load_profile_irq = pcic_load_profile_irq;
 }
-/*
- * This probably belongs here rather than ioport.c because
- * we do not want this crud linked into SBus kernels.
- * Also, think for a moment about likes of floppy.c that
- * include architecture specific parts. They may want to redefine ins/outs.
- *
- * We do not use horrible macros here because we want to
- * advance pointer by sizeof(size).
- */
-void outsb(unsigned long addr, const void *src, unsigned long count)
-{
-        while (count) {
-                count -= 1;
-                outb(*(const char *)src, addr);
-                src += 1;
-                /* addr += 1; */
-        }
-}
-EXPORT_SYMBOL(outsb);
-void outsw(unsigned long addr, const void *src, unsigned long count)
-{
-        while (count) {
-                count -= 2;
-                outw(*(const short *)src, addr);
-                src += 2;
-                /* addr += 2; */
-        }
-}
-EXPORT_SYMBOL(outsw);
-void outsl(unsigned long addr, const void *src, unsigned long count)
-{
-        while (count) {
-                count -= 4;
-                outl(*(const long *)src, addr);
-                src += 4;
-                /* addr += 4; */
-        }
-}
-EXPORT_SYMBOL(outsl);
-void insb(unsigned long addr, void *dst, unsigned long count)
-{
-        while (count) {
-                count -= 1;
-                *(unsigned char *)dst = inb(addr);
-                dst += 1;
-                /* addr += 1; */
-        }
-}
-EXPORT_SYMBOL(insb);
-void insw(unsigned long addr, void *dst, unsigned long count)
-{
-        while (count) {
-                count -= 2;
-                *(unsigned short *)dst = inw(addr);
-                dst += 2;
-                /* addr += 2; */
-        }
-}
-EXPORT_SYMBOL(insw);
-void insl(unsigned long addr, void *dst, unsigned long count)
-{
-        while (count) {
-                count -= 4;
-                /*
-                 * XXX I am sure we are in for an unaligned trap here.
-                 */
-                *(unsigned long *)dst = inl(addr);
-                dst += 4;
-                /* addr += 4; */
-        }
-}
-EXPORT_SYMBOL(insl);
 subsys_initcall(pcic_init);
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index b5c38faa4ead..8efd33753ad3 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -110,7 +110,7 @@ struct cpu_hw_events {
        unsigned int            group_flag;
 };
-DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events) = { .enabled = 1, };
+static DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events) = { .enabled = 1, };
 /* An event map describes the characteristics of a performance
 * counter event.  In particular it gives the encoding as well as
@@ -1153,7 +1153,7 @@ static void perf_stop_nmi_watchdog(void *unused)
                cpuc->pcr[i] = pcr_ops->read_pcr(i);
 }
-void perf_event_grab_pmc(void)
+static void perf_event_grab_pmc(void)
 {
        if (atomic_inc_not_zero(&active_events))
                return;
@@ -1169,7 +1169,7 @@ void perf_event_grab_pmc(void)
        mutex_unlock(&pmc_grab_mutex);
 }
-void perf_event_release_pmc(void)
+static void perf_event_release_pmc(void)
 {
        if (atomic_dec_and_mutex_lock(&active_events, &pmc_grab_mutex)) {
                if (atomic_read(&nmi_active) == 0)
@@ -1669,7 +1669,7 @@ static bool __init supported_pmu(void)
        return false;
 }
-int __init init_hw_perf_events(void)
+static int __init init_hw_perf_events(void)
 {
        pr_info("Performance events: ");
@@ -1742,10 +1742,11 @@ static void perf_callchain_user_64(struct perf_callchain_entry *entry,
        ufp = regs->u_regs[UREG_I6] + STACK_BIAS;
        do {
-                struct sparc_stackf *usf, sf;
+                struct sparc_stackf __user *usf;
+                struct sparc_stackf sf;
                unsigned long pc;
-                usf = (struct sparc_stackf *) ufp;
+                usf = (struct sparc_stackf __user *)ufp;
                if (__copy_from_user_inatomic(&sf, usf, sizeof(sf)))
                        break;
@@ -1765,17 +1766,19 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry,
                unsigned long pc;
                if (thread32_stack_is_64bit(ufp)) {
-                        struct sparc_stackf *usf, sf;
+                        struct sparc_stackf __user *usf;
+                        struct sparc_stackf sf;
                        ufp += STACK_BIAS;
-                        usf = (struct sparc_stackf *) ufp;
+                        usf = (struct sparc_stackf __user *)ufp;
                        if (__copy_from_user_inatomic(&sf, usf, sizeof(sf)))
                                break;
                        pc = sf.callers_pc & 0xffffffff;
                        ufp = ((unsigned long) sf.fp) & 0xffffffff;
                } else {
-                        struct sparc_stackf32 *usf, sf;
+                        struct sparc_stackf32 __user *usf;
-                        usf = (struct sparc_stackf32 *) ufp;
+                        struct sparc_stackf32 sf;
+                        usf = (struct sparc_stackf32 __user *)ufp;
                        if (__copy_from_user_inatomic(&sf, usf, sizeof(sf)))
                                break;
                        pc = sf.callers_pc;
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index 510baec1b69b..50e7b626afe8 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -10,6 +10,7 @@
 #include <stdarg.h>
+#include <linux/elfcore.h>
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/sched.h>
@@ -23,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
+#include <linux/cpu.h>
 #include <asm/auxio.h>
 #include <asm/oplib.h>
@@ -38,6 +40,8 @@
 #include <asm/unistd.h>
 #include <asm/setup.h>
+#include "kernel.h"
 /* 
 * Power management idle function 
 * Set in pm platform drivers (apc.c and pmc.c)
@@ -102,8 +106,12 @@ void machine_restart(char * cmd)
 void machine_power_off(void)
 {
        if (auxio_power_register &&
-            (strcmp(of_console_device->type, "serial") || scons_pwroff))
+            (strcmp(of_console_device->type, "serial") || scons_pwroff)) {
-                *auxio_power_register |= AUXIO_POWER_OFF;
+                u8 power_register = sbus_readb(auxio_power_register);
+                power_register |= AUXIO_POWER_OFF;
+                sbus_writeb(power_register, auxio_power_register);
+        }
        machine_halt();
 }
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index d7b4967f8fa6..027e09986194 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -88,7 +88,7 @@ void arch_cpu_idle(void)
 }
 #ifdef CONFIG_HOTPLUG_CPU
-void arch_cpu_idle_dead()
+void arch_cpu_idle_dead(void)
 {
        sched_preempt_enable_no_resched();
        cpu_play_dead();
@@ -239,7 +239,7 @@ static void __global_reg_poll(struct global_reg_snapshot *gp)
        }
 }
-void arch_trigger_all_cpu_backtrace(void)
+void arch_trigger_all_cpu_backtrace(bool include_self)
 {
        struct thread_info *tp = current_thread_info();
        struct pt_regs *regs = get_irq_regs();
@@ -251,16 +251,22 @@ void arch_trigger_all_cpu_backtrace(void)
        spin_lock_irqsave(&global_cpu_snapshot_lock, flags);
-        memset(global_cpu_snapshot, 0, sizeof(global_cpu_snapshot));
        this_cpu = raw_smp_processor_id();
-        __global_reg_self(tp, regs, this_cpu);
+        memset(global_cpu_snapshot, 0, sizeof(global_cpu_snapshot));
+        if (include_self)
+                __global_reg_self(tp, regs, this_cpu);
        smp_fetch_global_regs();
        for_each_online_cpu(cpu) {
-                struct global_reg_snapshot *gp = &global_cpu_snapshot[cpu].reg;
+                struct global_reg_snapshot *gp;
+                if (!include_self && cpu == this_cpu)
+                        continue;
+                gp = &global_cpu_snapshot[cpu].reg;
                __global_reg_poll(gp);
@@ -292,7 +298,7 @@ void arch_trigger_all_cpu_backtrace(void)
 static void sysrq_handle_globreg(int key)
 {
-        arch_trigger_all_cpu_backtrace();
+        arch_trigger_all_cpu_backtrace(true);
 }
 static struct sysrq_key_op sparc_globalreg_op = {
diff --git a/arch/sparc/kernel/prom.h b/arch/sparc/kernel/prom.h
index cf5fe1c0b024..890281b12b28 100644
--- a/arch/sparc/kernel/prom.h
+++ b/arch/sparc/kernel/prom.h
@@ -4,7 +4,7 @@
 #include <linux/spinlock.h>
 #include <asm/prom.h>
-extern void of_console_init(void);
+void of_console_init(void);
 extern unsigned int prom_early_allocated;
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index 9a690d39c01b..20cc5d80a471 100644
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -15,11 +15,12 @@
 *      2 of the License, or (at your option) any later version.
 */
+#include <linux/memblock.h>
 #include <linux/kernel.h>
-#include <linux/types.h>
 #include <linux/string.h>
+#include <linux/types.h>
+#include <linux/cpu.h>
 #include <linux/mm.h>
-#include <linux/memblock.h>
 #include <linux/of.h>
 #include <asm/prom.h>
diff --git a/arch/sparc/kernel/psycho_common.h b/arch/sparc/kernel/psycho_common.h
index 590b4ed8ab5e..05a6e30a928e 100644
--- a/arch/sparc/kernel/psycho_common.h
+++ b/arch/sparc/kernel/psycho_common.h
@@ -30,19 +30,19 @@ enum psycho_error_type {
        UE_ERR, CE_ERR, PCI_ERR
 };
-extern void psycho_check_iommu_error(struct pci_pbm_info *pbm,
+void psycho_check_iommu_error(struct pci_pbm_info *pbm,
-                                     unsigned long afsr,
+                              unsigned long afsr,
-                                     unsigned long afar,
+                              unsigned long afar,
-                                     enum psycho_error_type type);
+                              enum psycho_error_type type);
-extern irqreturn_t psycho_pcierr_intr(int irq, void *dev_id);
+irqreturn_t psycho_pcierr_intr(int irq, void *dev_id);
-extern int psycho_iommu_init(struct pci_pbm_info *pbm, int tsbsize,
+int psycho_iommu_init(struct pci_pbm_info *pbm, int tsbsize,
-                             u32 dvma_offset, u32 dma_mask,
+                      u32 dvma_offset, u32 dma_mask,
-                             unsigned long write_complete_offset);
+                      unsigned long write_complete_offset);
-extern void psycho_pbm_init_common(struct pci_pbm_info *pbm,
+void psycho_pbm_init_common(struct pci_pbm_info *pbm,
-                                   struct platform_device *op,
+                            struct platform_device *op,
-                                   const char *chip_name, int chip_type);
+                            const char *chip_name, int chip_type);
 #endif /* _PSYCHO_COMMON_H */
diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c
index 896ba7c5cd8e..a331fdc11a2c 100644
--- a/arch/sparc/kernel/ptrace_32.c
+++ b/arch/sparc/kernel/ptrace_32.c
@@ -26,6 +26,8 @@
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
+#include "kernel.h"
 /* #define ALLOW_INIT_TRACING */
 /*
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 1434526970a6..baef495c06bd 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -267,7 +267,7 @@ static __init void leon_patch(void)
 }
 struct tt_entry *sparc_ttable;
-struct pt_regs fake_swapper_regs;
+static struct pt_regs fake_swapper_regs;
 /* Called from head_32.S - before we have setup anything
 * in the kernel. Be very careful with what you do here.
@@ -365,7 +365,7 @@ void __init setup_arch(char **cmdline_p)
        prom_setsync(prom_sync_me);
-        if((boot_flags&BOOTME_DEBUG) && (linux_dbvec!=0) && 
+        if((boot_flags & BOOTME_DEBUG) && (linux_dbvec != NULL) &&
           ((*(short *)linux_dbvec) != -1)) {
                printk("Booted under KADB. Syncing trap table.\n");
                (*(linux_dbvec->teach_debugger))();
diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c
index ee789d2ef05d..62deba7be1a9 100644
--- a/arch/sparc/kernel/signal32.c
+++ b/arch/sparc/kernel/signal32.c
@@ -31,6 +31,7 @@
 #include <asm/switch_to.h>
 #include "sigutil.h"
+#include "kernel.h"
 /* This magic should be in g_upper[0] for all upper parts
 * to be valid.
@@ -145,7 +146,7 @@ void do_sigreturn32(struct pt_regs *regs)
        unsigned int psr;
        unsigned pc, npc;
        sigset_t set;
-        unsigned seta[_COMPAT_NSIG_WORDS];
+        compat_sigset_t seta;
        int err, i;
        
        /* Always make any pending restarted system calls return -EINTR */
@@ -209,17 +210,13 @@ void do_sigreturn32(struct pt_regs *regs)
                if (restore_rwin_state(compat_ptr(rwin_save)))
                        goto segv;
        }
-        err |= __get_user(seta[0], &sf->info.si_mask);
+        err |= __get_user(seta.sig[0], &sf->info.si_mask);
-        err |= copy_from_user(seta+1, &sf->extramask,
+        err |= copy_from_user(&seta.sig[1], &sf->extramask,
                              (_COMPAT_NSIG_WORDS - 1) * sizeof(unsigned int));
        if (err)
                goto segv;
-        switch (_NSIG_WORDS) {
-                case 4: set.sig[3] = seta[6] + (((long)seta[7]) << 32);
+        set.sig[0] = seta.sig[0] + (((long)seta.sig[1]) << 32);
-                case 3: set.sig[2] = seta[4] + (((long)seta[5]) << 32);
-                case 2: set.sig[1] = seta[2] + (((long)seta[3]) << 32);
-                case 1: set.sig[0] = seta[0] + (((long)seta[1]) << 32);
-        }
        set_current_blocked(&set);
        return;
@@ -303,12 +300,7 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs)
                        goto segv;
        }
-        switch (_NSIG_WORDS) {
+        set.sig[0] = seta.sig[0] + (((long)seta.sig[1]) << 32);
-                case 4: set.sig[3] = seta.sig[6] + (((long)seta.sig[7]) << 32);
-                case 3: set.sig[2] = seta.sig[4] + (((long)seta.sig[5]) << 32);
-                case 2: set.sig[1] = seta.sig[2] + (((long)seta.sig[3]) << 32);
-                case 1: set.sig[0] = seta.sig[0] + (((long)seta.sig[1]) << 32);
-        }
        set_current_blocked(&set);
        return;
 segv:
@@ -417,7 +409,7 @@ static int setup_frame32(struct ksignal *ksig, struct pt_regs *regs,
        void __user *tail;
        int sigframe_size;
        u32 psr;
-        unsigned int seta[_COMPAT_NSIG_WORDS];
+        compat_sigset_t seta;
        /* 1. Make sure everything is clean */
        synchronize_user_stack();
@@ -481,18 +473,14 @@ static int setup_frame32(struct ksignal *ksig, struct pt_regs *regs,
                err |= __put_user(0, &sf->rwin_save);
        }
-        switch (_NSIG_WORDS) {
+        /* If these change we need to know - assignments to seta relies on these sizes */
-        case 4: seta[7] = (oldset->sig[3] >> 32);
+        BUILD_BUG_ON(_NSIG_WORDS != 1);
-                seta[6] = oldset->sig[3];
+        BUILD_BUG_ON(_COMPAT_NSIG_WORDS != 2);
-        case 3: seta[5] = (oldset->sig[2] >> 32);
+        seta.sig[1] = (oldset->sig[0] >> 32);
-                seta[4] = oldset->sig[2];
+        seta.sig[0] = oldset->sig[0];
-        case 2: seta[3] = (oldset->sig[1] >> 32);
-                seta[2] = oldset->sig[1];
+        err |= __put_user(seta.sig[0], &sf->info.si_mask);
-        case 1: seta[1] = (oldset->sig[0] >> 32);
+        err |= __copy_to_user(sf->extramask, &seta.sig[1],
-                seta[0] = oldset->sig[0];
-        }
-        err |= __put_user(seta[0], &sf->info.si_mask);
-        err |= __copy_to_user(sf->extramask, seta + 1,
                              (_COMPAT_NSIG_WORDS - 1) * sizeof(unsigned int));
        if (!wsaved) {
@@ -622,16 +610,8 @@ static int setup_rt_frame32(struct ksignal *ksig, struct pt_regs *regs,
        /* Setup sigaltstack */
        err |= __compat_save_altstack(&sf->stack, regs->u_regs[UREG_FP]);
-        switch (_NSIG_WORDS) {
+        seta.sig[1] = (oldset->sig[0] >> 32);
-        case 4: seta.sig[7] = (oldset->sig[3] >> 32);
+        seta.sig[0] = oldset->sig[0];
-                seta.sig[6] = oldset->sig[3];
-        case 3: seta.sig[5] = (oldset->sig[2] >> 32);
-                seta.sig[4] = oldset->sig[2];
-        case 2: seta.sig[3] = (oldset->sig[1] >> 32);
-                seta.sig[2] = oldset->sig[1];
-        case 1: seta.sig[1] = (oldset->sig[0] >> 32);
-                seta.sig[0] = oldset->sig[0];
-        }
        err |= __copy_to_user(&sf->mask, &seta, sizeof(compat_sigset_t));
        if (!wsaved) {
diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
index 7d5d8e1f8415..9ee72fc8e0e4 100644
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -28,6 +28,7 @@
 #include <asm/switch_to.h>
 #include "sigutil.h"
+#include "kernel.h"
 extern void fpsave(unsigned long *fpregs, unsigned long *fsr,
                   void *fpqueue, unsigned long *fpqdepth);
@@ -341,7 +342,7 @@ static int setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs,
        err |= __put_user(0, &sf->extra_size);
        if (psr & PSR_EF) {
-                __siginfo_fpu_t *fp = tail;
+                __siginfo_fpu_t __user *fp = tail;
                tail += sizeof(*fp);
                err |= save_fpu_state(regs, fp);
                err |= __put_user(fp, &sf->fpu_save);
@@ -349,7 +350,7 @@ static int setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs,
                err |= __put_user(0, &sf->fpu_save);
        }
        if (wsaved) {
-                __siginfo_rwin_t *rwp = tail;
+                __siginfo_rwin_t __user *rwp = tail;
                tail += sizeof(*rwp);
                err |= save_rwin_state(wsaved, rwp);
                err |= __put_user(rwp, &sf->rwin_save);
@@ -517,9 +518,9 @@ void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0,
        }
 }
-asmlinkage int
+asmlinkage int do_sys_sigstack(struct sigstack __user *ssptr,
-do_sys_sigstack(struct sigstack __user *ssptr, struct sigstack __user *ossptr,
+                               struct sigstack __user *ossptr,
-                unsigned long sp)
+                               unsigned long sp)
 {
        int ret = -EFAULT;
diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c
index cd91d010e6d3..1a6999868031 100644
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
@@ -35,9 +35,10 @@
 #include <asm/switch_to.h>
 #include <asm/cacheflush.h>
-#include "entry.h"
-#include "systbls.h"
 #include "sigutil.h"
+#include "systbls.h"
+#include "kernel.h"
+#include "entry.h"
 /* {set, get}context() needed for 64-bit SparcLinux userland. */
 asmlinkage void sparc64_set_context(struct pt_regs *regs)
@@ -492,7 +493,6 @@ 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(struct pt_regs *);
                do_signal32(regs);
                return;
        }
diff --git a/arch/sparc/kernel/smp_32.c b/arch/sparc/kernel/smp_32.c
index a102bfba6ea8..7958242d63c5 100644
--- a/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@ -20,6 +20,7 @@
 #include <linux/seq_file.h>
 #include <linux/cache.h>
 #include <linux/delay.h>
+#include <linux/profile.h>
 #include <linux/cpu.h>
 #include <asm/ptrace.h>
@@ -75,8 +76,6 @@ void smp_store_cpu_info(int id)
 void __init smp_cpus_done(unsigned int max_cpus)
 {
-        extern void smp4m_smp_done(void);
-        extern void smp4d_smp_done(void);
        unsigned long bogosum = 0;
        int cpu, num = 0;
@@ -183,8 +182,6 @@ int setup_profiling_timer(unsigned int multiplier)
 void __init smp_prepare_cpus(unsigned int max_cpus)
 {
-        extern void __init smp4m_boot_cpus(void);
-        extern void __init smp4d_boot_cpus(void);
        int i, cpuid, extra;
        printk("Entering SMP Mode...\n");
@@ -261,8 +258,6 @@ void __init smp_prepare_boot_cpu(void)
 int __cpu_up(unsigned int cpu, struct task_struct *tidle)
 {
-        extern int smp4m_boot_one_cpu(int, struct task_struct *);
-        extern int smp4d_boot_one_cpu(int, struct task_struct *);
        int ret=0;
        switch(sparc_cpu_model) {
@@ -297,7 +292,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle)
        return ret;
 }
-void arch_cpu_pre_starting(void *arg)
+static void arch_cpu_pre_starting(void *arg)
 {
        local_ops->cache_all();
        local_ops->tlb_all();
@@ -317,7 +312,7 @@ void arch_cpu_pre_starting(void *arg)
        }
 }
-void arch_cpu_pre_online(void *arg)
+static void arch_cpu_pre_online(void *arg)
 {
        unsigned int cpuid = hard_smp_processor_id();
@@ -344,7 +339,7 @@ void arch_cpu_pre_online(void *arg)
        }
 }
-void sparc_start_secondary(void *arg)
+static void sparc_start_secondary(void *arg)
 {
        unsigned int cpu;
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 745a3633ce14..41aa2478f3ca 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -25,6 +25,7 @@
 #include <linux/ftrace.h>
 #include <linux/cpu.h>
 #include <linux/slab.h>
+#include <linux/kgdb.h>
 #include <asm/head.h>
 #include <asm/ptrace.h>
@@ -35,6 +36,7 @@
 #include <asm/hvtramp.h>
 #include <asm/io.h>
 #include <asm/timer.h>
+#include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/irq_regs.h>
@@ -52,6 +54,7 @@
 #include <asm/pcr.h>
 #include "cpumap.h"
+#include "kernel.h"
 DEFINE_PER_CPU(cpumask_t, cpu_sibling_map) = CPU_MASK_NONE;
 cpumask_t cpu_core_map[NR_CPUS] __read_mostly =
@@ -272,14 +275,6 @@ static void smp_synchronize_one_tick(int cpu)
 }
 #if defined(CONFIG_SUN_LDOMS) && defined(CONFIG_HOTPLUG_CPU)
-/* XXX Put this in some common place. XXX */
-static unsigned long kimage_addr_to_ra(void *p)
-{
-        unsigned long val = (unsigned long) p;
-        return kern_base + (val - KERNBASE);
-}
 static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg,
                                void **descrp)
 {
@@ -867,11 +862,6 @@ extern unsigned long xcall_flush_dcache_page_cheetah;
 #endif
 extern unsigned long xcall_flush_dcache_page_spitfire;
-#ifdef CONFIG_DEBUG_DCFLUSH
-extern atomic_t dcpage_flushes;
-extern atomic_t dcpage_flushes_xcall;
-#endif
 static inline void __local_flush_dcache_page(struct page *page)
 {
 #ifdef DCACHE_ALIASING_POSSIBLE
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index f8933be3ca8b..a1bb2675b280 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -143,7 +143,7 @@ static void sun4d_sbus_handler_irq(int sbusl)
        }
 }
-void sun4d_handler_irq(int pil, struct pt_regs *regs)
+void sun4d_handler_irq(unsigned int pil, struct pt_regs *regs)
 {
        struct pt_regs *old_regs;
        /* SBUS IRQ level (1 - 7) */
@@ -236,7 +236,7 @@ static void sun4d_shutdown_irq(struct irq_data *data)
        irq_unlink(data->irq);
 }
-struct irq_chip sun4d_irq = {
+static struct irq_chip sun4d_irq = {
        .name           = "sun4d",
        .irq_startup    = sun4d_startup_irq,
        .irq_shutdown   = sun4d_shutdown_irq,
@@ -285,9 +285,9 @@ static void __init sun4d_load_profile_irqs(void)
        }
 }
-unsigned int _sun4d_build_device_irq(unsigned int real_irq,
+static unsigned int _sun4d_build_device_irq(unsigned int real_irq,
-                                     unsigned int pil,
+                                            unsigned int pil,
-                                     unsigned int board)
+                                            unsigned int board)
 {
        struct sun4d_handler_data *handler_data;
        unsigned int irq;
@@ -320,8 +320,8 @@ err_out:
-unsigned int sun4d_build_device_irq(struct platform_device *op,
+static unsigned int sun4d_build_device_irq(struct platform_device *op,
-                                    unsigned int real_irq)
+                                           unsigned int real_irq)
 {
        struct device_node *dp = op->dev.of_node;
        struct device_node *board_parent, *bus = dp->parent;
@@ -383,7 +383,8 @@ err_out:
        return irq;
 }
-unsigned int sun4d_build_timer_irq(unsigned int board, unsigned int real_irq)
+static unsigned int sun4d_build_timer_irq(unsigned int board,
+                                          unsigned int real_irq)
 {
        return _sun4d_build_device_irq(real_irq, real_irq, board);
 }
diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c
index 71368850dfc0..022c30c72ebd 100644
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@ -49,6 +49,8 @@
 #include <asm/mmu_context.h>
 #include <asm/compat_signal.h>
+#include "systbls.h"
 asmlinkage long sys32_truncate64(const char __user * path, unsigned long high, unsigned long low)
 {
        if ((int)high < 0)
diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
index 3a8d1844402e..646988d4c1a3 100644
--- a/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
@@ -24,6 +24,8 @@
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
+#include "systbls.h"
 /* #define DEBUG_UNIMP_SYSCALL */
 /* XXX Make this per-binary type, this way we can detect the type of
@@ -68,7 +70,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
 * sys_pipe() is the normal C calling standard for creating
 * a pipe. It's not the way unix traditionally does this, though.
 */
-asmlinkage int sparc_pipe(struct pt_regs *regs)
+asmlinkage long sparc_pipe(struct pt_regs *regs)
 {
        int fd[2];
        int error;
@@ -93,7 +95,7 @@ int sparc_mmap_check(unsigned long addr, unsigned long len)
 /* Linux version of mmap */
-asmlinkage unsigned long sys_mmap2(unsigned long addr, unsigned long len,
+asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
        unsigned long prot, unsigned long flags, unsigned long fd,
        unsigned long pgoff)
 {
@@ -103,7 +105,7 @@ asmlinkage unsigned long sys_mmap2(unsigned long addr, unsigned long len,
                              pgoff >> (PAGE_SHIFT - 12));
 }
-asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len,
+asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
        unsigned long prot, unsigned long flags, unsigned long fd,
        unsigned long off)
 {
@@ -197,7 +199,7 @@ SYSCALL_DEFINE5(rt_sigaction, int, sig,
        return ret;
 }
-asmlinkage int sys_getdomainname(char __user *name, int len)
+asmlinkage long sys_getdomainname(char __user *name, int len)
 {
        int nlen, err;
        
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index beb0b5a5f21f..c85403d0496c 100644
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -31,6 +31,7 @@
 #include <asm/unistd.h>
 #include "entry.h"
+#include "kernel.h"
 #include "systbls.h"
 /* #define DEBUG_UNIMP_SYSCALL */
diff --git a/arch/sparc/kernel/systbls.h b/arch/sparc/kernel/systbls.h
index 26e6dd72e92a..2dab8236d490 100644
--- a/arch/sparc/kernel/systbls.h
+++ b/arch/sparc/kernel/systbls.h
@@ -1,41 +1,103 @@
 #ifndef _SYSTBLS_H
 #define _SYSTBLS_H
+#include <linux/signal.h>
 #include <linux/kernel.h>
+#include <linux/compat.h>
 #include <linux/types.h>
-#include <linux/signal.h>
 #include <asm/utrap.h>
-extern asmlinkage unsigned long sys_getpagesize(void);
+asmlinkage unsigned long sys_getpagesize(void);
-extern asmlinkage long sparc_pipe(struct pt_regs *regs);
+asmlinkage long sparc_pipe(struct pt_regs *regs);
-extern asmlinkage long sys_sparc_ipc(unsigned int call, int first,
+asmlinkage unsigned long c_sys_nis_syscall(struct pt_regs *regs);
-                               unsigned long second,
+asmlinkage long sys_getdomainname(char __user *name, int len);
-                               unsigned long third,
+void do_rt_sigreturn(struct pt_regs *regs);
-                               void __user *ptr, long fifth);
+asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
-extern asmlinkage long sparc64_personality(unsigned long personality);
+                         unsigned long prot, unsigned long flags,
-extern asmlinkage long sys64_munmap(unsigned long addr, size_t len);
+                         unsigned long fd, unsigned long off);
-extern asmlinkage unsigned long sys64_mremap(unsigned long addr,
+asmlinkage void sparc_breakpoint(struct pt_regs *regs);
-                                             unsigned long old_len,
-                                             unsigned long new_len,
+#ifdef CONFIG_SPARC32
-                                             unsigned long flags,
+asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
-                                             unsigned long new_addr);
+                          unsigned long prot, unsigned long flags,
-extern asmlinkage unsigned long c_sys_nis_syscall(struct pt_regs *regs);
+                          unsigned long fd, unsigned long pgoff);
-extern asmlinkage long sys_getdomainname(char __user *name, int len);
+long sparc_remap_file_pages(unsigned long start, unsigned long size,
-extern asmlinkage long sys_utrap_install(utrap_entry_t type,
+                            unsigned long prot, unsigned long pgoff,
-                                         utrap_handler_t new_p,
+                            unsigned long flags);
-                                         utrap_handler_t new_d,
-                                         utrap_handler_t __user *old_p,
-                                         utrap_handler_t __user *old_d);
-extern asmlinkage long sparc_memory_ordering(unsigned long model,
-                                             struct pt_regs *regs);
-extern asmlinkage long sys_rt_sigaction(int sig,
-                                        const struct sigaction __user *act,
-                                        struct sigaction __user *oact,
-                                        void __user *restorer,
-                                        size_t sigsetsize);
-extern asmlinkage void sparc64_set_context(struct pt_regs *regs);
+#endif /* CONFIG_SPARC32 */
-extern asmlinkage void sparc64_get_context(struct pt_regs *regs);
-extern void do_rt_sigreturn(struct pt_regs *regs);
+#ifdef CONFIG_SPARC64
+asmlinkage long sys_sparc_ipc(unsigned int call, int first,
+                              unsigned long second,
+                              unsigned long third,
+                              void __user *ptr, long fifth);
+asmlinkage long sparc64_personality(unsigned long personality);
+asmlinkage long sys64_munmap(unsigned long addr, size_t len);
+asmlinkage unsigned long sys64_mremap(unsigned long addr,
+                                      unsigned long old_len,
+                                      unsigned long new_len,
+                                      unsigned long flags,
+                                      unsigned long new_addr);
+asmlinkage long sys_utrap_install(utrap_entry_t type,
+                                  utrap_handler_t new_p,
+                                  utrap_handler_t new_d,
+                                  utrap_handler_t __user *old_p,
+                                  utrap_handler_t __user *old_d);
+asmlinkage long sparc_memory_ordering(unsigned long model,
+                                      struct pt_regs *regs);
+asmlinkage void sparc64_set_context(struct pt_regs *regs);
+asmlinkage void sparc64_get_context(struct pt_regs *regs);
+asmlinkage long sys32_truncate64(const char __user * path,
+                                 unsigned long high,
+                                 unsigned long low);
+asmlinkage long sys32_ftruncate64(unsigned int fd,
+                                  unsigned long high,
+                                  unsigned long low);
+struct compat_stat64;
+asmlinkage long compat_sys_stat64(const char __user * filename,
+                                  struct compat_stat64 __user *statbuf);
+asmlinkage long compat_sys_lstat64(const char __user * filename,
+                                   struct compat_stat64 __user *statbuf);
+asmlinkage long compat_sys_fstat64(unsigned int fd,
+                                   struct compat_stat64 __user * statbuf);
+asmlinkage long compat_sys_fstatat64(unsigned int dfd,
+                                     const char __user *filename,
+                                     struct compat_stat64 __user * statbuf, int flag);
+asmlinkage compat_ssize_t sys32_pread64(unsigned int fd,
+                                        char __user *ubuf,
+                                        compat_size_t count,
+                                        unsigned long poshi,
+                                        unsigned long poslo);
+asmlinkage compat_ssize_t sys32_pwrite64(unsigned int fd,
+                                         char __user *ubuf,
+                                         compat_size_t count,
+                                         unsigned long poshi,
+                                         unsigned long poslo);
+asmlinkage long compat_sys_readahead(int fd,
+                                     unsigned long offhi,
+                                     unsigned long offlo,
+                                     compat_size_t count);
+long compat_sys_fadvise64(int fd,
+                          unsigned long offhi,
+                          unsigned long offlo,
+                          compat_size_t len, int advice);
+long compat_sys_fadvise64_64(int fd,
+                             unsigned long offhi, unsigned long offlo,
+                             unsigned long lenhi, unsigned long lenlo,
+                             int advice);
+long sys32_sync_file_range(unsigned int fd,
+                           unsigned long off_high, unsigned long off_low,
+                           unsigned long nb_high, unsigned long nb_low,
+                           unsigned int flags);
+asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offhi, u32 offlo,
+                                     u32 lenhi, u32 lenlo);
+asmlinkage long compat_sys_fstat64(unsigned int fd,
+                                   struct compat_stat64 __user * statbuf);
+asmlinkage long compat_sys_fstatat64(unsigned int dfd,
+                                     const char __user *filename,
+                                     struct compat_stat64 __user * statbuf,
+                                     int flag);
+#endif /* CONFIG_SPARC64 */
 #endif /* _SYSTBLS_H */
diff --git a/arch/sparc/kernel/tadpole.c b/arch/sparc/kernel/tadpole.c
deleted file mode 100644
index 9aba8bd5a78b..000000000000
--- a/arch/sparc/kernel/tadpole.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* tadpole.c: Probing for the tadpole clock stopping h/w at boot time.
- *
- * Copyright (C) 1996 David Redman (djhr@tadpole.co.uk)
- */
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <asm/asi.h>
-#include <asm/oplib.h>
-#include <asm/io.h>
-#define MACIO_SCSI_CSR_ADDR     0x78400000
-#define MACIO_EN_DMA            0x00000200
-#define CLOCK_INIT_DONE         1
-static int clk_state;
-static volatile unsigned char *clk_ctrl;
-void (*cpu_pwr_save)(void);
-static inline unsigned int ldphys(unsigned int addr)
-{
-        unsigned long data;
-    
-        __asm__ __volatile__("\n\tlda [%1] %2, %0\n\t" : 
-                             "=r" (data) :
-                             "r" (addr), "i" (ASI_M_BYPASS));
-        return data;
-}
-static void clk_init(void)
-{
-        __asm__ __volatile__("mov 0x6c, %%g1\n\t"
-                             "mov 0x4c, %%g2\n\t"
-                             "mov 0xdf, %%g3\n\t"
-                             "stb %%g1, [%0+3]\n\t"
-                             "stb %%g2, [%0+3]\n\t"
-                             "stb %%g3, [%0+3]\n\t" : :
-                             "r" (clk_ctrl) :
-                             "g1", "g2", "g3");
-}
-static void clk_slow(void)
-{
-        __asm__ __volatile__("mov 0xcc, %%g2\n\t"
-                             "mov 0x4c, %%g3\n\t"
-                             "mov 0xcf, %%g4\n\t"
-                             "mov 0xdf, %%g5\n\t"
-                             "stb %%g2, [%0+3]\n\t"
-                             "stb %%g3, [%0+3]\n\t"
-                             "stb %%g4, [%0+3]\n\t"
-                             "stb %%g5, [%0+3]\n\t" : :
-                             "r" (clk_ctrl) :
-                             "g2", "g3", "g4", "g5");
-}
-/*
- * Tadpole is guaranteed to be UP, using local_irq_save.
- */
-static void tsu_clockstop(void)
-{
-        unsigned int mcsr;
-        unsigned long flags;
-        if (!clk_ctrl)
-                return;
-        if (!(clk_state & CLOCK_INIT_DONE)) {
-                local_irq_save(flags);
-                clk_init();
-                clk_state |= CLOCK_INIT_DONE;       /* all done */
-                local_irq_restore(flags);
-                return;
-        }
-        if (!(clk_ctrl[2] & 1))
-                return;               /* no speed up yet */
-        local_irq_save(flags);
-        /* if SCSI DMA in progress, don't slow clock */
-        mcsr = ldphys(MACIO_SCSI_CSR_ADDR);
-        if ((mcsr&MACIO_EN_DMA) != 0) {
-                local_irq_restore(flags);
-                return;
-        }
-        /* TODO... the minimum clock setting ought to increase the
-         * memory refresh interval..
-         */
-        clk_slow();
-        local_irq_restore(flags);
-}
-static void swift_clockstop(void)
-{
-        if (!clk_ctrl)
-                return;
-        clk_ctrl[0] = 0;
-}
-void __init clock_stop_probe(void)
-{
-        phandle node, clk_nd;
-        char name[20];
-    
-        prom_getstring(prom_root_node, "name", name, sizeof(name));
-        if (strncmp(name, "Tadpole", 7))
-                return;
-        node = prom_getchild(prom_root_node);
-        node = prom_searchsiblings(node, "obio");
-        node = prom_getchild(node);
-        clk_nd = prom_searchsiblings(node, "clk-ctrl");
-        if (!clk_nd)
-                return;
-        printk("Clock Stopping h/w detected... ");
-        clk_ctrl = (char *) prom_getint(clk_nd, "address");
-        clk_state = 0;
-        if (name[10] == '\0') {
-                cpu_pwr_save = tsu_clockstop;
-                printk("enabled (S3)\n");
-        } else if ((name[10] == 'X') || (name[10] == 'G')) {
-                cpu_pwr_save = swift_clockstop;
-                printk("enabled (%s)\n",name+7);
-        } else
-                printk("disabled %s\n",name+7);
-}
diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c
index c4c27b0f9063..5923d1e4e7c9 100644
--- a/arch/sparc/kernel/time_32.c
+++ b/arch/sparc/kernel/time_32.c
@@ -36,6 +36,7 @@
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <asm/mc146818rtc.h>
 #include <asm/oplib.h>
 #include <asm/timex.h>
 #include <asm/timer.h>
@@ -47,6 +48,7 @@
 #include <asm/irq_regs.h>
 #include <asm/setup.h>
+#include "kernel.h"
 #include "irq.h"
 static __cacheline_aligned_in_smp DEFINE_SEQLOCK(timer_cs_lock);
@@ -83,7 +85,7 @@ unsigned long profile_pc(struct pt_regs *regs)
 EXPORT_SYMBOL(profile_pc);
-__volatile__ unsigned int *master_l10_counter;
+volatile u32 __iomem *master_l10_counter;
 int update_persistent_clock(struct timespec now)
 {
@@ -143,9 +145,9 @@ static __init void setup_timer_ce(void)
 static unsigned int sbus_cycles_offset(void)
 {
-        unsigned int val, offset;
+        u32 val, offset;
-        val = *master_l10_counter;
+        val = sbus_readl(master_l10_counter);
        offset = (val >> TIMER_VALUE_SHIFT) & TIMER_VALUE_MASK;
        /* Limit hit? */
diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
index 662982946a89..6fd386c5232a 100644
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
@@ -44,7 +44,7 @@ static void instruction_dump(unsigned long *pc)
 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
-void die_if_kernel(char *str, struct pt_regs *regs)
+void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
 {
        static int die_counter;
        int count = 0;
@@ -219,8 +219,6 @@ static unsigned long fake_fsr;
 static unsigned long fake_queue[32] __attribute__ ((aligned (8)));
 static unsigned long fake_depth;
-extern int do_mathemu(struct pt_regs *, struct task_struct *);
 void do_fpe_trap(struct pt_regs *regs, unsigned long pc, unsigned long npc,
                 unsigned long psr)
 {
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
index 4ced92f05358..fb6640ec8557 100644
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
@@ -43,8 +43,10 @@
 #include <asm/prom.h>
 #include <asm/memctrl.h>
 #include <asm/cacheflush.h>
+#include <asm/setup.h>
 #include "entry.h"
+#include "kernel.h"
 #include "kstack.h"
 /* When an irrecoverable trap occurs at tl > 0, the trap entry
@@ -2209,8 +2211,6 @@ out:
        exception_exit(prev_state);
 }
-extern int do_mathemu(struct pt_regs *, struct fpustate *, bool);
 void do_fpother(struct pt_regs *regs)
 {
        enum ctx_state prev_state = exception_enter();
@@ -2383,7 +2383,7 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
        return (struct reg_window *) (fp + STACK_BIAS);
 }
-void die_if_kernel(char *str, struct pt_regs *regs)
+void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
 {
        static int die_counter;
        int count = 0;
@@ -2433,9 +2433,6 @@ EXPORT_SYMBOL(die_if_kernel);
 #define VIS_OPCODE_MASK ((0x3 << 30) | (0x3f << 19))
 #define VIS_OPCODE_VAL  ((0x2 << 30) | (0x36 << 19))
-extern int handle_popc(u32 insn, struct pt_regs *regs);
-extern int handle_ldf_stq(u32 insn, struct pt_regs *regs);
 void do_illegal_instruction(struct pt_regs *regs)
 {
        enum ctx_state prev_state = exception_enter();
@@ -2486,8 +2483,6 @@ out:
        exception_exit(prev_state);
 }
-extern void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn);
 void mem_address_unaligned(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr)
 {
        enum ctx_state prev_state = exception_enter();
diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c
index c0ec89786193..c5c61b3c6b56 100644
--- a/arch/sparc/kernel/unaligned_32.c
+++ b/arch/sparc/kernel/unaligned_32.c
@@ -16,6 +16,10 @@
 #include <linux/smp.h>
 #include <linux/perf_event.h>
+#include <asm/setup.h>
+#include "kernel.h"
 enum direction {
        load,    /* ld, ldd, ldh, ldsh */
        store,   /* st, std, sth, stsh */
diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
index 35ab8b60d256..62098a89bbbf 100644
--- a/arch/sparc/kernel/unaligned_64.c
+++ b/arch/sparc/kernel/unaligned_64.c
@@ -24,8 +24,10 @@
 #include <linux/context_tracking.h>
 #include <asm/fpumacro.h>
 #include <asm/cacheflush.h>
+#include <asm/setup.h>
 #include "entry.h"
+#include "kernel.h"
 enum direction {
        load,    /* ld, ldd, ldh, ldsh */
diff --git a/arch/sparc/kernel/windows.c b/arch/sparc/kernel/windows.c
index 3107381e576d..87bab0a3857a 100644
--- a/arch/sparc/kernel/windows.c
+++ b/arch/sparc/kernel/windows.c
@@ -10,8 +10,11 @@
 #include <linux/mm.h>
 #include <linux/smp.h>
+#include <asm/cacheflush.h>
 #include <asm/uaccess.h>
+#include "kernel.h"
 /* Do save's until all user register windows are out of the cpu. */
 void flush_user_windows(void)
 {
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index dbe119b63b48..3269b0234093 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -41,7 +41,7 @@ lib-$(CONFIG_SPARC64) += GENpatch.o GENpage.o GENbzero.o
 lib-$(CONFIG_SPARC64) += copy_in_user.o user_fixup.o memmove.o
 lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o
-obj-y                 += iomap.o
+obj-$(CONFIG_SPARC64) += iomap.o
 obj-$(CONFIG_SPARC32) += atomic32.o ucmpdi2.o
 obj-y                 += ksyms.o
 obj-$(CONFIG_SPARC64) += PeeCeeI.o
diff --git a/arch/sparc/math-emu/sfp-util_32.h b/arch/sparc/math-emu/sfp-util_32.h
index d1b2aff3c259..bb587d5f3d9d 100644
--- a/arch/sparc/math-emu/sfp-util_32.h
+++ b/arch/sparc/math-emu/sfp-util_32.h
@@ -4,20 +4,20 @@
 #include <asm/byteorder.h>
 #define add_ssaaaa(sh, sl, ah, al, bh, bl)                              \
-  __asm__ ("addcc %r4,%5,%1\n\t"                                                \
+  __asm__ ("addcc %r4,%5,%1\n\t"                                        \
           "addx %r2,%3,%0\n"                                           \
-           : "=r" ((USItype)(sh)),                                      \
+           : "=r" (sh),                                                 \
-             "=&r" ((USItype)(sl))                                      \
+             "=&r" (sl)                                                 \
           : "%rJ" ((USItype)(ah)),                                     \
             "rI" ((USItype)(bh)),                                      \
             "%rJ" ((USItype)(al)),                                     \
             "rI" ((USItype)(bl))                                       \
           : "cc")
 #define sub_ddmmss(sh, sl, ah, al, bh, bl)                              \
-  __asm__ ("subcc %r4,%5,%1\n\t"                                                \
+  __asm__ ("subcc %r4,%5,%1\n\t"                                        \
           "subx %r2,%3,%0\n"                                           \
-           : "=r" ((USItype)(sh)),                                      \
+           : "=r" (sh),                                                 \
-             "=&r" ((USItype)(sl))                                      \
+             "=&r" (sl)                                                 \
           : "rJ" ((USItype)(ah)),                                      \
             "rI" ((USItype)(bh)),                                      \
             "rJ" ((USItype)(al)),                                      \
@@ -65,8 +65,8 @@
        "mulscc %%g1,0,%%g1\n\t"                                        \
        "add    %%g1,%%g2,%0\n\t"                                       \
        "rd     %%y,%1\n"                                               \
-           : "=r" ((USItype)(w1)),                                      \
+           : "=r" (w1),                                                 \
-             "=r" ((USItype)(w0))                                       \
+             "=r" (w0)                                                  \
           : "%rI" ((USItype)(u)),                                      \
             "r" ((USItype)(v))                                         \
           : "%g1", "%g2", "cc")
@@ -98,8 +98,8 @@
           "sub %1,%2,%1\n\t"                                           \
           "3:  xnor    %0,0,%0\n\t"                                    \
           "! End of inline udiv_qrnnd\n"                               \
-           : "=&r" ((USItype)(q)),                                      \
+           : "=&r" (q),                                                 \
-             "=&r" ((USItype)(r))                                       \
+             "=&r" (r)                                                  \
           : "r" ((USItype)(d)),                                        \
             "1" ((USItype)(n1)),                                       \
             "0" ((USItype)(n0)) : "%g1", "cc")
diff --git a/arch/sparc/math-emu/sfp-util_64.h b/arch/sparc/math-emu/sfp-util_64.h
index 425d3cf01af4..51320a861cc2 100644
--- a/arch/sparc/math-emu/sfp-util_64.h
+++ b/arch/sparc/math-emu/sfp-util_64.h
@@ -17,8 +17,8 @@
           "bcs,a,pn %%xcc, 1f\n\t"             \
           "add %0, 1, %0\n"                    \
           "1:"                                 \
-           : "=r" ((UDItype)(sh)),              \
+           : "=r" (sh),                         \
-             "=&r" ((UDItype)(sl))              \
+             "=&r" (sl)                         \
           : "r" ((UDItype)(ah)),               \
             "r" ((UDItype)(bh)),               \
             "r" ((UDItype)(al)),               \
@@ -31,8 +31,8 @@
           "bcs,a,pn %%xcc, 1f\n\t"             \
           "sub %0, 1, %0\n"                    \
           "1:"                                 \
-           : "=r" ((UDItype)(sh)),              \
+           : "=r" (sh),                         \
-             "=&r" ((UDItype)(sl))              \
+             "=&r" (sl)                         \
           : "r" ((UDItype)(ah)),               \
             "r" ((UDItype)(bh)),               \
             "r" ((UDItype)(al)),               \
@@ -64,8 +64,8 @@
                   "sllx %3,32,%3\n\t"                  \
                   "add %1,%3,%1\n\t"                   \
                   "add %5,%2,%0"                       \
-           : "=r" ((UDItype)(wh)),                      \
+           : "=r" (wh),                                 \
-             "=&r" ((UDItype)(wl)),                     \
+             "=&r" (wl),                                \
             "=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3), "=&r" (tmp4) \
           : "r" ((UDItype)(u)),                        \
             "r" ((UDItype)(v))                         \
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index 59dbd4645725..908e8c17c902 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -26,14 +26,14 @@
 #include <asm/pgtable.h>
 #include <asm/openprom.h>
 #include <asm/oplib.h>
+#include <asm/setup.h>
 #include <asm/smp.h>
 #include <asm/traps.h>
 #include <asm/uaccess.h>
-int show_unhandled_signals = 1;
+#include "mm_32.h"
-static void unhandled_fault(unsigned long, struct task_struct *,
+int show_unhandled_signals = 1;
-                struct pt_regs *) __attribute__ ((noreturn));
 static void __noreturn unhandled_fault(unsigned long address,
                                       struct task_struct *tsk,
@@ -141,9 +141,6 @@ static void __do_fault_siginfo(int code, int sig, struct pt_regs *regs,
        force_sig_info (sig, &info, current);
 }
-extern unsigned long safe_compute_effective_address(struct pt_regs *,
-                                                    unsigned int);
 static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
 {
        unsigned int insn;
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index 4ced3fc66130..587cd0565128 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -32,6 +32,7 @@
 #include <asm/lsu.h>
 #include <asm/sections.h>
 #include <asm/mmu_context.h>
+#include <asm/setup.h>
 int show_unhandled_signals = 1;
@@ -196,9 +197,6 @@ static void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
        force_sig_info(sig, &info, current);
 }
-extern int handle_ldf_stq(u32, struct pt_regs *);
-extern int handle_ld_nf(u32, struct pt_regs *);
 static unsigned int get_fault_insn(struct pt_regs *regs, unsigned int insn)
 {
        if (!insn) {
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index db6987082805..eb8287155279 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -31,10 +31,13 @@
 #include <asm/pgtable.h>
 #include <asm/vaddrs.h>
 #include <asm/pgalloc.h>        /* bug in asm-generic/tlb.h: check_pgt_cache */
+#include <asm/setup.h>
 #include <asm/tlb.h>
 #include <asm/prom.h>
 #include <asm/leon.h>
+#include "mm_32.h"
 unsigned long *sparc_valid_addr_bitmap;
 EXPORT_SYMBOL(sparc_valid_addr_bitmap);
@@ -63,7 +66,6 @@ void show_mem(unsigned int filter)
 }
-extern unsigned long cmdline_memory_size;
 unsigned long last_valid_pfn;
 unsigned long calc_highpages(void)
@@ -246,9 +248,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail)
 * init routine based upon the Sun model type on the Sparc.
 *
 */
-extern void srmmu_paging_init(void);
-extern void device_scan(void);
 void __init paging_init(void)
 {
        srmmu_paging_init();
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index ed3c969a5f4c..16b58ff11e65 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -47,6 +47,7 @@
 #include <asm/prom.h>
 #include <asm/mdesc.h>
 #include <asm/cpudata.h>
+#include <asm/setup.h>
 #include <asm/irq.h>
 #include "init_64.h"
@@ -794,11 +795,11 @@ struct node_mem_mask {
 static struct node_mem_mask node_masks[MAX_NUMNODES];
 static int num_node_masks;
+#ifdef CONFIG_NEED_MULTIPLE_NODES
 int numa_cpu_lookup_table[NR_CPUS];
 cpumask_t numa_cpumask_lookup_table[MAX_NUMNODES];
-#ifdef CONFIG_NEED_MULTIPLE_NODES
 struct mdesc_mblock {
        u64     base;
        u64     size;
@@ -887,17 +888,21 @@ static void __init allocate_node_data(int nid)
 static void init_node_masks_nonnuma(void)
 {
+#ifdef CONFIG_NEED_MULTIPLE_NODES
        int i;
+#endif
        numadbg("Initializing tables for non-numa.\n");
        node_masks[0].mask = node_masks[0].val = 0;
        num_node_masks = 1;
+#ifdef CONFIG_NEED_MULTIPLE_NODES
        for (i = 0; i < NR_CPUS; i++)
                numa_cpu_lookup_table[i] = 0;
        cpumask_setall(&numa_cpumask_lookup_table[0]);
+#endif
 }
 #ifdef CONFIG_NEED_MULTIPLE_NODES
diff --git a/arch/sparc/mm/init_64.h b/arch/sparc/mm/init_64.h
index 5d3782deb403..0668b364f44d 100644
--- a/arch/sparc/mm/init_64.h
+++ b/arch/sparc/mm/init_64.h
@@ -21,7 +21,7 @@ extern unsigned int sparc64_highest_unlocked_tlb_ent;
 extern unsigned long sparc64_kern_pri_context;
 extern unsigned long sparc64_kern_pri_nuc_bits;
 extern unsigned long sparc64_kern_sec_context;
-extern void mmu_info(struct seq_file *m);
+void mmu_info(struct seq_file *m);
 struct linux_prom_translation {
        unsigned long virt;
@@ -36,7 +36,7 @@ extern unsigned int prom_trans_ents;
 /* Exported for SMP bootup purposes. */
 extern unsigned long kern_locked_tte_data;
-extern void prom_world(int enter);
+void prom_world(int enter);
 #ifdef CONFIG_SPARSEMEM_VMEMMAP
 #define VMEMMAP_CHUNK_SHIFT     22
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c
index eb99862e9654..f311bf219016 100644
--- a/arch/sparc/mm/io-unit.c
+++ b/arch/sparc/mm/io-unit.c
@@ -25,6 +25,8 @@
 #include <asm/dma.h>
 #include <asm/oplib.h>
+#include "mm_32.h"
 /* #define IOUNIT_DEBUG */
 #ifdef IOUNIT_DEBUG
 #define IOD(x) printk(x)
@@ -38,7 +40,8 @@
 static void __init iounit_iommu_init(struct platform_device *op)
 {
        struct iounit_struct *iounit;
-        iopte_t *xpt, *xptend;
+        iopte_t __iomem *xpt;
+        iopte_t __iomem *xptend;
        iounit = kzalloc(sizeof(struct iounit_struct), GFP_ATOMIC);
        if (!iounit) {
@@ -62,10 +65,10 @@ static void __init iounit_iommu_init(struct platform_device *op)
        op->dev.archdata.iommu = iounit;
        iounit->page_table = xpt;
        spin_lock_init(&iounit->lock);
-        
-        for (xptend = iounit->page_table + (16 * PAGE_SIZE) / sizeof(iopte_t);
+        xptend = iounit->page_table + (16 * PAGE_SIZE) / sizeof(iopte_t);
-             xpt < xptend;)
+        for (; xpt < xptend; xpt++)
-                iopte_val(*xpt++) = 0;
+                sbus_writel(0, xpt);
 }
 static int __init iounit_init(void)
@@ -130,7 +133,7 @@ nexti:	scan = find_next_zero_bit(iounit->bmap, limit, scan);
        vaddr = IOUNIT_DMA_BASE + (scan << PAGE_SHIFT) + (vaddr & ~PAGE_MASK);
        for (k = 0; k < npages; k++, iopte = __iopte(iopte_val(iopte) + 0x100), scan++) {
                set_bit(scan, iounit->bmap);
-                iounit->page_table[scan] = iopte;
+                sbus_writel(iopte, &iounit->page_table[scan]);
        }
        IOD(("%08lx\n", vaddr));
        return vaddr;
@@ -202,7 +205,7 @@ static int iounit_map_dma_area(struct device *dev, dma_addr_t *pba, unsigned lon
        struct iounit_struct *iounit = dev->archdata.iommu;
        unsigned long page, end;
        pgprot_t dvma_prot;
-        iopte_t *iopte;
+        iopte_t __iomem *iopte;
        *pba = addr;
@@ -224,8 +227,8 @@ static int iounit_map_dma_area(struct device *dev, dma_addr_t *pba, unsigned lon
                        
                        i = ((addr - IOUNIT_DMA_BASE) >> PAGE_SHIFT);
-                        iopte = (iopte_t *)(iounit->page_table + i);
+                        iopte = iounit->page_table + i;
-                        *iopte = MKIOPTE(__pa(page));
+                        sbus_writel(MKIOPTE(__pa(page)), iopte);
                }
                addr += PAGE_SIZE;
                va += PAGE_SIZE;
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index 28f96f27c768..491511d37e37 100644
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@@ -27,6 +27,8 @@
 #include <asm/iommu.h>
 #include <asm/dma.h>
+#include "mm_32.h"
 /*
 * This can be sized dynamically, but we will do this
 * only when we have a guidance about actual I/O pressures.
@@ -37,9 +39,6 @@
 #define IOMMU_NPTES     (IOMMU_WINSIZE/PAGE_SIZE)       /* 64K PTEs, 256KB */
 #define IOMMU_ORDER     6                               /* 4096 * (1<<6) */
-/* srmmu.c */
-extern int viking_mxcc_present;
-extern int flush_page_for_dma_global;
 static int viking_flush;
 /* viking.S */
 extern void viking_flush_page(unsigned long page);
@@ -59,6 +58,8 @@ static void __init sbus_iommu_init(struct platform_device *op)
        struct iommu_struct *iommu;
        unsigned int impl, vers;
        unsigned long *bitmap;
+        unsigned long control;
+        unsigned long base;
        unsigned long tmp;
        iommu = kmalloc(sizeof(struct iommu_struct), GFP_KERNEL);
@@ -73,12 +74,14 @@ static void __init sbus_iommu_init(struct platform_device *op)
                prom_printf("Cannot map IOMMU registers\n");
                prom_halt();
        }
-        impl = (iommu->regs->control & IOMMU_CTRL_IMPL) >> 28;
-        vers = (iommu->regs->control & IOMMU_CTRL_VERS) >> 24;
+        control = sbus_readl(&iommu->regs->control);
-        tmp = iommu->regs->control;
+        impl = (control & IOMMU_CTRL_IMPL) >> 28;
-        tmp &= ~(IOMMU_CTRL_RNGE);
+        vers = (control & IOMMU_CTRL_VERS) >> 24;
-        tmp |= (IOMMU_RNGE_256MB | IOMMU_CTRL_ENAB);
+        control &= ~(IOMMU_CTRL_RNGE);
-        iommu->regs->control = tmp;
+        control |= (IOMMU_RNGE_256MB | IOMMU_CTRL_ENAB);
+        sbus_writel(control, &iommu->regs->control);
        iommu_invalidate(iommu->regs);
        iommu->start = IOMMU_START;
        iommu->end = 0xffffffff;
@@ -100,7 +103,9 @@ static void __init sbus_iommu_init(struct platform_device *op)
        memset(iommu->page_table, 0, IOMMU_NPTES*sizeof(iopte_t));
        flush_cache_all();
        flush_tlb_all();
-        iommu->regs->base = __pa((unsigned long) iommu->page_table) >> 4;
+        base = __pa((unsigned long)iommu->page_table) >> 4;
+        sbus_writel(base, &iommu->regs->base);
        iommu_invalidate(iommu->regs);
        bitmap = kmalloc(IOMMU_NPTES>>3, GFP_KERNEL);
diff --git a/arch/sparc/mm/leon_mm.c b/arch/sparc/mm/leon_mm.c
index 5bed085a2c17..3b17b6f7895a 100644
--- a/arch/sparc/mm/leon_mm.c
+++ b/arch/sparc/mm/leon_mm.c
@@ -15,10 +15,10 @@
 #include <asm/leon.h>
 #include <asm/tlbflush.h>
-#include "srmmu.h"
+#include "mm_32.h"
 int leon_flush_during_switch = 1;
-int srmmu_swprobe_trace;
+static int srmmu_swprobe_trace;
 static inline unsigned long leon_get_ctable_ptr(void)
 {
diff --git a/arch/sparc/mm/mm_32.h b/arch/sparc/mm/mm_32.h
new file mode 100644
index 000000000000..a6c27ca9a721
--- /dev/null
+++ b/arch/sparc/mm/mm_32.h
@@ -0,0 +1,24 @@
+/* fault_32.c - visible as they are called from assembler */
+asmlinkage int lookup_fault(unsigned long pc, unsigned long ret_pc,
+                            unsigned long address);
+asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
+                               unsigned long address);
+void window_overflow_fault(void);
+void window_underflow_fault(unsigned long sp);
+void window_ret_fault(struct pt_regs *regs);
+/* srmmu.c */
+extern char *srmmu_name;
+extern int viking_mxcc_present;
+extern int flush_page_for_dma_global;
+extern void (*poke_srmmu)(void);
+void __init srmmu_paging_init(void);
+/* iommu.c */
+void ld_mmu_iommu(void);
+/* io-unit.c */
+void ld_mmu_iounit(void);
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index cfbe53c17b0d..be65f035d18a 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -49,7 +49,7 @@
 #include <asm/mxcc.h>
 #include <asm/ross.h>
-#include "srmmu.h"
+#include "mm_32.h"
 enum mbus_module srmmu_modtype;
 static unsigned int hwbug_bitmask;
@@ -100,7 +100,6 @@ static unsigned long srmmu_nocache_end;
 #define SRMMU_NOCACHE_ALIGN_MAX (sizeof(ctxd_t)*SRMMU_MAX_CONTEXTS)
 void *srmmu_nocache_pool;
-void *srmmu_nocache_bitmap;
 static struct bit_map srmmu_nocache_map;
 static inline int srmmu_pmd_none(pmd_t pmd)
@@ -173,7 +172,7 @@ static void *__srmmu_get_nocache(int size, int align)
                printk(KERN_ERR "srmmu: out of nocache %d: %d/%d\n",
                       size, (int) srmmu_nocache_size,
                       srmmu_nocache_map.used << SRMMU_NOCACHE_BITMAP_SHIFT);
-                return 0;
+                return NULL;
        }
        addr = SRMMU_NOCACHE_VADDR + (offset << SRMMU_NOCACHE_BITMAP_SHIFT);
@@ -269,6 +268,7 @@ static void __init srmmu_nocache_calcsize(void)
 static void __init srmmu_nocache_init(void)
 {
+        void *srmmu_nocache_bitmap;
        unsigned int bitmap_bits;
        pgd_t *pgd;
        pmd_t *pmd;
@@ -728,7 +728,7 @@ static inline unsigned long srmmu_probe(unsigned long vaddr)
                                     "=r" (retval) :
                                     "r" (vaddr | 0x400), "i" (ASI_M_FLUSH_PROBE));
        } else {
-                retval = leon_swprobe(vaddr, 0);
+                retval = leon_swprobe(vaddr, NULL);
        }
        return retval;
 }
@@ -865,8 +865,6 @@ static void __init map_kernel(void)
 void (*poke_srmmu)(void) = NULL;
-extern unsigned long bootmem_init(unsigned long *pages_avail);
 void __init srmmu_paging_init(void)
 {
        int i;
@@ -1771,9 +1769,6 @@ static struct sparc32_cachetlb_ops smp_cachetlb_ops = {
 /* Load up routines and constants for sun4m and sun4d mmu */
 void __init load_mmu(void)
 {
-        extern void ld_mmu_iommu(void);
-        extern void ld_mmu_iounit(void);
        /* Functions */
        get_srmmu_type();
diff --git a/arch/sparc/mm/srmmu.h b/arch/sparc/mm/srmmu.h
deleted file mode 100644
index 5703274ccf89..000000000000
--- a/arch/sparc/mm/srmmu.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* srmmu.c */
-extern char *srmmu_name;
-extern void (*poke_srmmu)(void);
diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c
index fe19b81acc09..a06576683c38 100644
--- a/arch/sparc/mm/tsb.c
+++ b/arch/sparc/mm/tsb.c
@@ -9,6 +9,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/mmu_context.h>
+#include <asm/setup.h>
 #include <asm/tsb.h>
 #include <asm/tlb.h>
 #include <asm/oplib.h>
diff --git a/arch/sparc/prom/misc_64.c b/arch/sparc/prom/misc_64.c
index f178b9dcc7b7..53a696d3eb3b 100644
--- a/arch/sparc/prom/misc_64.c
+++ b/arch/sparc/prom/misc_64.c
@@ -81,11 +81,6 @@ void prom_feval(const char *fstring)
 }
 EXPORT_SYMBOL(prom_feval);
-#ifdef CONFIG_SMP
-extern void smp_capture(void);
-extern void smp_release(void);
-#endif
 /* Drop into the prom, with the chance to continue with the 'go'
 * prom command.
 */
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index aafad6fa1667..928237a7b9ca 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -51,9 +51,6 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
        bool
-config ARCH_HAS_CPUFREQ
-        bool
 config GENERIC_HWEIGHT
        def_bool y
@@ -87,7 +84,6 @@ config ARCH_PUV3
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
        select ARCH_REQUIRE_GPIOLIB
-        select ARCH_HAS_CPUFREQ
 # CONFIGs for ARCH_PUV3
@@ -198,9 +194,7 @@ menu "Power management options"
 source "kernel/power/Kconfig"
-if ARCH_HAS_CPUFREQ
 source "drivers/cpufreq/Kconfig"
-endif
 config ARCH_SUSPEND_POSSIBLE
        def_bool y if !ARCH_FPGA
diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h
index 39decb6e6f57..cb1d8fd2b16b 100644
--- a/arch/unicore32/include/asm/io.h
+++ b/arch/unicore32/include/asm/io.h
@@ -39,10 +39,37 @@ extern void __uc32_iounmap(volatile void __iomem *addr);
 #define ioremap_nocache(cookie, size)   __uc32_ioremap(cookie, size)
 #define iounmap(cookie)                 __uc32_iounmap(cookie)
+#define readb_relaxed readb
+#define readw_relaxed readw
+#define readl_relaxed readl
 #define HAVE_ARCH_PIO_SIZE
 #define PIO_OFFSET              (unsigned int)(PCI_IOBASE)
 #define PIO_MASK                (unsigned int)(IO_SPACE_LIMIT)
 #define PIO_RESERVED            (PIO_OFFSET + PIO_MASK + 1)
+#ifdef CONFIG_STRICT_DEVMEM
+#include <linux/ioport.h>
+#include <linux/mm.h>
+/*
+ * devmem_is_allowed() checks to see if /dev/mem access to a certain
+ * address is valid. The argument is a physical page number.
+ * We mimic x86 here by disallowing access to system RAM as well as
+ * device-exclusive MMIO regions. This effectively disable read()/write()
+ * on /dev/mem.
+ */
+static inline int devmem_is_allowed(unsigned long pfn)
+{
+        if (iomem_is_exclusive(pfn << PAGE_SHIFT))
+                return 0;
+        if (!page_is_ram(pfn))
+                return 1;
+        return 0;
+}
+#endif /* CONFIG_STRICT_DEVMEM */
 #endif  /* __KERNEL__ */
 #endif  /* __UNICORE_IO_H__ */
diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
index 233c25880df4..ed6f7d000fba 100644
--- a/arch/unicore32/include/asm/pgtable.h
+++ b/arch/unicore32/include/asm/pgtable.h
@@ -87,16 +87,16 @@ extern pgprot_t pgprot_kernel;
 #define PAGE_NONE               pgprot_user
 #define PAGE_SHARED             __pgprot(pgprot_val(pgprot_user | PTE_READ \
-                                                                | PTE_WRITE)
+                                                                | PTE_WRITE))
 #define PAGE_SHARED_EXEC        __pgprot(pgprot_val(pgprot_user | PTE_READ \
                                                                | PTE_WRITE \
-                                                                | PTE_EXEC)
+                                                                | PTE_EXEC))
 #define PAGE_COPY               __pgprot(pgprot_val(pgprot_user | PTE_READ)
 #define PAGE_COPY_EXEC          __pgprot(pgprot_val(pgprot_user | PTE_READ \
-                                                                | PTE_EXEC)
+                                                                | PTE_EXEC))
-#define PAGE_READONLY           __pgprot(pgprot_val(pgprot_user | PTE_READ)
+#define PAGE_READONLY           __pgprot(pgprot_val(pgprot_user | PTE_READ))
 #define PAGE_READONLY_EXEC      __pgprot(pgprot_val(pgprot_user | PTE_READ \
-                                                                | PTE_EXEC)
+                                                                | PTE_EXEC))
 #define PAGE_KERNEL             pgprot_kernel
 #define PAGE_KERNEL_EXEC        __pgprot(pgprot_val(pgprot_kernel | PTE_EXEC))
diff --git a/arch/unicore32/include/asm/ptrace.h b/arch/unicore32/include/asm/ptrace.h
index 9df53d991c78..02bf5a415bf5 100644
--- a/arch/unicore32/include/asm/ptrace.h
+++ b/arch/unicore32/include/asm/ptrace.h
@@ -55,6 +55,7 @@ static inline int valid_user_regs(struct pt_regs *regs)
 #define instruction_pointer(regs)       ((regs)->UCreg_pc)
 #define user_stack_pointer(regs)        ((regs)->UCreg_sp)
+#define profile_pc(regs)                instruction_pointer(regs)
 #endif /* __ASSEMBLY__ */
 #endif
diff --git a/arch/unicore32/kernel/clock.c b/arch/unicore32/kernel/clock.c
index 18d4563e6fa5..b1ca775f6f6e 100644
--- a/arch/unicore32/kernel/clock.c
+++ b/arch/unicore32/kernel/clock.c
@@ -179,7 +179,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
        }
 #ifdef CONFIG_CPU_FREQ
        if (clk == &clk_mclk_clk) {
-                u32 pll_rate, divstatus = PM_DIVSTATUS;
+                u32 pll_rate, divstatus = readl(PM_DIVSTATUS);
                int ret, i;
                /* lookup mclk_clk_table */
@@ -201,10 +201,10 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
                                / (((divstatus & 0x0000f000) >> 12) + 1);
                /* set pll sys cfg reg. */
-                PM_PLLSYSCFG = pll_rate;
+                writel(pll_rate, PM_PLLSYSCFG);
-                PM_PMCR = PM_PMCR_CFBSYS;
+                writel(PM_PMCR_CFBSYS, PM_PMCR);
-                while ((PM_PLLDFCDONE & PM_PLLDFCDONE_SYSDFC)
+                while ((readl(PM_PLLDFCDONE) & PM_PLLDFCDONE_SYSDFC)
                                != PM_PLLDFCDONE_SYSDFC)
                        udelay(100);
                        /* about 1ms */
diff --git a/arch/unicore32/kernel/ksyms.c b/arch/unicore32/kernel/ksyms.c
index d285d71cbe35..0323528a80fd 100644
--- a/arch/unicore32/kernel/ksyms.c
+++ b/arch/unicore32/kernel/ksyms.c
@@ -23,41 +23,15 @@
 #include "ksyms.h"
+EXPORT_SYMBOL(find_first_bit);
+EXPORT_SYMBOL(find_first_zero_bit);
 EXPORT_SYMBOL(find_next_zero_bit);
 EXPORT_SYMBOL(find_next_bit);
-EXPORT_SYMBOL(__backtrace);
        /* platform dependent support */
 EXPORT_SYMBOL(__udelay);
 EXPORT_SYMBOL(__const_udelay);
-        /* networking */
-EXPORT_SYMBOL(csum_partial);
-EXPORT_SYMBOL(csum_partial_copy_from_user);
-EXPORT_SYMBOL(csum_partial_copy_nocheck);
-EXPORT_SYMBOL(__csum_ipv6_magic);
-        /* io */
-#ifndef __raw_readsb
-EXPORT_SYMBOL(__raw_readsb);
-#endif
-#ifndef __raw_readsw
-EXPORT_SYMBOL(__raw_readsw);
-#endif
-#ifndef __raw_readsl
-EXPORT_SYMBOL(__raw_readsl);
-#endif
-#ifndef __raw_writesb
-EXPORT_SYMBOL(__raw_writesb);
-#endif
-#ifndef __raw_writesw
-EXPORT_SYMBOL(__raw_writesw);
-#endif
-#ifndef __raw_writesl
-EXPORT_SYMBOL(__raw_writesl);
-#endif
        /* string / mem functions */
 EXPORT_SYMBOL(strchr);
 EXPORT_SYMBOL(strrchr);
@@ -76,23 +50,12 @@ EXPORT_SYMBOL(__copy_from_user);
 EXPORT_SYMBOL(__copy_to_user);
 EXPORT_SYMBOL(__clear_user);
-EXPORT_SYMBOL(__get_user_1);
-EXPORT_SYMBOL(__get_user_2);
-EXPORT_SYMBOL(__get_user_4);
-EXPORT_SYMBOL(__put_user_1);
-EXPORT_SYMBOL(__put_user_2);
-EXPORT_SYMBOL(__put_user_4);
-EXPORT_SYMBOL(__put_user_8);
 EXPORT_SYMBOL(__ashldi3);
 EXPORT_SYMBOL(__ashrdi3);
 EXPORT_SYMBOL(__divsi3);
 EXPORT_SYMBOL(__lshrdi3);
 EXPORT_SYMBOL(__modsi3);
-EXPORT_SYMBOL(__muldi3);
 EXPORT_SYMBOL(__ucmpdi2);
 EXPORT_SYMBOL(__udivsi3);
 EXPORT_SYMBOL(__umodsi3);
-EXPORT_SYMBOL(__bswapsi2);
diff --git a/arch/unicore32/kernel/ksyms.h b/arch/unicore32/kernel/ksyms.h
index 185cdc712d03..31472ad9467a 100644
--- a/arch/unicore32/kernel/ksyms.h
+++ b/arch/unicore32/kernel/ksyms.h
@@ -8,8 +8,6 @@ extern void __ashrdi3(void);
 extern void __divsi3(void);
 extern void __lshrdi3(void);
 extern void __modsi3(void);
-extern void __muldi3(void);
 extern void __ucmpdi2(void);
 extern void __udivsi3(void);
 extern void __umodsi3(void);
-extern void __bswapsi2(void);
diff --git a/arch/unicore32/kernel/module.c b/arch/unicore32/kernel/module.c
index 16bd1495b934..dc41f6dfedb6 100644
--- a/arch/unicore32/kernel/module.c
+++ b/arch/unicore32/kernel/module.c
@@ -24,14 +24,9 @@
 void *module_alloc(unsigned long size)
 {
-        struct vm_struct *area;
+        return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
+                                GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
-        size = PAGE_ALIGN(size);
+                                __builtin_return_address(0));
-        area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END);
-        if (!area)
-                return NULL;
-        return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL_EXEC);
 }
 int
diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c
index 778ebba80827..b008e9961465 100644
--- a/arch/unicore32/kernel/process.c
+++ b/arch/unicore32/kernel/process.c
@@ -60,6 +60,7 @@ void machine_halt(void)
 * Function pointers to optional machine specific functions
 */
 void (*pm_power_off)(void) = NULL;
+EXPORT_SYMBOL(pm_power_off);
 void machine_power_off(void)
 {
diff --git a/arch/unicore32/kernel/setup.c b/arch/unicore32/kernel/setup.c
index 87adbf5ebfe0..3fa317f96122 100644
--- a/arch/unicore32/kernel/setup.c
+++ b/arch/unicore32/kernel/setup.c
@@ -53,6 +53,10 @@ struct stack {
 static struct stack stacks[NR_CPUS];
+#ifdef CONFIG_VGA_CONSOLE
+struct screen_info screen_info;
+#endif
 char elf_platform[ELF_PLATFORM_SIZE];
 EXPORT_SYMBOL(elf_platform);
diff --git a/arch/unicore32/mm/alignment.c b/arch/unicore32/mm/alignment.c
index de7dc5fdd58b..24e836023e6c 100644
--- a/arch/unicore32/mm/alignment.c
+++ b/arch/unicore32/mm/alignment.c
@@ -21,6 +21,7 @@
 #include <linux/sched.h>
 #include <linux/uaccess.h>
+#include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <asm/unaligned.h>
diff --git a/arch/unicore32/mm/proc-syms.c b/arch/unicore32/mm/proc-syms.c
index f30071e3665d..21c00fc85c99 100644
--- a/arch/unicore32/mm/proc-syms.c
+++ b/arch/unicore32/mm/proc-syms.c
@@ -19,5 +19,7 @@
 EXPORT_SYMBOL(cpu_dcache_clean_area);
 EXPORT_SYMBOL(cpu_set_pte);
+EXPORT_SYMBOL(__cpuc_coherent_kern_range);
 EXPORT_SYMBOL(__cpuc_dma_flush_range);
 EXPORT_SYMBOL(__cpuc_dma_clean_range);
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index fcefdda5136d..a8f749ef0fdc 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1672,7 +1672,6 @@ config RELOCATABLE
 config RANDOMIZE_BASE
        bool "Randomize the address of the kernel image"
        depends on RELOCATABLE
-        depends on !HIBERNATION
        default n
        ---help---
           Randomizes the physical and virtual address at which the
diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c
index 4dbf967da50d..fc6091abedb7 100644
--- a/arch/x86/boot/compressed/aslr.c
+++ b/arch/x86/boot/compressed/aslr.c
@@ -289,10 +289,17 @@ unsigned char *choose_kernel_location(unsigned char *input,
        unsigned long choice = (unsigned long)output;
        unsigned long random;
+#ifdef CONFIG_HIBERNATION
+        if (!cmdline_find_option_bool("kaslr")) {
+                debug_putstr("KASLR disabled by default...\n");
+                goto out;
+        }
+#else
        if (cmdline_find_option_bool("nokaslr")) {
-                debug_putstr("KASLR disabled...\n");
+                debug_putstr("KASLR disabled by cmdline...\n");
                goto out;
        }
+#endif
        /* Record the various known unsafe memory ranges. */
        mem_avoid_init((unsigned long)input, input_size,
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index cb6cfcd034cf..a80cbb88ea91 100644
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -43,7 +43,7 @@ extern int vector_used_by_percpu_irq(unsigned int vector);
 extern void init_ISA_irqs(void);
 #ifdef CONFIG_X86_LOCAL_APIC
-void arch_trigger_all_cpu_backtrace(void);
+void arch_trigger_all_cpu_backtrace(bool);
 #define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace
 #endif
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 49314155b66c..49205d01b9ad 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -95,7 +95,7 @@ static inline gfn_t gfn_to_index(gfn_t gfn, gfn_t base_gfn, int level)
 #define KVM_REFILL_PAGES 25
 #define KVM_MAX_CPUID_ENTRIES 80
 #define KVM_NR_FIXED_MTRR_REGION 88
-#define KVM_NR_VAR_MTRR 8
+#define KVM_NR_VAR_MTRR 10
 #define ASYNC_PF_PER_VCPU 64
@@ -461,7 +461,7 @@ struct kvm_vcpu_arch {
        bool nmi_injected;    /* Trying to inject an NMI this entry */
        struct mtrr_state_type mtrr_state;
-        u32 pat;
+        u64 pat;
        unsigned switch_db_regs;
        unsigned long db[KVM_NR_DB_REGS];
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 14fd6fd75a19..6205f0c434db 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -231,6 +231,22 @@ static inline unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs,
 #define ARCH_HAS_USER_SINGLE_STEP_INFO
+/*
+ * When hitting ptrace_stop(), we cannot return using SYSRET because
+ * that does not restore the full CPU state, only a minimal set.  The
+ * ptracer can change arbitrary register values, which is usually okay
+ * because the usual ptrace stops run off the signal delivery path which
+ * forces IRET; however, ptrace_event() stops happen in arbitrary places
+ * in the kernel and don't force IRET path.
+ *
+ * So force IRET path after a ptrace stop.
+ */
+#define arch_ptrace_stop_needed(code, info)                             \
+({                                                                      \
+        set_thread_flag(TIF_NOTIFY_RESUME);                             \
+        false;                                                          \
+})
 struct user_desc;
 extern int do_get_thread_area(struct task_struct *p, int idx,
                              struct user_desc __user *info);
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index c3fcb5de5083..6a1e71bde323 100644
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -33,31 +33,41 @@ static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly;
 /* "in progress" flag of arch_trigger_all_cpu_backtrace */
 static unsigned long backtrace_flag;
-void arch_trigger_all_cpu_backtrace(void)
+void arch_trigger_all_cpu_backtrace(bool include_self)
 {
        int i;
+        int cpu = get_cpu();
-        if (test_and_set_bit(0, &backtrace_flag))
+        if (test_and_set_bit(0, &backtrace_flag)) {
                /*
                 * If there is already a trigger_all_cpu_backtrace() in progress
                 * (backtrace_flag == 1), don't output double cpu dump infos.
                 */
+                put_cpu();
                return;
+        }
        cpumask_copy(to_cpumask(backtrace_mask), cpu_online_mask);
+        if (!include_self)
+                cpumask_clear_cpu(cpu, to_cpumask(backtrace_mask));
-        printk(KERN_INFO "sending NMI to all CPUs:\n");
+        if (!cpumask_empty(to_cpumask(backtrace_mask))) {
-        apic->send_IPI_all(NMI_VECTOR);
+                pr_info("sending NMI to %s CPUs:\n",
+                        (include_self ? "all" : "other"));
+                apic->send_IPI_mask(to_cpumask(backtrace_mask), NMI_VECTOR);
+        }
        /* Wait for up to 10 seconds for all CPUs to do the backtrace */
        for (i = 0; i < 10 * 1000; i++) {
                if (cpumask_empty(to_cpumask(backtrace_mask)))
                        break;
                mdelay(1);
+                touch_softlockup_watchdog();
        }
        clear_bit(0, &backtrace_flag);
        smp_mb__after_atomic();
+        put_cpu();
 }
 static int
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index f0da82b8e634..dbaa23e78b36 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -423,9 +423,10 @@ sysenter_past_esp:
        jnz sysenter_audit
 sysenter_do_call:
        cmpl $(NR_syscalls), %eax
-        jae syscall_badsys
+        jae sysenter_badsys
        call *sys_call_table(,%eax,4)
        movl %eax,PT_EAX(%esp)
+sysenter_after_call:
        LOCKDEP_SYS_EXIT
        DISABLE_INTERRUPTS(CLBR_ANY)
        TRACE_IRQS_OFF
@@ -675,7 +676,12 @@ END(syscall_fault)
 syscall_badsys:
        movl $-ENOSYS,PT_EAX(%esp)
-        jmp resume_userspace
+        jmp syscall_exit
+END(syscall_badsys)
+sysenter_badsys:
+        movl $-ENOSYS,PT_EAX(%esp)
+        jmp sysenter_after_call
 END(syscall_badsys)
        CFI_ENDPROC
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index a0da58db43a8..2851d63c1202 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -363,7 +363,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
                /* Set up to return from userspace.  */
                restorer = current->mm->context.vdso +
-                        selected_vdso32->sym___kernel_sigreturn;
+                        selected_vdso32->sym___kernel_rt_sigreturn;
                if (ksig->ka.sa.sa_flags & SA_RESTORER)
                        restorer = ksig->ka.sa.sa_restorer;
                put_user_ex(restorer, &frame->pretcode);
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index c6eb418c5627..0d0e922fafc1 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -343,6 +343,7 @@ dotraplinkage void notrace do_int3(struct pt_regs *regs, long error_code)
        if (poke_int3_handler(regs))
                return;
+        prev_state = exception_enter();
 #ifdef CONFIG_KGDB_LOW_LEVEL_TRAP
        if (kgdb_ll_trap(DIE_INT3, "int3", regs, error_code, X86_TRAP_BP,
                                SIGTRAP) == NOTIFY_STOP)
@@ -351,9 +352,8 @@ dotraplinkage void notrace do_int3(struct pt_regs *regs, long error_code)
 #ifdef CONFIG_KPROBES
        if (kprobe_int3_handler(regs))
-                return;
+                goto exit;
 #endif
-        prev_state = exception_enter();
        if (notify_die(DIE_INT3, "int3", regs, error_code, X86_TRAP_BP,
                        SIGTRAP) == NOTIFY_STOP)
@@ -433,6 +433,8 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
        unsigned long dr6;
        int si_code;
+        prev_state = exception_enter();
        get_debugreg(dr6, 6);
        /* Filter out all the reserved bits which are preset to 1 */
@@ -465,7 +467,6 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
        if (kprobe_debug_handler(regs))
                goto exit;
 #endif
-        prev_state = exception_enter();
        if (notify_die(DIE_DEBUG, "debug", regs, (long)&dr6, error_code,
                                                        SIGTRAP) == NOTIFY_STOP)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index ec8366c5cfea..b5e994ad0135 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1462,6 +1462,7 @@ static void svm_get_segment(struct kvm_vcpu *vcpu,
                 */
                if (var->unusable)
                        var->db = 0;
+                var->dpl = to_svm(vcpu)->vmcb->save.cpl;
                break;
        }
 }
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index f32a02578c0d..f6449334ec45 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1898,7 +1898,7 @@ static int set_msr_hyperv_pw(struct kvm_vcpu *vcpu, u32 msr, u64 data)
                if (!(data & HV_X64_MSR_TSC_REFERENCE_ENABLE))
                        break;
                gfn = data >> HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT;
-                if (kvm_write_guest(kvm, data,
+                if (kvm_write_guest(kvm, gfn << HV_X64_MSR_TSC_REFERENCE_ADDRESS_SHIFT,
                        &tsc_ref, sizeof(tsc_ref)))
                        return 1;
                mark_page_dirty(kvm, gfn);
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index 3c0809a0631f..61b04fe36e66 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -11,7 +11,6 @@ VDSO32-$(CONFIG_COMPAT)		:= y
 # files to link into the vdso
 vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vdso-fakesections.o
-vobjs-nox32 := vdso-fakesections.o
 # files to link into kernel
 obj-y                           += vma.o
@@ -67,7 +66,8 @@ $(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso2c FORCE
 #
 CFL := $(PROFILING) -mcmodel=small -fPIC -O2 -fasynchronous-unwind-tables -m64 \
       $(filter -g%,$(KBUILD_CFLAGS)) $(call cc-option, -fno-stack-protector) \
-       -fno-omit-frame-pointer -foptimize-sibling-calls
+       -fno-omit-frame-pointer -foptimize-sibling-calls \
+       -DDISABLE_BRANCH_PROFILING
 $(vobjs): KBUILD_CFLAGS += $(CFL)
@@ -134,7 +134,7 @@ override obj-dirs = $(dir $(obj)) $(obj)/vdso32/
 targets += vdso32/vdso32.lds
 targets += vdso32/note.o vdso32/vclock_gettime.o $(vdso32.so-y:%=vdso32/%.o)
-targets += vdso32/vclock_gettime.o
+targets += vdso32/vclock_gettime.o vdso32/vdso-fakesections.o
 $(obj)/vdso32.o: $(vdso32-images:%=$(obj)/%)
@@ -150,11 +150,13 @@ KBUILD_CFLAGS_32 += -m32 -msoft-float -mregparm=0 -fpic
 KBUILD_CFLAGS_32 += $(call cc-option, -fno-stack-protector)
 KBUILD_CFLAGS_32 += $(call cc-option, -foptimize-sibling-calls)
 KBUILD_CFLAGS_32 += -fno-omit-frame-pointer
+KBUILD_CFLAGS_32 += -DDISABLE_BRANCH_PROFILING
 $(vdso32-images:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_32)
 $(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \
                                 $(obj)/vdso32/vdso32.lds \
                                 $(obj)/vdso32/vclock_gettime.o \
+                                 $(obj)/vdso32/vdso-fakesections.o \
                                 $(obj)/vdso32/note.o \
                                 $(obj)/vdso32/%.o
        $(call if_changed,vdso)
@@ -169,14 +171,24 @@ quiet_cmd_vdso = VDSO    $@
                 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
 VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
-        -Wl,-Bsymbolic $(LTO_CFLAGS)
+        $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
 GCOV_PROFILE := n
 #
-# Install the unstripped copies of vdso*.so.
+# Install the unstripped copies of vdso*.so.  If our toolchain supports
+# build-id, install .build-id links as well.
 #
 quiet_cmd_vdso_install = INSTALL $(@:install_%=%)
-      cmd_vdso_install = cp $< $(MODLIB)/vdso/$(@:install_%=%)
+define cmd_vdso_install
+        cp $< "$(MODLIB)/vdso/$(@:install_%=%)"; \
+        if readelf -n $< |grep -q 'Build ID'; then \
+          buildid=`readelf -n $< |grep 'Build ID' |sed -e 's/^.*Build ID: \(.*\)$$/\1/'`; \
+          first=`echo $$buildid | cut -b-2`; \
+          last=`echo $$buildid | cut -b3-`; \
+          mkdir -p "$(MODLIB)/vdso/.build-id/$$first"; \
+          ln -sf "../../$(@:install_%=%)" "$(MODLIB)/vdso/.build-id/$$first/$$last.debug"; \
+        fi
+endef
 vdso_img_insttargets := $(vdso_img_sodbg:%.dbg=install_%)
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
index b2e4f493e5b0..9793322751e0 100644
--- a/arch/x86/vdso/vclock_gettime.c
+++ b/arch/x86/vdso/vclock_gettime.c
@@ -11,9 +11,6 @@
 * Check with readelf after changing.
 */
-/* Disable profiling for userspace code: */
-#define DISABLE_BRANCH_PROFILING
 #include <uapi/linux/time.h>
 #include <asm/vgtod.h>
 #include <asm/hpet.h>
diff --git a/arch/x86/vdso/vdso-fakesections.c b/arch/x86/vdso/vdso-fakesections.c
index cb8a8d72c24b..aa5fbfab20a5 100644
--- a/arch/x86/vdso/vdso-fakesections.c
+++ b/arch/x86/vdso/vdso-fakesections.c
@@ -2,31 +2,20 @@
 * Copyright 2014 Andy Lutomirski
 * Subject to the GNU Public License, v.2
 *
- * Hack to keep broken Go programs working.
+ * String table for loadable section headers.  See vdso2c.h for why
- *
+ * this exists.
- * The Go runtime had a couple of bugs: it would read the section table to try
- * to figure out how many dynamic symbols there were (it shouldn't have looked
- * at the section table at all) and, if there were no SHT_SYNDYM section table
- * entry, it would use an uninitialized value for the number of symbols.  As a
- * workaround, we supply a minimal section table.  vdso2c will adjust the
- * in-memory image so that "vdso_fake_sections" becomes the section table.
- *
- * The bug was introduced by:
- * https://code.google.com/p/go/source/detail?r=56ea40aac72b (2012-08-31)
- * and is being addressed in the Go runtime in this issue:
- * https://code.google.com/p/go/issues/detail?id=8197
 */
-#ifndef __x86_64__
+const char fake_shstrtab[] __attribute__((section(".fake_shstrtab"))) =
-#error This hack is specific to the 64-bit vDSO
+        ".hash\0"
-#endif
+        ".dynsym\0"
+        ".dynstr\0"
-#include <linux/elf.h>
+        ".gnu.version\0"
+        ".gnu.version_d\0"
-extern const __visible struct elf64_shdr vdso_fake_sections[];
+        ".dynamic\0"
-const __visible struct elf64_shdr vdso_fake_sections[] = {
+        ".rodata\0"
-        {
+        ".fake_shstrtab\0"  /* Yay, self-referential code. */
-                .sh_type = SHT_DYNSYM,
+        ".note\0"
-                .sh_entsize = sizeof(Elf64_Sym),
+        ".eh_frame_hdr\0"
-        }
+        ".eh_frame\0"
-};
+        ".text";
diff --git a/arch/x86/vdso/vdso-layout.lds.S b/arch/x86/vdso/vdso-layout.lds.S
index 2ec72f651ebf..9197544eea9a 100644
--- a/arch/x86/vdso/vdso-layout.lds.S
+++ b/arch/x86/vdso/vdso-layout.lds.S
@@ -6,6 +6,16 @@
 * This script controls its layout.
 */
+#if defined(BUILD_VDSO64)
+# define SHDR_SIZE 64
+#elif defined(BUILD_VDSO32) || defined(BUILD_VDSOX32)
+# define SHDR_SIZE 40
+#else
+# error unknown VDSO target
+#endif
+#define NUM_FAKE_SHDRS 13
 SECTIONS
 {
        . = SIZEOF_HEADERS;
@@ -18,36 +28,53 @@ SECTIONS
        .gnu.version_d  : { *(.gnu.version_d) }
        .gnu.version_r  : { *(.gnu.version_r) }
+        .dynamic        : { *(.dynamic) }               :text   :dynamic
+        .rodata         : {
+                *(.rodata*)
+                *(.data*)
+                *(.sdata*)
+                *(.got.plt) *(.got)
+                *(.gnu.linkonce.d.*)
+                *(.bss*)
+                *(.dynbss*)
+                *(.gnu.linkonce.b.*)
+                /*
+                 * Ideally this would live in a C file, but that won't
+                 * work cleanly for x32 until we start building the x32
+                 * C code using an x32 toolchain.
+                 */
+                VDSO_FAKE_SECTION_TABLE_START = .;
+                . = . + NUM_FAKE_SHDRS * SHDR_SIZE;
+                VDSO_FAKE_SECTION_TABLE_END = .;
+        }                                               :text
+        .fake_shstrtab  : { *(.fake_shstrtab) }         :text
        .note           : { *(.note.*) }                :text   :note
        .eh_frame_hdr   : { *(.eh_frame_hdr) }          :text   :eh_frame_hdr
        .eh_frame       : { KEEP (*(.eh_frame)) }       :text
-        .dynamic        : { *(.dynamic) }               :text   :dynamic
-        .rodata         : { *(.rodata*) }               :text
-        .data           : {
-              *(.data*)
-              *(.sdata*)
-              *(.got.plt) *(.got)
-              *(.gnu.linkonce.d.*)
-              *(.bss*)
-              *(.dynbss*)
-              *(.gnu.linkonce.b.*)
-        }
-        .altinstructions        : { *(.altinstructions) }
-        .altinstr_replacement   : { *(.altinstr_replacement) }
        /*
-         * Align the actual code well away from the non-instruction data.
+         * Text is well-separated from actual data: there's plenty of
-         * This is the best thing for the I-cache.
+         * stuff that isn't used at runtime in between.
         */
-        . = ALIGN(0x100);
        .text           : { *(.text*) }                 :text   =0x90909090,
        /*
+         * At the end so that eu-elflint stays happy when vdso2c strips
+         * these.  A better implementation would avoid allocating space
+         * for these.
+         */
+        .altinstructions        : { *(.altinstructions) }       :text
+        .altinstr_replacement   : { *(.altinstr_replacement) }  :text
+        /*
         * The remainder of the vDSO consists of special pages that are
         * shared between the kernel and userspace.  It needs to be at the
         * end so that it doesn't overlap the mapping of the actual
@@ -75,6 +102,7 @@ SECTIONS
        /DISCARD/ : {
                *(.discard)
                *(.discard.*)
+                *(__bug_table)
        }
 }
diff --git a/arch/x86/vdso/vdso.lds.S b/arch/x86/vdso/vdso.lds.S
index 75e3404c83b1..6807932643c2 100644
--- a/arch/x86/vdso/vdso.lds.S
+++ b/arch/x86/vdso/vdso.lds.S
@@ -6,6 +6,8 @@
 * the DSO.
 */
+#define BUILD_VDSO64
 #include "vdso-layout.lds.S"
 /*
diff --git a/arch/x86/vdso/vdso2c.c b/arch/x86/vdso/vdso2c.c
index 7a6bf50f9165..238dbe82776e 100644
--- a/arch/x86/vdso/vdso2c.c
+++ b/arch/x86/vdso/vdso2c.c
@@ -23,6 +23,8 @@ enum {
        sym_vvar_page,
        sym_hpet_page,
        sym_end_mapping,
+        sym_VDSO_FAKE_SECTION_TABLE_START,
+        sym_VDSO_FAKE_SECTION_TABLE_END,
 };
 const int special_pages[] = {
@@ -30,15 +32,26 @@ const int special_pages[] = {
        sym_hpet_page,
 };
-char const * const required_syms[] = {
+struct vdso_sym {
-        [sym_vvar_page] = "vvar_page",
+        const char *name;
-        [sym_hpet_page] = "hpet_page",
+        bool export;
-        [sym_end_mapping] = "end_mapping",
+};
-        "VDSO32_NOTE_MASK",
-        "VDSO32_SYSENTER_RETURN",
+struct vdso_sym required_syms[] = {
-        "__kernel_vsyscall",
+        [sym_vvar_page] = {"vvar_page", true},
-        "__kernel_sigreturn",
+        [sym_hpet_page] = {"hpet_page", true},
-        "__kernel_rt_sigreturn",
+        [sym_end_mapping] = {"end_mapping", true},
+        [sym_VDSO_FAKE_SECTION_TABLE_START] = {
+                "VDSO_FAKE_SECTION_TABLE_START", false
+        },
+        [sym_VDSO_FAKE_SECTION_TABLE_END] = {
+                "VDSO_FAKE_SECTION_TABLE_END", false
+        },
+        {"VDSO32_NOTE_MASK", true},
+        {"VDSO32_SYSENTER_RETURN", true},
+        {"__kernel_vsyscall", true},
+        {"__kernel_sigreturn", true},
+        {"__kernel_rt_sigreturn", true},
 };
 __attribute__((format(printf, 1, 2))) __attribute__((noreturn))
@@ -83,37 +96,21 @@ extern void bad_put_le(void);
 #define NSYMS (sizeof(required_syms) / sizeof(required_syms[0]))
-#define BITS 64
+#define BITSFUNC3(name, bits) name##bits
-#define GOFUNC go64
+#define BITSFUNC2(name, bits) BITSFUNC3(name, bits)
-#define Elf_Ehdr Elf64_Ehdr
+#define BITSFUNC(name) BITSFUNC2(name, ELF_BITS)
-#define Elf_Shdr Elf64_Shdr
-#define Elf_Phdr Elf64_Phdr
+#define ELF_BITS_XFORM2(bits, x) Elf##bits##_##x
-#define Elf_Sym Elf64_Sym
+#define ELF_BITS_XFORM(bits, x) ELF_BITS_XFORM2(bits, x)
-#define Elf_Dyn Elf64_Dyn
+#define ELF(x) ELF_BITS_XFORM(ELF_BITS, x)
+#define ELF_BITS 64
 #include "vdso2c.h"
-#undef BITS
+#undef ELF_BITS
-#undef GOFUNC
-#undef Elf_Ehdr
+#define ELF_BITS 32
-#undef Elf_Shdr
-#undef Elf_Phdr
-#undef Elf_Sym
-#undef Elf_Dyn
-#define BITS 32
-#define GOFUNC go32
-#define Elf_Ehdr Elf32_Ehdr
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Phdr Elf32_Phdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Dyn Elf32_Dyn
 #include "vdso2c.h"
-#undef BITS
+#undef ELF_BITS
-#undef GOFUNC
-#undef Elf_Ehdr
-#undef Elf_Shdr
-#undef Elf_Phdr
-#undef Elf_Sym
-#undef Elf_Dyn
 static void go(void *addr, size_t len, FILE *outfile, const char *name)
 {
diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
index c6eefaf389b9..df95a2fdff73 100644
--- a/arch/x86/vdso/vdso2c.h
+++ b/arch/x86/vdso/vdso2c.h
@@ -4,23 +4,136 @@
 * are built for 32-bit userspace.
 */
-static void GOFUNC(void *addr, size_t len, FILE *outfile, const char *name)
+/*
+ * We're writing a section table for a few reasons:
+ *
+ * The Go runtime had a couple of bugs: it would read the section
+ * table to try to figure out how many dynamic symbols there were (it
+ * shouldn't have looked at the section table at all) and, if there
+ * were no SHT_SYNDYM section table entry, it would use an
+ * uninitialized value for the number of symbols.  An empty DYNSYM
+ * table would work, but I see no reason not to write a valid one (and
+ * keep full performance for old Go programs).  This hack is only
+ * needed on x86_64.
+ *
+ * The bug was introduced on 2012-08-31 by:
+ * https://code.google.com/p/go/source/detail?r=56ea40aac72b
+ * and was fixed on 2014-06-13 by:
+ * https://code.google.com/p/go/source/detail?r=fc1cd5e12595
+ *
+ * Binutils has issues debugging the vDSO: it reads the section table to
+ * find SHT_NOTE; it won't look at PT_NOTE for the in-memory vDSO, which
+ * would break build-id if we removed the section table.  Binutils
+ * also requires that shstrndx != 0.  See:
+ * https://sourceware.org/bugzilla/show_bug.cgi?id=17064
+ *
+ * elfutils might not look for PT_NOTE if there is a section table at
+ * all.  I don't know whether this matters for any practical purpose.
+ *
+ * For simplicity, rather than hacking up a partial section table, we
+ * just write a mostly complete one.  We omit non-dynamic symbols,
+ * though, since they're rather large.
+ *
+ * Once binutils gets fixed, we might be able to drop this for all but
+ * the 64-bit vdso, since build-id only works in kernel RPMs, and
+ * systems that update to new enough kernel RPMs will likely update
+ * binutils in sync.  build-id has never worked for home-built kernel
+ * RPMs without manual symlinking, and I suspect that no one ever does
+ * that.
+ */
+struct BITSFUNC(fake_sections)
+{
+        ELF(Shdr) *table;
+        unsigned long table_offset;
+        int count, max_count;
+        int in_shstrndx;
+        unsigned long shstr_offset;
+        const char *shstrtab;
+        size_t shstrtab_len;
+        int out_shstrndx;
+};
+static unsigned int BITSFUNC(find_shname)(struct BITSFUNC(fake_sections) *out,
+                                          const char *name)
+{
+        const char *outname = out->shstrtab;
+        while (outname - out->shstrtab < out->shstrtab_len) {
+                if (!strcmp(name, outname))
+                        return (outname - out->shstrtab) + out->shstr_offset;
+                outname += strlen(outname) + 1;
+        }
+        if (*name)
+                printf("Warning: could not find output name \"%s\"\n", name);
+        return out->shstr_offset + out->shstrtab_len - 1;  /* Use a null. */
+}
+static void BITSFUNC(init_sections)(struct BITSFUNC(fake_sections) *out)
+{
+        if (!out->in_shstrndx)
+                fail("didn't find the fake shstrndx\n");
+        memset(out->table, 0, out->max_count * sizeof(ELF(Shdr)));
+        if (out->max_count < 1)
+                fail("we need at least two fake output sections\n");
+        PUT_LE(&out->table[0].sh_type, SHT_NULL);
+        PUT_LE(&out->table[0].sh_name, BITSFUNC(find_shname)(out, ""));
+        out->count = 1;
+}
+static void BITSFUNC(copy_section)(struct BITSFUNC(fake_sections) *out,
+                                   int in_idx, const ELF(Shdr) *in,
+                                   const char *name)
+{
+        uint64_t flags = GET_LE(&in->sh_flags);
+        bool copy = flags & SHF_ALLOC &&
+                strcmp(name, ".altinstructions") &&
+                strcmp(name, ".altinstr_replacement");
+        if (!copy)
+                return;
+        if (out->count >= out->max_count)
+                fail("too many copied sections (max = %d)\n", out->max_count);
+        if (in_idx == out->in_shstrndx)
+                out->out_shstrndx = out->count;
+        out->table[out->count] = *in;
+        PUT_LE(&out->table[out->count].sh_name,
+               BITSFUNC(find_shname)(out, name));
+        /* elfutils requires that a strtab have the correct type. */
+        if (!strcmp(name, ".fake_shstrtab"))
+                PUT_LE(&out->table[out->count].sh_type, SHT_STRTAB);
+        out->count++;
+}
+static void BITSFUNC(go)(void *addr, size_t len,
+                         FILE *outfile, const char *name)
 {
        int found_load = 0;
        unsigned long load_size = -1;  /* Work around bogus warning */
        unsigned long data_size;
-        Elf_Ehdr *hdr = (Elf_Ehdr *)addr;
+        ELF(Ehdr) *hdr = (ELF(Ehdr) *)addr;
        int i;
        unsigned long j;
-        Elf_Shdr *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
+        ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
                *alt_sec = NULL;
-        Elf_Dyn *dyn = 0, *dyn_end = 0;
+        ELF(Dyn) *dyn = 0, *dyn_end = 0;
        const char *secstrings;
        uint64_t syms[NSYMS] = {};
-        uint64_t fake_sections_value = 0, fake_sections_size = 0;
+        struct BITSFUNC(fake_sections) fake_sections = {};
-        Elf_Phdr *pt = (Elf_Phdr *)(addr + GET_LE(&hdr->e_phoff));
+        ELF(Phdr) *pt = (ELF(Phdr) *)(addr + GET_LE(&hdr->e_phoff));
        /* Walk the segment table. */
        for (i = 0; i < GET_LE(&hdr->e_phnum); i++) {
@@ -51,7 +164,7 @@ static void GOFUNC(void *addr, size_t len, FILE *outfile, const char *name)
        for (i = 0; dyn + i < dyn_end &&
                     GET_LE(&dyn[i].d_tag) != DT_NULL; i++) {
                typeof(dyn[i].d_tag) tag = GET_LE(&dyn[i].d_tag);
-                if (tag == DT_REL || tag == DT_RELSZ ||
+                if (tag == DT_REL || tag == DT_RELSZ || tag == DT_RELA ||
                    tag == DT_RELENT || tag == DT_TEXTREL)
                        fail("vdso image contains dynamic relocations\n");
        }
@@ -61,7 +174,7 @@ static void GOFUNC(void *addr, size_t len, FILE *outfile, const char *name)
                GET_LE(&hdr->e_shentsize)*GET_LE(&hdr->e_shstrndx);
        secstrings = addr + GET_LE(&secstrings_hdr->sh_offset);
        for (i = 0; i < GET_LE(&hdr->e_shnum); i++) {
-                Elf_Shdr *sh = addr + GET_LE(&hdr->e_shoff) +
+                ELF(Shdr) *sh = addr + GET_LE(&hdr->e_shoff) +
                        GET_LE(&hdr->e_shentsize) * i;
                if (GET_LE(&sh->sh_type) == SHT_SYMTAB)
                        symtab_hdr = sh;
@@ -82,29 +195,63 @@ static void GOFUNC(void *addr, size_t len, FILE *outfile, const char *name)
             i < GET_LE(&symtab_hdr->sh_size) / GET_LE(&symtab_hdr->sh_entsize);
             i++) {
                int k;
-                Elf_Sym *sym = addr + GET_LE(&symtab_hdr->sh_offset) +
+                ELF(Sym) *sym = addr + GET_LE(&symtab_hdr->sh_offset) +
                        GET_LE(&symtab_hdr->sh_entsize) * i;
                const char *name = addr + GET_LE(&strtab_hdr->sh_offset) +
                        GET_LE(&sym->st_name);
                for (k = 0; k < NSYMS; k++) {
-                        if (!strcmp(name, required_syms[k])) {
+                        if (!strcmp(name, required_syms[k].name)) {
                                if (syms[k]) {
                                        fail("duplicate symbol %s\n",
-                                             required_syms[k]);
+                                             required_syms[k].name);
                                }
                                syms[k] = GET_LE(&sym->st_value);
                        }
                }
-                if (!strcmp(name, "vdso_fake_sections")) {
+                if (!strcmp(name, "fake_shstrtab")) {
-                        if (fake_sections_value)
+                        ELF(Shdr) *sh;
-                                fail("duplicate vdso_fake_sections\n");
-                        fake_sections_value = GET_LE(&sym->st_value);
+                        fake_sections.in_shstrndx = GET_LE(&sym->st_shndx);
-                        fake_sections_size = GET_LE(&sym->st_size);
+                        fake_sections.shstrtab = addr + GET_LE(&sym->st_value);
+                        fake_sections.shstrtab_len = GET_LE(&sym->st_size);
+                        sh = addr + GET_LE(&hdr->e_shoff) +
+                                GET_LE(&hdr->e_shentsize) *
+                                fake_sections.in_shstrndx;
+                        fake_sections.shstr_offset = GET_LE(&sym->st_value) -
+                                GET_LE(&sh->sh_addr);
                }
        }
+        /* Build the output section table. */
+        if (!syms[sym_VDSO_FAKE_SECTION_TABLE_START] ||
+            !syms[sym_VDSO_FAKE_SECTION_TABLE_END])
+                fail("couldn't find fake section table\n");
+        if ((syms[sym_VDSO_FAKE_SECTION_TABLE_END] -
+             syms[sym_VDSO_FAKE_SECTION_TABLE_START]) % sizeof(ELF(Shdr)))
+                fail("fake section table size isn't a multiple of sizeof(Shdr)\n");
+        fake_sections.table = addr + syms[sym_VDSO_FAKE_SECTION_TABLE_START];
+        fake_sections.table_offset = syms[sym_VDSO_FAKE_SECTION_TABLE_START];
+        fake_sections.max_count = (syms[sym_VDSO_FAKE_SECTION_TABLE_END] -
+                                   syms[sym_VDSO_FAKE_SECTION_TABLE_START]) /
+                sizeof(ELF(Shdr));
+        BITSFUNC(init_sections)(&fake_sections);
+        for (i = 0; i < GET_LE(&hdr->e_shnum); i++) {
+                ELF(Shdr) *sh = addr + GET_LE(&hdr->e_shoff) +
+                        GET_LE(&hdr->e_shentsize) * i;
+                BITSFUNC(copy_section)(&fake_sections, i, sh,
+                                       secstrings + GET_LE(&sh->sh_name));
+        }
+        if (!fake_sections.out_shstrndx)
+                fail("didn't generate shstrndx?!?\n");
+        PUT_LE(&hdr->e_shoff, fake_sections.table_offset);
+        PUT_LE(&hdr->e_shentsize, sizeof(ELF(Shdr)));
+        PUT_LE(&hdr->e_shnum, fake_sections.count);
+        PUT_LE(&hdr->e_shstrndx, fake_sections.out_shstrndx);
        /* Validate mapping addresses. */
        for (i = 0; i < sizeof(special_pages) / sizeof(special_pages[0]); i++) {
                if (!syms[i])
@@ -112,25 +259,17 @@ static void GOFUNC(void *addr, size_t len, FILE *outfile, const char *name)
                if (syms[i] % 4096)
                        fail("%s must be a multiple of 4096\n",
-                             required_syms[i]);
+                             required_syms[i].name);
                if (syms[i] < data_size)
                        fail("%s must be after the text mapping\n",
-                             required_syms[i]);
+                             required_syms[i].name);
                if (syms[sym_end_mapping] < syms[i] + 4096)
-                        fail("%s overruns end_mapping\n", required_syms[i]);
+                        fail("%s overruns end_mapping\n",
+                             required_syms[i].name);
        }
        if (syms[sym_end_mapping] % 4096)
                fail("end_mapping must be a multiple of 4096\n");
-        /* Remove sections or use fakes */
-        if (fake_sections_size % sizeof(Elf_Shdr))
-                fail("vdso_fake_sections size is not a multiple of %ld\n",
-                     (long)sizeof(Elf_Shdr));
-        PUT_LE(&hdr->e_shoff, fake_sections_value);
-        PUT_LE(&hdr->e_shentsize, fake_sections_value ? sizeof(Elf_Shdr) : 0);
-        PUT_LE(&hdr->e_shnum, fake_sections_size / sizeof(Elf_Shdr));
-        PUT_LE(&hdr->e_shstrndx, SHN_UNDEF);
        if (!name) {
                fwrite(addr, load_size, 1, outfile);
                return;
@@ -168,9 +307,9 @@ static void GOFUNC(void *addr, size_t len, FILE *outfile, const char *name)
                        (unsigned long)GET_LE(&alt_sec->sh_size));
        }
        for (i = 0; i < NSYMS; i++) {
-                if (syms[i])
+                if (required_syms[i].export && syms[i])
                        fprintf(outfile, "\t.sym_%s = 0x%" PRIx64 ",\n",
-                                required_syms[i], syms[i]);
+                                required_syms[i].name, syms[i]);
        }
        fprintf(outfile, "};\n");
 }
diff --git a/arch/x86/vdso/vdso32/vdso-fakesections.c b/arch/x86/vdso/vdso32/vdso-fakesections.c
new file mode 100644
index 000000000000..541468e25265
--- /dev/null
+++ b/arch/x86/vdso/vdso32/vdso-fakesections.c
@@ -0,0 +1 @@
+#include "../vdso-fakesections.c"
diff --git a/arch/x86/vdso/vdsox32.lds.S b/arch/x86/vdso/vdsox32.lds.S
index 46b991b578a8..697c11ece90c 100644
--- a/arch/x86/vdso/vdsox32.lds.S
+++ b/arch/x86/vdso/vdsox32.lds.S
@@ -6,6 +6,8 @@
 * the DSO.
 */
+#define BUILD_VDSOX32
 #include "vdso-layout.lds.S"
 /*
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index f17b29210ac4..ffb101e45731 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1537,7 +1537,10 @@ asmlinkage __visible void __init xen_start_kernel(void)
        if (!xen_pvh_domain())
                pv_cpu_ops = xen_cpu_ops;
-        x86_init.resources.memory_setup = xen_memory_setup;
+        if (xen_feature(XENFEAT_auto_translated_physmap))
+                x86_init.resources.memory_setup = xen_auto_xlated_memory_setup;
+        else
+                x86_init.resources.memory_setup = xen_memory_setup;
        x86_init.oem.arch_setup = xen_arch_setup;
        x86_init.oem.banner = xen_banner;
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 821a11ada590..2e555163c2fe 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -27,7 +27,6 @@
 #include <xen/interface/memory.h>
 #include <xen/interface/physdev.h>
 #include <xen/features.h>
-#include "mmu.h"
 #include "xen-ops.h"
 #include "vdso.h"
@@ -82,9 +81,6 @@ static void __init xen_add_extra_mem(u64 start, u64 size)
        memblock_reserve(start, size);
-        if (xen_feature(XENFEAT_auto_translated_physmap))
-                return;
        xen_max_p2m_pfn = PFN_DOWN(start + size);
        for (pfn = PFN_DOWN(start); pfn < xen_max_p2m_pfn; pfn++) {
                unsigned long mfn = pfn_to_mfn(pfn);
@@ -107,7 +103,6 @@ static unsigned long __init xen_do_chunk(unsigned long start,
                .domid        = DOMID_SELF
        };
        unsigned long len = 0;
-        int xlated_phys = xen_feature(XENFEAT_auto_translated_physmap);
        unsigned long pfn;
        int ret;
@@ -121,7 +116,7 @@ static unsigned long __init xen_do_chunk(unsigned long start,
                                continue;
                        frame = mfn;
                } else {
-                        if (!xlated_phys && mfn != INVALID_P2M_ENTRY)
+                        if (mfn != INVALID_P2M_ENTRY)
                                continue;
                        frame = pfn;
                }
@@ -159,13 +154,6 @@ static unsigned long __init xen_do_chunk(unsigned long start,
 static unsigned long __init xen_release_chunk(unsigned long start,
                                              unsigned long end)
 {
-        /*
-         * Xen already ballooned out the E820 non RAM regions for us
-         * and set them up properly in EPT.
-         */
-        if (xen_feature(XENFEAT_auto_translated_physmap))
-                return end - start;
        return xen_do_chunk(start, end, true);
 }
@@ -234,13 +222,7 @@ static void __init xen_set_identity_and_release_chunk(
         * (except for the ISA region which must be 1:1 mapped) to
         * release the refcounts (in Xen) on the original frames.
         */
+        for (pfn = start_pfn; pfn <= max_pfn_mapped && pfn < end_pfn; pfn++) {
-        /*
-         * PVH E820 matches the hypervisor's P2M which means we need to
-         * account for the proper values of *release and *identity.
-         */
-        for (pfn = start_pfn; !xen_feature(XENFEAT_auto_translated_physmap) &&
-             pfn <= max_pfn_mapped && pfn < end_pfn; pfn++) {
                pte_t pte = __pte_ma(0);
                if (pfn < PFN_UP(ISA_END_ADDRESS))
@@ -518,6 +500,35 @@ char * __init xen_memory_setup(void)
 }
 /*
+ * Machine specific memory setup for auto-translated guests.
+ */
+char * __init xen_auto_xlated_memory_setup(void)
+{
+        static struct e820entry map[E820MAX] __initdata;
+        struct xen_memory_map memmap;
+        int i;
+        int rc;
+        memmap.nr_entries = E820MAX;
+        set_xen_guest_handle(memmap.buffer, map);
+        rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);
+        if (rc < 0)
+                panic("No memory map (%d)\n", rc);
+        sanitize_e820_map(map, ARRAY_SIZE(map), &memmap.nr_entries);
+        for (i = 0; i < memmap.nr_entries; i++)
+                e820_add_region(map[i].addr, map[i].size, map[i].type);
+        memblock_reserve(__pa(xen_start_info->mfn_list),
+                         xen_start_info->pt_base - xen_start_info->mfn_list);
+        return "Xen";
+}
+/*
 * Set the bit indicating "nosegneg" library variants should be used.
 * We only need to bother in pure 32-bit mode; compat 32-bit processes
 * can have un-truncated segments, so wrapping around is allowed.
@@ -590,13 +601,7 @@ void xen_enable_syscall(void)
        }
 #endif /* CONFIG_X86_64 */
 }
-void xen_enable_nmi(void)
-{
-#ifdef CONFIG_X86_64
-        if (register_callback(CALLBACKTYPE_nmi, (char *)nmi))
-                BUG();
-#endif
-}
 void __init xen_pvmmu_arch_setup(void)
 {
        HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments);
@@ -611,7 +616,6 @@ void __init xen_pvmmu_arch_setup(void)
        xen_enable_sysenter();
        xen_enable_syscall();
-        xen_enable_nmi();
 }
 /* This function is not called for HVM domains */
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index c834d4b231f0..97d87659f779 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -36,6 +36,7 @@ void xen_mm_unpin_all(void);
 void xen_set_pat(u64);
 char * __init xen_memory_setup(void);
+char * xen_auto_xlated_memory_setup(void);
 void __init xen_arch_setup(void);
 void xen_enable_sysenter(void);
 void xen_enable_syscall(void);