Merge branch 'kirkwood_boards_for_v3.5' of git://git.infradead.org/users/jcooper/linux into next/boards

* 'kirkwood_boards_for_v3.5' of git://git.infradead.org/users/jcooper/linux: ARM: kirkwood: Add support for RaidSonic IB-NAS6210/6220 using devicetree kirkwood: Add iconnect support orion/kirkwood: create a generic function for gpio led blinking kirkwood/orion: fix orion_gpio_set_blink ARM: kirkwood: Define DNS-320/DNS-325 NAND in fdt kirkwood: Allow nand to be configured via. devicetree mtd: Add orion_nand devicetree bindings ARM: kirkwood: Basic support for DNS-320 and DNS-325 Includes an update to v3.4-rc7 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
author: Arnd Bergmann <arnd@arndb.de> 2012-05-15 04:41:07 -0400
committer: Arnd Bergmann <arnd@arndb.de> 2012-05-15 04:41:07 -0400
commit: 423b742bec02b6c8d4e060517ce05b4cd3fd91c1 (patch)
tree: 3d4e090581970646d0afc92166bd490cc4977021
parent: be944f1e79063e4f27b46c74f10c86b2387afa9f (diff)
parent: f5520363532690f56e12126029864d9383d5203f (diff)
142 files changed, 1736 insertions, 672 deletions
diff --git a/Documentation/devicetree/bindings/mtd/orion-nand.txt b/Documentation/devicetree/bindings/mtd/orion-nand.txt
new file mode 100644
index 000000000000..b2356b7d2fa4
--- /dev/null
+++ b/Documentation/devicetree/bindings/mtd/orion-nand.txt
@@ -0,0 +1,50 @@
+NAND support for Marvell Orion SoC platforms
+Required properties:
+- compatible : "mrvl,orion-nand".
+- reg : Base physical address of the NAND and length of memory mapped
+        region
+Optional properties:
+- cle : Address line number connected to CLE. Default is 0
+- ale : Address line number connected to ALE. Default is 1
+- bank-width : Width in bytes of the device. Default is 1
+- chip-delay : Chip dependent delay for transferring data from array to read
+               registers in usecs
+The device tree may optionally contain sub-nodes describing partitions of the
+address space. See partition.txt for more detail.
+Example:
+nand@f4000000 {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        cle = <0>;
+        ale = <1>;
+        bank-width = <1>;
+        chip-delay = <25>;
+        compatible = "mrvl,orion-nand";
+        reg = <0xf4000000 0x400>;
+        partition@0 {
+                label = "u-boot";
+                reg = <0x0000000 0x100000>;
+                read-only;
+        };
+        partition@100000 {
+                label = "uImage";
+                reg = <0x0100000 0x200000>;
+        };
+        partition@300000 {
+                label = "dtb";
+                reg = <0x0300000 0x100000>;
+        };
+        partition@400000 {
+                label = "root";
+                reg = <0x0400000 0x7d00000>;
+        };
+};
diff --git a/MAINTAINERS b/MAINTAINERS
index 707163365a93..b36270986501 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1968,7 +1968,9 @@ S:	Maintained
 F:      drivers/net/ethernet/ti/cpmac.c
 CPU FREQUENCY DRIVERS
+M:      Rafael J. Wysocki <rjw@sisk.pl>
 L:      cpufreq@vger.kernel.org
+L:      linux-pm@vger.kernel.org
 S:      Maintained
 F:      drivers/cpufreq/
 F:      include/linux/cpufreq.h
@@ -4034,6 +4036,7 @@ F:	Documentation/scsi/53c700.txt
 F:      drivers/scsi/53c700*
 LED SUBSYSTEM
+M:      Bryan Wu <bryan.wu@canonical.com>
 M:      Richard Purdie <rpurdie@rpsys.net>
 S:      Maintained
 F:      drivers/leds/
diff --git a/Makefile b/Makefile
index 9e384ae6c403..48bd1f50dcc3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 4
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
 NAME = Saber-toothed Squirrel
 # *DOCUMENTATION*
diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
new file mode 100644
index 000000000000..dc09a735b04a
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts
@@ -0,0 +1,64 @@
+/dts-v1/;
+/include/ "kirkwood.dtsi"
+/ {
+        model = "D-Link DNS-320 NAS (Rev A1)";
+        compatible = "dlink,dns-320-a1", "dlink,dns-320", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x8000000>;
+        };
+        chosen {
+                bootargs = "console=ttyS0,115200n8 earlyprintk";
+        };
+        ocp@f1000000 {
+                serial@12000 {
+                        clock-frequency = <166666667>;
+                        status = "okay";
+                };
+                serial@12100 {
+                        clock-frequency = <166666667>;
+                        status = "okay";
+                };
+                nand@3000000 {
+                        status = "okay";
+                        partition@0 {
+                                label = "u-boot";
+                                reg = <0x0000000 0x100000>;
+                                read-only;
+                        };
+                        partition@100000 {
+                                label = "uImage";
+                                reg = <0x0100000 0x500000>;
+                        };
+                        partition@600000 {
+                                label = "ramdisk";
+                                reg = <0x0600000 0x500000>;
+                        };
+                        partition@b00000 {
+                                label = "image";
+                                reg = <0x0b00000 0x6600000>;
+                        };
+                        partition@7100000 {
+                                label = "mini firmware";
+                                reg = <0x7100000 0xa00000>;
+                        };
+                        partition@7b00000 {
+                                label = "config";
+                                reg = <0x7b00000 0x500000>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts
new file mode 100644
index 000000000000..c2a5562525d2
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-dns325.dts
@@ -0,0 +1,59 @@
+/dts-v1/;
+/include/ "kirkwood.dtsi"
+/ {
+        model = "D-Link DNS-325 NAS (Rev A1)";
+        compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+        chosen {
+                bootargs = "console=ttyS0,115200n8 earlyprintk";
+        };
+        ocp@f1000000 {
+                serial@12000 {
+                        clock-frequency = <200000000>;
+                        status = "okay";
+                };
+                nand@3000000 {
+                        status = "okay";
+                        partition@0 {
+                                label = "u-boot";
+                                reg = <0x0000000 0x100000>;
+                                read-only;
+                        };
+                        partition@100000 {
+                                label = "uImage";
+                                reg = <0x0100000 0x500000>;
+                        };
+                        partition@600000 {
+                                label = "ramdisk";
+                                reg = <0x0600000 0x500000>;
+                        };
+                        partition@b00000 {
+                                label = "image";
+                                reg = <0x0b00000 0x6600000>;
+                        };
+                        partition@7100000 {
+                                label = "mini firmware";
+                                reg = <0x7100000 0xa00000>;
+                        };
+                        partition@7b00000 {
+                                label = "config";
+                                reg = <0x7b00000 0x500000>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
new file mode 100644
index 000000000000..ada0f0c23085
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -0,0 +1,44 @@
+/dts-v1/;
+/include/ "kirkwood.dtsi"
+/ {
+        model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
+        compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0",  "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+        chosen {
+                bootargs = "console=ttyS0,115200n8 earlyprintk";
+        };
+        ocp@f1000000 {
+                serial@12000 {
+                        clock-frequency = <200000000>;
+                        status = "okay";
+                };
+                nand@3000000 {
+                        status = "okay";
+                        partition@0 {
+                                label = "u-boot";
+                                reg = <0x0000000 0x100000>;
+                        };
+                        partition@100000 {
+                                label = "uImage";
+                                reg = <0x0100000 0x600000>;
+                        };
+                        partition@700000 {
+                                label = "root";
+                                reg = <0x0700000 0xf900000>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
new file mode 100644
index 000000000000..1ba75d4adecc
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -0,0 +1,26 @@
+/dts-v1/;
+/include/ "kirkwood.dtsi"
+/ {
+        model = "Iomega Iconnect";
+        compatible = "iom,iconnect-1.1", "iom,iconnect", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+        chosen {
+                bootargs = "console=ttyS0,115200n8 earlyprintk mtdparts=orion_nand:0xc0000@0x0(uboot),0x20000@0xa0000(env),0x300000@0x100000(zImage),0x300000@0x540000(initrd),0x1f400000@0x980000(boot)";
+                linux,initrd-start = <0x4500040>;
+                linux,initrd-end   = <0x4800000>;
+        };
+        ocp@f1000000 {
+                serial@12000 {
+                        clock-frequency = <200000000>;
+                        status = "ok";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 3474ef890945..926528b81baa 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -5,7 +5,7 @@
        ocp@f1000000 {
                compatible = "simple-bus";
-                ranges = <0 0xf1000000 0x1000000>;
+                ranges = <0 0xf1000000 0x4000000>;
                #address-cells = <1>;
                #size-cells = <1>;
@@ -32,5 +32,18 @@
                        reg = <0x10300 0x20>;
                        interrupts = <53>;
                };
+                nand@3000000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        cle = <0>;
+                        ale = <1>;
+                        bank-width = <1>;
+                        compatible = "mrvl,orion-nand";
+                        reg = <0x3000000 0x400>;
+                        chip-delay = <25>;
+                        /* set partition map and/or chip-delay in board dts */
+                        status = "disabled";
+                };
        };
 };
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 80abafb9bf33..9650c143afc1 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -906,27 +906,14 @@ long arch_ptrace(struct task_struct *child, long request,
        return ret;
 }
-#ifdef __ARMEB__
-#define AUDIT_ARCH_NR AUDIT_ARCH_ARMEB
-#else
-#define AUDIT_ARCH_NR AUDIT_ARCH_ARM
-#endif
 asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
 {
        unsigned long ip;
-        /*
+        if (why)
-         * Save IP.  IP is used to denote syscall entry/exit:
-         *  IP = 0 -> entry, = 1 -> exit
-         */
-        ip = regs->ARM_ip;
-        regs->ARM_ip = why;
-        if (!ip)
                audit_syscall_exit(regs);
        else
-                audit_syscall_entry(AUDIT_ARCH_NR, scno, regs->ARM_r0,
+                audit_syscall_entry(AUDIT_ARCH_ARM, scno, regs->ARM_r0,
                                    regs->ARM_r1, regs->ARM_r2, regs->ARM_r3);
        if (!test_thread_flag(TIF_SYSCALL_TRACE))
@@ -936,6 +923,13 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
        current_thread_info()->syscall = scno;
+        /*
+         * IP is used to denote syscall entry/exit:
+         * IP = 0 -> entry, =1 -> exit
+         */
+        ip = regs->ARM_ip;
+        regs->ARM_ip = why;
        /* the 0x80 provides a way for the tracing parent to distinguish
           between a syscall stop and SIGTRAP delivery */
        ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index f6a4d32b0421..8f4644659777 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -251,8 +251,6 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
        struct mm_struct *mm = &init_mm;
        unsigned int cpu = smp_processor_id();
-        printk("CPU%u: Booted secondary processor\n", cpu);
        /*
         * All kernel threads share the same mm context; grab a
         * reference and switch to it.
@@ -264,6 +262,8 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
        enter_lazy_tlb(mm, current);
        local_flush_tlb_all();
+        printk("CPU%u: Booted secondary processor\n", cpu);
        cpu_init();
        preempt_disable();
        trace_hardirqs_off();
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index d2b177905cdb..76cbb055dd05 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -115,7 +115,7 @@ int kernel_execve(const char *filename,
                  "Ir" (THREAD_START_SP - sizeof(regs)),
                  "r" (&regs),
                  "Ir" (sizeof(regs))
-                : "r0", "r1", "r2", "r3", "ip", "lr", "memory");
+                : "r0", "r1", "r2", "r3", "r8", "r9", "ip", "lr", "memory");
 out:
        return ret;
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 366daff79458..2808e471cdcc 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -233,6 +233,9 @@ config MACH_ARMLEX4210
 config MACH_UNIVERSAL_C210
        bool "Mobile UNIVERSAL_C210 Board"
        select CPU_EXYNOS4210
+        select S5P_HRT
+        select CLKSRC_MMIO
+        select HAVE_SCHED_CLOCK
        select S5P_GPIO_INT
        select S5P_DEV_FIMC0
        select S5P_DEV_FIMC1
diff --git a/arch/arm/mach-exynos/clock-exynos5.c b/arch/arm/mach-exynos/clock-exynos5.c
index 5cd7a8b8868c..7ac6ff4c46bd 100644
--- a/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@ -678,7 +678,7 @@ static struct clk exynos5_clk_pdma1 = {
        .name           = "dma",
        .devname        = "dma-pl330.1",
        .enable         = exynos5_clk_ip_fsys_ctrl,
-        .ctrlbit        = (1 << 1),
+        .ctrlbit        = (1 << 2),
 };
 static struct clk exynos5_clk_mdma1 = {
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index a6959bbfef89..08e5a8e45bdb 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -41,6 +41,7 @@
 #include <plat/pd.h>
 #include <plat/regs-fb-v4.h>
 #include <plat/fimc-core.h>
+#include <plat/s5p-time.h>
 #include <plat/camport.h>
 #include <plat/mipi_csis.h>
@@ -1091,6 +1092,7 @@ static void __init universal_map_io(void)
        exynos_init_io(NULL, 0);
        s3c24xx_init_clocks(24000000);
        s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs));
+        s5p_set_timer_source(S5P_PWM2, S5P_PWM4);
 }
 static void s5p_tv_setup(void)
@@ -1146,7 +1148,7 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")
        .map_io         = universal_map_io,
        .handle_irq     = gic_handle_irq,
        .init_machine   = universal_machine_init,
-        .timer          = &exynos4_timer,
+        .timer          = &s5p_timer,
        .reserve        = &universal_reserve,
        .restart        = exynos4_restart,
 MACHINE_END
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 90ceab761929..199764fe0fb0 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -58,6 +58,28 @@ config MACH_DREAMPLUG_DT
          Say 'Y' here if you want your kernel to support the
          Marvell DreamPlug (Flattened Device Tree).
+config MACH_ICONNECT_DT
+        bool "Iomega Iconnect (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
+        help
+          Say 'Y' here to enable Iomega Iconnect support.
+config MACH_DLINK_KIRKWOOD_DT
+        bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
+        help
+          Say 'Y' here if you want your kernel to support the
+          Kirkwood-based D-Link NASes such as DNS-320 & DNS-325,
+          using Flattened Device Tree.
+config MACH_IB62X0_DT
+        bool "RaidSonic IB-NAS6210, IB-NAS6220 (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
+        help
+          Say 'Y' here if you want your kernel to support the
+          RaidSonic IB-NAS6210 & IB-NAS6220 devices, using
+          Flattened Device Tree.
 config MACH_TS219
        bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
        help
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index e299a9576bf0..d2b05907b10e 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -22,3 +22,6 @@ obj-$(CONFIG_MACH_T5325)		+= t5325-setup.o
 obj-$(CONFIG_CPU_IDLE)                  += cpuidle.o
 obj-$(CONFIG_ARCH_KIRKWOOD_DT)          += board-dt.o
 obj-$(CONFIG_MACH_DREAMPLUG_DT)         += board-dreamplug.o
+obj-$(CONFIG_MACH_ICONNECT_DT)          += board-iconnect.o
+obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)    += board-dnskw.o
+obj-$(CONFIG_MACH_IB62X0_DT)            += board-ib62x0.o
diff --git a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot
index 16f938522304..02edbdf5b065 100644
--- a/arch/arm/mach-kirkwood/Makefile.boot
+++ b/arch/arm/mach-kirkwood/Makefile.boot
@@ -3,3 +3,7 @@ params_phys-y	:= 0x00000100
 initrd_phys-y   := 0x00800000
 dtb-$(CONFIG_MACH_DREAMPLUG_DT) += kirkwood-dreamplug.dtb
+dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns320.dtb
+dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb
+dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb
+dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb
diff --git a/arch/arm/mach-kirkwood/board-dnskw.c b/arch/arm/mach-kirkwood/board-dnskw.c
new file mode 100644
index 000000000000..58c2d68f9443
--- /dev/null
+++ b/arch/arm/mach-kirkwood/board-dnskw.c
@@ -0,0 +1,275 @@
+/*
+ * Copyright 2012 (C), Jamie Lentin <jm@lentin.co.uk>
+ *
+ * arch/arm/mach-kirkwood/board-dnskw.c
+ *
+ * D-link DNS-320 & DNS-325 NAS Init for drivers not converted to
+ * flattened device tree yet.
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/ata_platform.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/of.h>
+#include <linux/gpio.h>
+#include <linux/input.h>
+#include <linux/gpio_keys.h>
+#include <linux/gpio-fan.h>
+#include <linux/leds.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <mach/kirkwood.h>
+#include <mach/bridge-regs.h>
+#include "common.h"
+#include "mpp.h"
+static struct mv643xx_eth_platform_data dnskw_ge00_data = {
+        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
+};
+static struct mv_sata_platform_data dnskw_sata_data = {
+        .n_ports        = 2,
+};
+static unsigned int dnskw_mpp_config[] __initdata = {
+        MPP13_UART1_TXD,        /* Custom ... */
+        MPP14_UART1_RXD,        /* ... Controller (DNS-320 only) */
+        MPP20_SATA1_ACTn,       /* LED: White Right HDD */
+        MPP21_SATA0_ACTn,       /* LED: White Left HDD */
+        MPP24_GPIO,
+        MPP25_GPIO,
+        MPP26_GPIO,     /* LED: Power */
+        MPP27_GPIO,     /* LED: Red Right HDD */
+        MPP28_GPIO,     /* LED: Red Left HDD */
+        MPP29_GPIO,     /* LED: Red USB (DNS-325 only) */
+        MPP30_GPIO,
+        MPP31_GPIO,
+        MPP32_GPIO,
+        MPP33_GPO,
+        MPP34_GPIO,     /* Button: Front power */
+        MPP35_GPIO,     /* LED: Red USB (DNS-320 only) */
+        MPP36_GPIO,     /* Power: Turn off board */
+        MPP37_GPIO,     /* Power: Turn back on after power failure */
+        MPP38_GPIO,
+        MPP39_GPIO,     /* Power: SATA0 */
+        MPP40_GPIO,     /* Power: SATA1 */
+        MPP41_GPIO,     /* SATA0 present */
+        MPP42_GPIO,     /* SATA1 present */
+        MPP43_GPIO,     /* LED: White USB */
+        MPP44_GPIO,     /* Fan: Tachometer Pin */
+        MPP45_GPIO,     /* Fan: high speed */
+        MPP46_GPIO,     /* Fan: low speed */
+        MPP47_GPIO,     /* Button: Back unmount */
+        MPP48_GPIO,     /* Button: Back reset */
+        MPP49_GPIO,     /* Temp Alarm (DNS-325) Pin of U5 (DNS-320) */
+        0
+};
+static struct gpio_led dns325_led_pins[] = {
+        {
+                .name   = "dns325:white:power",
+                .gpio   = 26,
+                .active_low = 1,
+                .default_trigger = "default-on",
+        },
+        {
+                .name   = "dns325:white:usb",
+                .gpio   = 43,
+                .active_low = 1,
+        },
+        {
+                .name   = "dns325:red:l_hdd",
+                .gpio   = 28,
+                .active_low = 1,
+        },
+        {
+                .name   = "dns325:red:r_hdd",
+                .gpio   = 27,
+                .active_low = 1,
+        },
+        {
+                .name   = "dns325:red:usb",
+                .gpio   = 29,
+                .active_low = 1,
+        },
+};
+static struct gpio_led_platform_data dns325_led_data = {
+        .num_leds       = ARRAY_SIZE(dns325_led_pins),
+        .leds           = dns325_led_pins,
+};
+static struct platform_device dns325_led_device = {
+        .name           = "leds-gpio",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &dns325_led_data,
+        },
+};
+static struct gpio_led dns320_led_pins[] = {
+        {
+                .name   = "dns320:blue:power",
+                .gpio   = 26,
+                .active_low = 1,
+                .default_trigger = "default-on",
+        },
+        {
+                .name   = "dns320:blue:usb",
+                .gpio   = 43,
+                .active_low = 1,
+        },
+        {
+                .name   = "dns320:orange:l_hdd",
+                .gpio   = 28,
+                .active_low = 1,
+        },
+        {
+                .name   = "dns320:orange:r_hdd",
+                .gpio   = 27,
+                .active_low = 1,
+        },
+        {
+                .name   = "dns320:orange:usb",
+                .gpio   = 35,
+                .active_low = 1,
+        },
+};
+static struct gpio_led_platform_data dns320_led_data = {
+        .num_leds       = ARRAY_SIZE(dns320_led_pins),
+        .leds           = dns320_led_pins,
+};
+static struct platform_device dns320_led_device = {
+        .name           = "leds-gpio",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &dns320_led_data,
+        },
+};
+static struct i2c_board_info dns325_i2c_board_info[] __initdata = {
+        {
+                I2C_BOARD_INFO("lm75", 0x48),
+        },
+        /* Something at 0x0c also */
+};
+static struct gpio_keys_button dnskw_button_pins[] = {
+        {
+                .code           = KEY_POWER,
+                .gpio           = 34,
+                .desc           = "Power button",
+                .active_low     = 1,
+        },
+        {
+                .code           = KEY_EJECTCD,
+                .gpio           = 47,
+                .desc           = "USB unmount button",
+                .active_low     = 1,
+        },
+        {
+                .code           = KEY_RESTART,
+                .gpio           = 48,
+                .desc           = "Reset button",
+                .active_low     = 1,
+        },
+};
+static struct gpio_keys_platform_data dnskw_button_data = {
+        .buttons        = dnskw_button_pins,
+        .nbuttons       = ARRAY_SIZE(dnskw_button_pins),
+};
+static struct platform_device dnskw_button_device = {
+        .name           = "gpio-keys",
+        .id             = -1,
+        .num_resources  = 0,
+        .dev            = {
+                .platform_data  = &dnskw_button_data,
+        }
+};
+/* Fan: ADDA AD045HB-G73 40mm 6000rpm@5v */
+static struct gpio_fan_speed dnskw_fan_speed[] = {
+        {    0,  0 },
+        { 3000,  1 },
+        { 6000,  2 },
+};
+static unsigned dnskw_fan_pins[] = {46, 45};
+static struct gpio_fan_platform_data dnskw_fan_data = {
+        .num_ctrl       = ARRAY_SIZE(dnskw_fan_pins),
+        .ctrl           = dnskw_fan_pins,
+        .num_speed      = ARRAY_SIZE(dnskw_fan_speed),
+        .speed          = dnskw_fan_speed,
+};
+static struct platform_device dnskw_fan_device = {
+        .name   = "gpio-fan",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &dnskw_fan_data,
+        },
+};
+static void dnskw_power_off(void)
+{
+        gpio_set_value(36, 1);
+}
+/* Register any GPIO for output and set the value */
+static void __init dnskw_gpio_register(unsigned gpio, char *name, int def)
+{
+        if (gpio_request(gpio, name) == 0 &&
+            gpio_direction_output(gpio, 0) == 0) {
+                gpio_set_value(gpio, def);
+                if (gpio_export(gpio, 0) != 0)
+                        pr_err("dnskw: Failed to export GPIO %s\n", name);
+        } else
+                pr_err("dnskw: Failed to register %s\n", name);
+}
+void __init dnskw_init(void)
+{
+        kirkwood_mpp_conf(dnskw_mpp_config);
+        kirkwood_ehci_init();
+        kirkwood_ge00_init(&dnskw_ge00_data);
+        kirkwood_sata_init(&dnskw_sata_data);
+        kirkwood_i2c_init();
+        platform_device_register(&dnskw_button_device);
+        platform_device_register(&dnskw_fan_device);
+        if (of_machine_is_compatible("dlink,dns-325")) {
+                i2c_register_board_info(0, dns325_i2c_board_info,
+                                        ARRAY_SIZE(dns325_i2c_board_info));
+                platform_device_register(&dns325_led_device);
+        } else if (of_machine_is_compatible("dlink,dns-320"))
+                platform_device_register(&dns320_led_device);
+        /* Register power-off GPIO. */
+        if (gpio_request(36, "dnskw:power:off") == 0
+            && gpio_direction_output(36, 0) == 0)
+                pm_power_off = dnskw_power_off;
+        else
+                pr_err("dnskw: failed to configure power-off GPIO\n");
+        /* Ensure power is supplied to both HDDs */
+        dnskw_gpio_register(39, "dnskw:power:sata0", 1);
+        dnskw_gpio_register(40, "dnskw:power:sata1", 1);
+        /* Set NAS to turn back on after a power failure */
+        dnskw_gpio_register(37, "dnskw:power:recover", 1);
+}
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 1c672d9e6656..10d1969b9e3a 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/kexec.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <mach/bridge-regs.h>
@@ -55,11 +56,24 @@ static void __init kirkwood_dt_init(void)
        if (of_machine_is_compatible("globalscale,dreamplug"))
                dreamplug_init();
+        if (of_machine_is_compatible("dlink,dns-kirkwood"))
+                dnskw_init();
+        if (of_machine_is_compatible("iom,iconnect"))
+                iconnect_init();
+        if (of_machine_is_compatible("raidsonic,ib-nas62x0"))
+                ib62x0_init();
        of_platform_populate(NULL, kirkwood_dt_match_table, NULL, NULL);
 }
 static const char *kirkwood_dt_board_compat[] = {
        "globalscale,dreamplug",
+        "dlink,dns-320",
+        "dlink,dns-325",
+        "iom,iconnect",
+        "raidsonic,ib-nas62x0",
        NULL
 };
diff --git a/arch/arm/mach-kirkwood/board-ib62x0.c b/arch/arm/mach-kirkwood/board-ib62x0.c
new file mode 100644
index 000000000000..eddf1df8891f
--- /dev/null
+++ b/arch/arm/mach-kirkwood/board-ib62x0.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2012 (C), Simon Baatz <gmbnomis@gmail.com>
+ *
+ * arch/arm/mach-kirkwood/board-ib62x0.c
+ *
+ * RaidSonic ICY BOX IB-NAS6210 & IB-NAS6220 init for drivers not
+ * converted to flattened device tree yet.
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/partitions.h>
+#include <linux/ata_platform.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/gpio.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
+#include <linux/leds.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/kirkwood.h>
+#include "common.h"
+#include "mpp.h"
+#define IB62X0_GPIO_POWER_OFF   24
+static struct mv643xx_eth_platform_data ib62x0_ge00_data = {
+        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
+};
+static struct mv_sata_platform_data ib62x0_sata_data = {
+        .n_ports        = 2,
+};
+static unsigned int ib62x0_mpp_config[] __initdata = {
+        MPP0_NF_IO2,
+        MPP1_NF_IO3,
+        MPP2_NF_IO4,
+        MPP3_NF_IO5,
+        MPP4_NF_IO6,
+        MPP5_NF_IO7,
+        MPP18_NF_IO0,
+        MPP19_NF_IO1,
+        MPP22_GPIO,     /* OS LED red */
+        MPP24_GPIO,     /* Power off device */
+        MPP25_GPIO,     /* OS LED green */
+        MPP27_GPIO,     /* USB transfer LED */
+        MPP28_GPIO,     /* Reset button */
+        MPP29_GPIO,     /* USB Copy button */
+        0
+};
+static struct gpio_led ib62x0_led_pins[] = {
+        {
+                .name                   = "ib62x0:green:os",
+                .default_trigger        = "default-on",
+                .gpio                   = 25,
+                .active_low             = 0,
+        },
+        {
+                .name                   = "ib62x0:red:os",
+                .default_trigger        = "none",
+                .gpio                   = 22,
+                .active_low             = 0,
+        },
+        {
+                .name                   = "ib62x0:red:usb_copy",
+                .default_trigger        = "none",
+                .gpio                   = 27,
+                .active_low             = 0,
+        },
+};
+static struct gpio_led_platform_data ib62x0_led_data = {
+        .leds           = ib62x0_led_pins,
+        .num_leds       = ARRAY_SIZE(ib62x0_led_pins),
+};
+static struct platform_device ib62x0_led_device = {
+        .name   = "leds-gpio",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &ib62x0_led_data,
+        }
+};
+static struct gpio_keys_button ib62x0_button_pins[] = {
+        {
+                .code           = KEY_COPY,
+                .gpio           = 29,
+                .desc           = "USB Copy",
+                .active_low     = 1,
+        },
+        {
+                .code           = KEY_RESTART,
+                .gpio           = 28,
+                .desc           = "Reset",
+                .active_low     = 1,
+        },
+};
+static struct gpio_keys_platform_data ib62x0_button_data = {
+        .buttons        = ib62x0_button_pins,
+        .nbuttons       = ARRAY_SIZE(ib62x0_button_pins),
+};
+static struct platform_device ib62x0_button_device = {
+        .name           = "gpio-keys",
+        .id             = -1,
+        .num_resources  = 0,
+        .dev            = {
+                .platform_data  = &ib62x0_button_data,
+        }
+};
+static void ib62x0_power_off(void)
+{
+        gpio_set_value(IB62X0_GPIO_POWER_OFF, 1);
+}
+void __init ib62x0_init(void)
+{
+        /*
+         * Basic setup. Needs to be called early.
+         */
+        kirkwood_mpp_conf(ib62x0_mpp_config);
+        kirkwood_ehci_init();
+        kirkwood_ge00_init(&ib62x0_ge00_data);
+        kirkwood_sata_init(&ib62x0_sata_data);
+        platform_device_register(&ib62x0_led_device);
+        platform_device_register(&ib62x0_button_device);
+        if (gpio_request(IB62X0_GPIO_POWER_OFF, "ib62x0:power:off") == 0 &&
+            gpio_direction_output(IB62X0_GPIO_POWER_OFF, 0) == 0)
+                pm_power_off = ib62x0_power_off;
+        else
+                pr_err("board-ib62x0: failed to configure power-off GPIO\n");
+}
diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
new file mode 100644
index 000000000000..2222c5739519
--- /dev/null
+++ b/arch/arm/mach-kirkwood/board-iconnect.c
@@ -0,0 +1,165 @@
+/*
+ * arch/arm/mach-kirkwood/board-iconnect.c
+ *
+ * Iomega i-connect Board Setup
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+#include <linux/spi/flash.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/orion_spi.h>
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/gpio_keys.h>
+#include <asm/mach/arch.h>
+#include <mach/kirkwood.h>
+#include "common.h"
+#include "mpp.h"
+static struct mv643xx_eth_platform_data iconnect_ge00_data = {
+        .phy_addr       = MV643XX_ETH_PHY_ADDR(11),
+};
+static struct gpio_led iconnect_led_pins[] = {
+        {
+                .name           = "led_level",
+                .gpio           = 41,
+                .default_trigger = "default-on",
+        }, {
+                .name           = "power:blue",
+                .gpio           = 42,
+                .default_trigger = "timer",
+        }, {
+                .name           = "power:red",
+                .gpio           = 43,
+        }, {
+                .name           = "usb1:blue",
+                .gpio           = 44,
+        }, {
+                .name           = "usb2:blue",
+                .gpio           = 45,
+        }, {
+                .name           = "usb3:blue",
+                .gpio           = 46,
+        }, {
+                .name           = "usb4:blue",
+                .gpio           = 47,
+        }, {
+                .name           = "otb:blue",
+                .gpio           = 48,
+        },
+};
+static struct gpio_led_platform_data iconnect_led_data = {
+        .leds           = iconnect_led_pins,
+        .num_leds       = ARRAY_SIZE(iconnect_led_pins),
+        .gpio_blink_set = orion_gpio_led_blink_set,
+};
+static struct platform_device iconnect_leds = {
+        .name   = "leds-gpio",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &iconnect_led_data,
+        }
+};
+static unsigned int iconnect_mpp_config[] __initdata = {
+        MPP12_GPIO,
+        MPP35_GPIO,
+        MPP41_GPIO,
+        MPP42_GPIO,
+        MPP43_GPIO,
+        MPP44_GPIO,
+        MPP45_GPIO,
+        MPP46_GPIO,
+        MPP47_GPIO,
+        MPP48_GPIO,
+        0
+};
+static struct i2c_board_info __initdata iconnect_board_info[] = {
+        {
+                I2C_BOARD_INFO("lm63", 0x4c),
+        },
+};
+static struct mtd_partition iconnect_nand_parts[] = {
+        {
+                .name = "flash",
+                .offset = 0,
+                .size = MTDPART_SIZ_FULL,
+        },
+};
+/* yikes... theses are the original input buttons */
+/* but I'm not convinced by the sw event choices  */
+static struct gpio_keys_button iconnect_buttons[] = {
+        {
+                .type           = EV_SW,
+                .code           = SW_LID,
+                .gpio           = 12,
+                .desc           = "Reset Button",
+                .active_low     = 1,
+                .debounce_interval = 100,
+        }, {
+                .type           = EV_SW,
+                .code           = SW_TABLET_MODE,
+                .gpio           = 35,
+                .desc           = "OTB Button",
+                .active_low     = 1,
+                .debounce_interval = 100,
+        },
+};
+static struct gpio_keys_platform_data iconnect_button_data = {
+        .buttons        = iconnect_buttons,
+        .nbuttons       = ARRAY_SIZE(iconnect_buttons),
+};
+static struct platform_device iconnect_button_device = {
+        .name           = "gpio-keys",
+        .id             = -1,
+        .num_resources  = 0,
+        .dev        = {
+                .platform_data  = &iconnect_button_data,
+        },
+};
+void __init iconnect_init(void)
+{
+        kirkwood_mpp_conf(iconnect_mpp_config);
+        kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25);
+        kirkwood_i2c_init();
+        i2c_register_board_info(0, iconnect_board_info,
+                ARRAY_SIZE(iconnect_board_info));
+        kirkwood_ehci_init();
+        kirkwood_ge00_init(&iconnect_ge00_data);
+        platform_device_register(&iconnect_button_device);
+        platform_device_register(&iconnect_leds);
+}
+static int __init iconnect_pci_init(void)
+{
+        if (of_machine_is_compatible("iom,iconnect"))
+                kirkwood_pcie_init(KW_PCIE0);
+        return 0;
+}
+subsys_initcall(iconnect_pci_init);
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index a02cae881f2f..3ad037385a5e 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -15,6 +15,7 @@
 #include <linux/ata_platform.h>
 #include <linux/mtd/nand.h>
 #include <linux/dma-mapping.h>
+#include <linux/of.h>
 #include <net/dsa.h>
 #include <asm/page.h>
 #include <asm/timex.h>
@@ -482,6 +483,9 @@ static int __init kirkwood_clock_gate(void)
        unsigned int curr = readl(CLOCK_GATING_CTRL);
        u32 dev, rev;
+#ifdef CONFIG_OF
+        struct device_node *np;
+#endif
        kirkwood_pcie_id(&dev, &rev);
        printk(KERN_DEBUG "Gating clock of unused units\n");
        printk(KERN_DEBUG "before: 0x%08x\n", curr);
@@ -489,6 +493,14 @@ static int __init kirkwood_clock_gate(void)
        /* Make sure those units are accessible */
        writel(curr | CGC_SATA0 | CGC_SATA1 | CGC_PEX0 | CGC_PEX1, CLOCK_GATING_CTRL);
+#ifdef CONFIG_OF
+        np = of_find_compatible_node(NULL, NULL, "mrvl,orion-nand");
+        if (np && of_device_is_available(np)) {
+                kirkwood_clk_ctrl |= CGC_RUNIT;
+                of_node_put(np);
+        }
+#endif
        /* For SATA: first shutdown the phy */
        if (!(kirkwood_clk_ctrl & CGC_SATA0)) {
                /* Disable PLL and IVREF */
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index fa8e7689c436..a34c41a5172e 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
@@ -58,6 +58,24 @@ void dreamplug_init(void);
 static inline void dreamplug_init(void) {};
 #endif
+#ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT
+void dnskw_init(void);
+#else
+static inline void dnskw_init(void) {};
+#endif
+#ifdef CONFIG_MACH_ICONNECT_DT
+void iconnect_init(void);
+#else
+static inline void iconnect_init(void) {};
+#endif
+#ifdef CONFIG_MACH_IB62X0_DT
+void ib62x0_init(void);
+#else
+static inline void ib62x0_init(void) {};
+#endif
 /* early init functions not converted to fdt yet */
 char *kirkwood_id(void);
 void kirkwood_l2_init(void);
diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c
index fcce7ff37630..cfd98b186fcc 100644
--- a/arch/arm/mach-omap1/ams-delta-fiq.c
+++ b/arch/arm/mach-omap1/ams-delta-fiq.c
@@ -48,7 +48,7 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id)
        struct irq_chip *irq_chip = NULL;
        int gpio, irq_num, fiq_count;
-        irq_desc = irq_to_desc(IH_GPIO_BASE);
+        irq_desc = irq_to_desc(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK));
        if (irq_desc)
                irq_chip = irq_desc->irq_data.chip;
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 16ec5c89e035..55dfcccf1a8a 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -629,7 +629,7 @@ static struct regulator_consumer_supply dummy_supplies[] = {
 static void __init igep_init(void)
 {
-        regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+        regulator_register_fixed(1, dummy_supplies, ARRAY_SIZE(dummy_supplies));
        omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
        /* Get IGEP2 hardware revision */
diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
index 1e2d3322f33e..c88420de1151 100644
--- a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
+++ b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h
@@ -941,10 +941,10 @@
 #define OMAP4_DSI2_LANEENABLE_MASK                              (0x7 << 29)
 #define OMAP4_DSI1_LANEENABLE_SHIFT                             24
 #define OMAP4_DSI1_LANEENABLE_MASK                              (0x1f << 24)
-#define OMAP4_DSI2_PIPD_SHIFT                                   19
+#define OMAP4_DSI1_PIPD_SHIFT                                   19
-#define OMAP4_DSI2_PIPD_MASK                                    (0x1f << 19)
+#define OMAP4_DSI1_PIPD_MASK                                    (0x1f << 19)
-#define OMAP4_DSI1_PIPD_SHIFT                                   14
+#define OMAP4_DSI2_PIPD_SHIFT                                   14
-#define OMAP4_DSI1_PIPD_MASK                                    (0x1f << 14)
+#define OMAP4_DSI2_PIPD_MASK                                    (0x1f << 14)
 /* CONTROL_MCBSPLP */
 #define OMAP4_ALBCTRLRX_FSX_SHIFT                               31
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index c3ed15b8ea25..13d2bece1bae 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -253,27 +253,6 @@ error_fail:
 * GPIO LEDs (simple - doesn't use hardware blinking support)
 */
-#define ORION_BLINK_HALF_PERIOD 100 /* ms */
-static int dns323_gpio_blink_set(unsigned gpio, int state,
-        unsigned long *delay_on, unsigned long *delay_off)
-{
-        if (delay_on && delay_off && !*delay_on && !*delay_off)
-                *delay_on = *delay_off = ORION_BLINK_HALF_PERIOD;
-        switch(state) {
-        case GPIO_LED_NO_BLINK_LOW:
-        case GPIO_LED_NO_BLINK_HIGH:
-                orion_gpio_set_blink(gpio, 0);
-                gpio_set_value(gpio, state);
-                break;
-        case GPIO_LED_BLINK:
-                orion_gpio_set_blink(gpio, 1);
-        }
-        return 0;
-}
 static struct gpio_led dns323ab_leds[] = {
        {
                .name = "power:blue",
@@ -312,13 +291,13 @@ static struct gpio_led dns323c_leds[] = {
 static struct gpio_led_platform_data dns323ab_led_data = {
        .num_leds       = ARRAY_SIZE(dns323ab_leds),
        .leds           = dns323ab_leds,
-        .gpio_blink_set = dns323_gpio_blink_set,
+        .gpio_blink_set = orion_gpio_led_blink_set,
 };
 static struct gpio_led_platform_data dns323c_led_data = {
        .num_leds       = ARRAY_SIZE(dns323c_leds),
        .leds           = dns323c_leds,
-        .gpio_blink_set = dns323_gpio_blink_set,
+        .gpio_blink_set = orion_gpio_led_blink_set,
 };
 static struct platform_device dns323_gpio_leds = {
diff --git a/arch/arm/mach-orion5x/mpp.h b/arch/arm/mach-orion5x/mpp.h
index eac68978a2c2..db70e79a1198 100644
--- a/arch/arm/mach-orion5x/mpp.h
+++ b/arch/arm/mach-orion5x/mpp.h
@@ -65,8 +65,8 @@
 #define MPP8_GIGE               MPP(8,  0x1, 0, 0, 1,   1,   1)
 #define MPP9_UNUSED             MPP(9,  0x0, 0, 0, 1,   1,   1)
-#define MPP9_GPIO               MPP(9,  0x0, 0, 0, 1,   1,   1)
+#define MPP9_GPIO               MPP(9,  0x0, 1, 1, 1,   1,   1)
-#define MPP9_GIGE               MPP(9,  0x1, 1, 1, 1,   1,   1)
+#define MPP9_GIGE               MPP(9,  0x1, 0, 0, 1,   1,   1)
 #define MPP10_UNUSED            MPP(10, 0x0, 0, 0, 1,   1,   1)
 #define MPP10_GPIO              MPP(10, 0x0, 1, 1, 1,   1,   1)
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index 10d160888133..af95af257301 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -16,6 +16,7 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
+#include <linux/leds.h>
 /*
 * GPIO unit register offsets.
@@ -289,12 +290,34 @@ void orion_gpio_set_blink(unsigned pin, int blink)
                return;
        spin_lock_irqsave(&ochip->lock, flags);
-        __set_level(ochip, pin, 0);
+        __set_level(ochip, pin & 31, 0);
-        __set_blinking(ochip, pin, blink);
+        __set_blinking(ochip, pin & 31, blink);
        spin_unlock_irqrestore(&ochip->lock, flags);
 }
 EXPORT_SYMBOL(orion_gpio_set_blink);
+#define ORION_BLINK_HALF_PERIOD 100 /* ms */
+int orion_gpio_led_blink_set(unsigned gpio, int state,
+        unsigned long *delay_on, unsigned long *delay_off)
+{
+        if (delay_on && delay_off && !*delay_on && !*delay_off)
+                *delay_on = *delay_off = ORION_BLINK_HALF_PERIOD;
+        switch (state) {
+        case GPIO_LED_NO_BLINK_LOW:
+        case GPIO_LED_NO_BLINK_HIGH:
+                orion_gpio_set_blink(gpio, 0);
+                gpio_set_value(gpio, state);
+                break;
+        case GPIO_LED_BLINK:
+                orion_gpio_set_blink(gpio, 1);
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(orion_gpio_led_blink_set);
 /*****************************************************************************
 * Orion GPIO IRQ
diff --git a/arch/arm/plat-orion/include/plat/gpio.h b/arch/arm/plat-orion/include/plat/gpio.h
index 3abf30428bee..bec0c98ce41f 100644
--- a/arch/arm/plat-orion/include/plat/gpio.h
+++ b/arch/arm/plat-orion/include/plat/gpio.h
@@ -19,6 +19,8 @@
 */
 void orion_gpio_set_unused(unsigned pin);
 void orion_gpio_set_blink(unsigned pin, int blink);
+int orion_gpio_led_blink_set(unsigned gpio, int state,
+        unsigned long *delay_on, unsigned long *delay_off);
 #define GPIO_INPUT_OK           (1 << 0)
 #define GPIO_OUTPUT_OK          (1 << 1)
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index f5104b7c52cd..463fb3bbe11e 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -1174,7 +1174,7 @@ out:
 bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu)
 {
-        return irqchip_in_kernel(vcpu->kcm) == (vcpu->arch.apic != NULL);
+        return irqchip_in_kernel(vcpu->kvm) == (vcpu->arch.apic != NULL);
 }
 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
diff --git a/arch/m68k/platform/520x/config.c b/arch/m68k/platform/520x/config.c
index 235947844f27..09df4b89e8be 100644
--- a/arch/m68k/platform/520x/config.c
+++ b/arch/m68k/platform/520x/config.c
@@ -22,7 +22,7 @@
 /***************************************************************************/
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
 static void __init m520x_qspi_init(void)
 {
@@ -35,7 +35,7 @@ static void __init m520x_qspi_init(void)
        writew(par, MCF_GPIO_PAR_UART);
 }
-#endif /* CONFIG_SPI_COLDFIRE_QSPI */
+#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
 /***************************************************************************/
@@ -79,7 +79,7 @@ void __init config_BSP(char *commandp, int size)
        mach_sched_init = hw_timer_init;
        m520x_uarts_init();
        m520x_fec_init();
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
        m520x_qspi_init();
 #endif
 }
diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c
index c8b405d5a961..d47dfd8f50a2 100644
--- a/arch/m68k/platform/523x/config.c
+++ b/arch/m68k/platform/523x/config.c
@@ -22,7 +22,7 @@
 /***************************************************************************/
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
 static void __init m523x_qspi_init(void)
 {
@@ -36,7 +36,7 @@ static void __init m523x_qspi_init(void)
        writew(par, MCFGPIO_PAR_TIMER);
 }
-#endif /* CONFIG_SPI_COLDFIRE_QSPI */
+#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
 /***************************************************************************/
@@ -58,7 +58,7 @@ void __init config_BSP(char *commandp, int size)
 {
        mach_sched_init = hw_timer_init;
        m523x_fec_init();
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
        m523x_qspi_init();
 #endif
 }
diff --git a/arch/m68k/platform/5249/config.c b/arch/m68k/platform/5249/config.c
index bbf05135bb98..300e729a58d0 100644
--- a/arch/m68k/platform/5249/config.c
+++ b/arch/m68k/platform/5249/config.c
@@ -51,7 +51,7 @@ static struct platform_device *m5249_devices[] __initdata = {
 /***************************************************************************/
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
 static void __init m5249_qspi_init(void)
 {
@@ -61,7 +61,7 @@ static void __init m5249_qspi_init(void)
        mcf_mapirq2imr(MCF_IRQ_QSPI, MCFINTC_QSPI);
 }
-#endif /* CONFIG_SPI_COLDFIRE_QSPI */
+#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
 /***************************************************************************/
@@ -90,7 +90,7 @@ void __init config_BSP(char *commandp, int size)
 #ifdef CONFIG_M5249C3
        m5249_smc91x_init();
 #endif
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
        m5249_qspi_init();
 #endif
 }
diff --git a/arch/m68k/platform/527x/config.c b/arch/m68k/platform/527x/config.c
index f91a53294c35..b3cb378c5e94 100644
--- a/arch/m68k/platform/527x/config.c
+++ b/arch/m68k/platform/527x/config.c
@@ -23,7 +23,7 @@
 /***************************************************************************/
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
 static void __init m527x_qspi_init(void)
 {
@@ -42,7 +42,7 @@ static void __init m527x_qspi_init(void)
 #endif
 }
-#endif /* CONFIG_SPI_COLDFIRE_QSPI */
+#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
 /***************************************************************************/
@@ -90,7 +90,7 @@ void __init config_BSP(char *commandp, int size)
        mach_sched_init = hw_timer_init;
        m527x_uarts_init();
        m527x_fec_init();
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
        m527x_qspi_init();
 #endif
 }
diff --git a/arch/m68k/platform/528x/config.c b/arch/m68k/platform/528x/config.c
index d4492926614c..c5f11ba49be5 100644
--- a/arch/m68k/platform/528x/config.c
+++ b/arch/m68k/platform/528x/config.c
@@ -24,7 +24,7 @@
 /***************************************************************************/
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
 static void __init m528x_qspi_init(void)
 {
@@ -32,7 +32,7 @@ static void __init m528x_qspi_init(void)
        __raw_writeb(0x07, MCFGPIO_PQSPAR);
 }
-#endif /* CONFIG_SPI_COLDFIRE_QSPI */
+#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
 /***************************************************************************/
@@ -98,7 +98,7 @@ void __init config_BSP(char *commandp, int size)
        mach_sched_init = hw_timer_init;
        m528x_uarts_init();
        m528x_fec_init();
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
        m528x_qspi_init();
 #endif
 }
diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/532x/config.c
index 2bec3477b739..37082d02f2bd 100644
--- a/arch/m68k/platform/532x/config.c
+++ b/arch/m68k/platform/532x/config.c
@@ -30,7 +30,7 @@
 /***************************************************************************/
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
 static void __init m532x_qspi_init(void)
 {
@@ -38,7 +38,7 @@ static void __init m532x_qspi_init(void)
        writew(0x01f0, MCF_GPIO_PAR_QSPI);
 }
-#endif /* CONFIG_SPI_COLDFIRE_QSPI */
+#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
 /***************************************************************************/
@@ -77,7 +77,7 @@ void __init config_BSP(char *commandp, int size)
        mach_sched_init = hw_timer_init;
        m532x_uarts_init();
        m532x_fec_init();
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
        m532x_qspi_init();
 #endif
diff --git a/arch/m68k/platform/coldfire/device.c b/arch/m68k/platform/coldfire/device.c
index 7af97362b95c..3aa77ddea89d 100644
--- a/arch/m68k/platform/coldfire/device.c
+++ b/arch/m68k/platform/coldfire/device.c
@@ -121,7 +121,7 @@ static struct platform_device mcf_fec1 = {
 #endif /* MCFFEC_BASE1 */
 #endif /* CONFIG_FEC */
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
 /*
 *      The ColdFire QSPI module is an SPI protocol hardware block used
 *      on a number of different ColdFire CPUs.
@@ -274,7 +274,7 @@ static struct platform_device mcf_qspi = {
        .resource               = mcf_qspi_resources,
        .dev.platform_data      = &mcf_qspi_data,
 };
-#endif /* CONFIG_SPI_COLDFIRE_QSPI */
+#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
 static struct platform_device *mcf_devices[] __initdata = {
        &mcf_uart,
@@ -284,7 +284,7 @@ static struct platform_device *mcf_devices[] __initdata = {
        &mcf_fec1,
 #endif
 #endif
-#ifdef CONFIG_SPI_COLDFIRE_QSPI
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
        &mcf_qspi,
 #endif
 };
diff --git a/arch/parisc/include/asm/hardware.h b/arch/parisc/include/asm/hardware.h
index 4e9626836bab..d1d864b81bae 100644
--- a/arch/parisc/include/asm/hardware.h
+++ b/arch/parisc/include/asm/hardware.h
@@ -2,7 +2,6 @@
 #define _PARISC_HARDWARE_H
 #include <linux/mod_devicetable.h>
-#include <asm/pdc.h>
 #define HWTYPE_ANY_ID           PA_HWTYPE_ANY_ID
 #define HVERSION_ANY_ID         PA_HVERSION_ANY_ID
@@ -95,12 +94,14 @@ struct bc_module {
 #define HPHW_MC        15
 #define HPHW_FAULTY    31
+struct parisc_device_id;
 /* hardware.c: */
 extern const char *parisc_hardware_description(struct parisc_device_id *id);
 extern enum cpu_type parisc_get_cpu_type(unsigned long hversion);
 struct pci_dev;
+struct hardware_path;
 /* drivers.c: */
 extern struct parisc_device *alloc_pa_dev(unsigned long hpa,
diff --git a/arch/parisc/include/asm/page.h b/arch/parisc/include/asm/page.h
index a84cc1f925f6..4e0e7dbf0f3f 100644
--- a/arch/parisc/include/asm/page.h
+++ b/arch/parisc/include/asm/page.h
@@ -160,5 +160,11 @@ extern int npmem_ranges;
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>
+#include <asm/pdc.h>
+#define PAGE0   ((struct zeropage *)__PAGE_OFFSET)
+/* DEFINITION OF THE ZERO-PAGE (PAG0) */
+/* based on work by Jason Eckhardt (jason@equator.com) */
 #endif /* _PARISC_PAGE_H */
diff --git a/arch/parisc/include/asm/pdc.h b/arch/parisc/include/asm/pdc.h
index 4ca510b3c6f8..7f0f2d23059d 100644
--- a/arch/parisc/include/asm/pdc.h
+++ b/arch/parisc/include/asm/pdc.h
@@ -343,8 +343,6 @@
 #ifdef __KERNEL__
-#include <asm/page.h> /* for __PAGE_OFFSET */
 extern int pdc_type;
 /* Values for pdc_type */
@@ -677,11 +675,6 @@ static inline char * os_id_to_string(u16 os_id) {
 #endif /* __KERNEL__ */
-#define PAGE0   ((struct zeropage *)__PAGE_OFFSET)
-/* DEFINITION OF THE ZERO-PAGE (PAG0) */
-/* based on work by Jason Eckhardt (jason@equator.com) */
 /* flags of the device_path */
 #define PF_AUTOBOOT     0x80
 #define PF_AUTOSEARCH   0x40
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index 22dadeb58695..ee99f2339356 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -44,6 +44,8 @@ struct vm_area_struct;
 #endif /* !__ASSEMBLY__ */
+#include <asm/page.h>
 #define pte_ERROR(e) \
        printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
 #define pmd_ERROR(e) \
diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h
index 804aa28ab1d6..3516e0b27044 100644
--- a/arch/parisc/include/asm/spinlock.h
+++ b/arch/parisc/include/asm/spinlock.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_SPINLOCK_H
 #define __ASM_SPINLOCK_H
+#include <asm/barrier.h>
+#include <asm/ldcw.h>
 #include <asm/processor.h>
 #include <asm/spinlock_types.h>
diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c
index 0b3393381a81..47341aa208f2 100644
--- a/arch/parisc/kernel/pdc_cons.c
+++ b/arch/parisc/kernel/pdc_cons.c
@@ -50,6 +50,7 @@
 #include <linux/init.h>
 #include <linux/major.h>
 #include <linux/tty.h>
+#include <asm/page.h>           /* for PAGE0 */
 #include <asm/pdc.h>            /* for iodc_call() proto and friends */
 static DEFINE_SPINLOCK(pdc_console_lock);
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 7c0774397b89..70e105d62423 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -29,6 +29,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/page.h>
 #include <asm/param.h>
 #include <asm/pdc.h>
 #include <asm/led.h>
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 548da3aa0a30..d58fc4e4149c 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -288,13 +288,6 @@ label##_hv:								\
 /* Exception addition: Hard disable interrupts */
 #define DISABLE_INTS    SOFT_DISABLE_INTS(r10,r11)
-/* Exception addition: Keep interrupt state */
-#define ENABLE_INTS                             \
-        ld      r11,PACAKMSR(r13);              \
-        ld      r12,_MSR(r1);                   \
-        rlwimi  r11,r12,0,MSR_EE;               \
-        mtmsrd  r11,1
 #define ADD_NVGPRS                              \
        bl      .save_nvgprs
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index f8a7a1a1a9f4..ef2074c3e906 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -588,23 +588,19 @@ _GLOBAL(ret_from_except_lite)
 fast_exc_return_irq:
 restore:
        /*
-         * This is the main kernel exit path, we first check if we
+         * This is the main kernel exit path. First we check if we
-         * have to change our interrupt state.
+         * are about to re-enable interrupts
         */
        ld      r5,SOFTE(r1)
        lbz     r6,PACASOFTIRQEN(r13)
-        cmpwi   cr1,r5,0
+        cmpwi   cr0,r5,0
-        cmpw    cr0,r5,r6
+        beq     restore_irq_off
-        beq     cr0,4f
-        /* We do, handle disable first, which is easy */
+        /* We are enabling, were we already enabled ? Yes, just return */
-        bne     cr1,3f;
+        cmpwi   cr0,r6,1
-        li      r0,0
+        beq     cr0,do_restore
-        stb     r0,PACASOFTIRQEN(r13);
-        TRACE_DISABLE_INTS
-        b       4f
-3:      /*
+        /*
         * We are about to soft-enable interrupts (we are hard disabled
         * at this point). We check if there's anything that needs to
         * be replayed first.
@@ -626,7 +622,7 @@ restore_no_replay:
        /*
         * Final return path. BookE is handled in a different file
         */
-4:
+do_restore:
 #ifdef CONFIG_PPC_BOOK3E
        b       .exception_return_book3e
 #else
@@ -700,6 +696,25 @@ fast_exception_return:
 #endif /* CONFIG_PPC_BOOK3E */
        /*
+         * We are returning to a context with interrupts soft disabled.
+         *
+         * However, we may also about to hard enable, so we need to
+         * make sure that in this case, we also clear PACA_IRQ_HARD_DIS
+         * or that bit can get out of sync and bad things will happen
+         */
+restore_irq_off:
+        ld      r3,_MSR(r1)
+        lbz     r7,PACAIRQHAPPENED(r13)
+        andi.   r0,r3,MSR_EE
+        beq     1f
+        rlwinm  r7,r7,0,~PACA_IRQ_HARD_DIS
+        stb     r7,PACAIRQHAPPENED(r13)
+1:      li      r0,0
+        stb     r0,PACASOFTIRQEN(r13);
+        TRACE_DISABLE_INTS
+        b       do_restore
+        /*
         * Something did happen, check if a re-emit is needed
         * (this also clears paca->irq_happened)
         */
@@ -748,6 +763,9 @@ restore_check_irq_replay:
 #endif /* CONFIG_PPC_BOOK3E */
 1:      b       .ret_from_except /* What else to do here ? */
 
+3:
 do_work:
 #ifdef CONFIG_PREEMPT
        andi.   r0,r3,MSR_PR    /* Returning to user mode? */
@@ -767,16 +785,6 @@ do_work:
        SOFT_DISABLE_INTS(r3,r4)
 1:      bl      .preempt_schedule_irq
-        /* Hard-disable interrupts again (and update PACA) */
-#ifdef CONFIG_PPC_BOOK3E
-        wrteei  0
-#else
-        ld      r10,PACAKMSR(r13) /* Get kernel MSR without EE */
-        mtmsrd  r10,1
-#endif /* CONFIG_PPC_BOOK3E */
-        li      r0,PACA_IRQ_HARD_DIS
-        stb     r0,PACAIRQHAPPENED(r13)
        /* Re-test flags and eventually loop */
        clrrdi  r9,r1,THREAD_SHIFT
        ld      r4,TI_FLAGS(r9)
@@ -787,14 +795,6 @@ do_work:
 user_work:
 #endif /* CONFIG_PREEMPT */
-        /* Enable interrupts */
-#ifdef CONFIG_PPC_BOOK3E
-        wrteei  1
-#else
-        ori     r10,r10,MSR_EE
-        mtmsrd  r10,1
-#endif /* CONFIG_PPC_BOOK3E */
        andi.   r0,r4,_TIF_NEED_RESCHED
        beq     1f
        bl      .restore_interrupts
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index cb705fdbb458..8f880bc77c56 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -768,8 +768,8 @@ alignment_common:
        std     r3,_DAR(r1)
        std     r4,_DSISR(r1)
        bl      .save_nvgprs
+        DISABLE_INTS
        addi    r3,r1,STACK_FRAME_OVERHEAD
-        ENABLE_INTS
        bl      .alignment_exception
        b       .ret_from_except
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 43eb74fcedde..641da9e868ce 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -229,6 +229,19 @@ notrace void arch_local_irq_restore(unsigned long en)
         */
        if (unlikely(irq_happened != PACA_IRQ_HARD_DIS))
                __hard_irq_disable();
+#ifdef CONFIG_TRACE_IRQFLAG
+        else {
+                /*
+                 * We should already be hard disabled here. We had bugs
+                 * where that wasn't the case so let's dbl check it and
+                 * warn if we are wrong. Only do that when IRQ tracing
+                 * is enabled as mfmsr() can be costly.
+                 */
+                if (WARN_ON(mfmsr() & MSR_EE))
+                        __hard_irq_disable();
+        }
+#endif /* CONFIG_TRACE_IRQFLAG */
        set_soft_enabled(0);
        /*
@@ -260,11 +273,17 @@ EXPORT_SYMBOL(arch_local_irq_restore);
 * if they are currently disabled. This is typically called before
 * schedule() or do_signal() when returning to userspace. We do it
 * in C to avoid the burden of dealing with lockdep etc...
+ *
+ * NOTE: This is called with interrupts hard disabled but not marked
+ * as such in paca->irq_happened, so we need to resync this.
 */
 void restore_interrupts(void)
 {
-        if (irqs_disabled())
+        if (irqs_disabled()) {
+                local_paca->irq_happened |= PACA_IRQ_HARD_DIS;
                local_irq_enable();
+        } else
+                __hard_irq_enable();
 }
 #endif /* CONFIG_PPC64 */
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 6aa0c663e247..158972341a2d 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -248,7 +248,7 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
                                   addr, regs->nip, regs->link, code);
        }
-        if (!arch_irq_disabled_regs(regs))
+        if (arch_irqs_disabled() && !arch_irq_disabled_regs(regs))
                local_irq_enable();
        memset(&info, 0, sizeof(info));
@@ -1019,7 +1019,9 @@ void __kprobes program_check_exception(struct pt_regs *regs)
                return;
        }
-        local_irq_enable();
+        /* We restore the interrupt state now */
+        if (!arch_irq_disabled_regs(regs))
+                local_irq_enable();
 #ifdef CONFIG_MATH_EMULATION
        /* (reason & REASON_ILLEGAL) would be the obvious thing here,
@@ -1069,6 +1071,10 @@ void alignment_exception(struct pt_regs *regs)
 {
        int sig, code, fixed = 0;
+        /* We restore the interrupt state now */
+        if (!arch_irq_disabled_regs(regs))
+                local_irq_enable();
        /* we don't implement logging of alignment exceptions */
        if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS))
                fixed = fix_alignment(regs);
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index ddc485a529f2..c3beaeef3f60 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -258,6 +258,8 @@ static long kvmppc_get_guest_page(struct kvm *kvm, unsigned long gfn,
                            !(memslot->userspace_addr & (s - 1))) {
                                start &= ~(s - 1);
                                pgsize = s;
+                                get_page(hpage);
+                                put_page(page);
                                page = hpage;
                        }
                }
@@ -281,11 +283,8 @@ static long kvmppc_get_guest_page(struct kvm *kvm, unsigned long gfn,
        err = 0;
 out:
-        if (got) {
+        if (got)
-                if (PageHuge(page))
-                        page = compound_head(page);
                put_page(page);
-        }
        return err;
 up_err:
@@ -678,8 +677,15 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,
                SetPageDirty(page);
 out_put:
-        if (page)
+        if (page) {
-                put_page(page);
+                /*
+                 * We drop pages[0] here, not page because page might
+                 * have been set to the head page of a compound, but
+                 * we have to drop the reference on the correct tail
+                 * page to match the get inside gup()
+                 */
+                put_page(pages[0]);
+        }
        return ret;
 out_unlock:
@@ -979,6 +985,7 @@ void *kvmppc_pin_guest_page(struct kvm *kvm, unsigned long gpa,
                        pa = *physp;
                }
                page = pfn_to_page(pa >> PAGE_SHIFT);
+                get_page(page);
        } else {
                hva = gfn_to_hva_memslot(memslot, gfn);
                npages = get_user_pages_fast(hva, 1, 1, pages);
@@ -991,8 +998,6 @@ void *kvmppc_pin_guest_page(struct kvm *kvm, unsigned long gpa,
                page = compound_head(page);
                psize <<= compound_order(page);
        }
-        if (!kvm->arch.using_mmu_notifiers)
-                get_page(page);
        offset = gpa & (psize - 1);
        if (nb_ret)
                *nb_ret = psize - offset;
@@ -1003,7 +1008,6 @@ void kvmppc_unpin_guest_page(struct kvm *kvm, void *va)
 {
        struct page *page = virt_to_page(va);
-        page = compound_head(page);
        put_page(page);
 }
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 01294a5099dd..108d1f580177 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -1192,8 +1192,6 @@ static void unpin_slot(struct kvm *kvm, int slot_id)
                                continue;
                        pfn = physp[j] >> PAGE_SHIFT;
                        page = pfn_to_page(pfn);
-                        if (PageHuge(page))
-                                page = compound_head(page);
                        SetPageDirty(page);
                        put_page(page);
                }
diff --git a/arch/sparc/kernel/central.c b/arch/sparc/kernel/central.c
index 38d48a59879c..9708851a8b9f 100644
--- a/arch/sparc/kernel/central.c
+++ b/arch/sparc/kernel/central.c
@@ -269,4 +269,4 @@ static int __init sunfire_init(void)
        return 0;
 }
-subsys_initcall(sunfire_init);
+fs_initcall(sunfire_init);
diff --git a/arch/sparc/mm/ultra.S b/arch/sparc/mm/ultra.S
index b57a5942ba64..874162a11ceb 100644
--- a/arch/sparc/mm/ultra.S
+++ b/arch/sparc/mm/ultra.S
@@ -495,11 +495,11 @@ xcall_fetch_glob_regs:
        stx             %o7, [%g1 + GR_SNAP_O7]
        stx             %i7, [%g1 + GR_SNAP_I7]
        /* Don't try this at home kids... */
-        rdpr            %cwp, %g2
+        rdpr            %cwp, %g3
-        sub             %g2, 1, %g7
+        sub             %g3, 1, %g7
        wrpr            %g7, %cwp
        mov             %i7, %g7
-        wrpr            %g2, %cwp
+        wrpr            %g3, %cwp
        stx             %g7, [%g1 + GR_SNAP_RPC]
        sethi           %hi(trap_block), %g7
        or              %g7, %lo(trap_block), %g7
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index b8ba6e4a27e4..e554e5ad2fe8 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -79,7 +79,6 @@ struct kvm_task_sleep_node {
        u32 token;
        int cpu;
        bool halted;
-        struct mm_struct *mm;
 };
 static struct kvm_task_sleep_head {
@@ -126,9 +125,7 @@ void kvm_async_pf_task_wait(u32 token)
        n.token = token;
        n.cpu = smp_processor_id();
-        n.mm = current->active_mm;
        n.halted = idle || preempt_count() > 1;
-        atomic_inc(&n.mm->mm_count);
        init_waitqueue_head(&n.wq);
        hlist_add_head(&n.link, &b->list);
        spin_unlock(&b->lock);
@@ -161,9 +158,6 @@ EXPORT_SYMBOL_GPL(kvm_async_pf_task_wait);
 static void apf_task_wake_one(struct kvm_task_sleep_node *n)
 {
        hlist_del_init(&n->link);
-        if (!n->mm)
-                return;
-        mmdrop(n->mm);
        if (n->halted)
                smp_send_reschedule(n->cpu);
        else if (waitqueue_active(&n->wq))
@@ -207,7 +201,7 @@ again:
                 * async PF was not yet handled.
                 * Add dummy entry for the token.
                 */
-                n = kmalloc(sizeof(*n), GFP_ATOMIC);
+                n = kzalloc(sizeof(*n), GFP_ATOMIC);
                if (!n) {
                        /*
                         * Allocation failed! Busy wait while other cpu
@@ -219,7 +213,6 @@ again:
                }
                n->token = token;
                n->cpu = smp_processor_id();
-                n->mm = NULL;
                init_waitqueue_head(&n->wq);
                hlist_add_head(&n->link, &b->list);
        } else
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 733ca39f367e..43d8b48b23e6 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -423,6 +423,7 @@ void set_personality_ia32(bool x32)
                current_thread_info()->status |= TS_COMPAT;
        }
 }
+EXPORT_SYMBOL_GPL(set_personality_ia32);
 unsigned long get_wchan(struct task_struct *p)
 {
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 71f4727da373..5a98aa272184 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -185,10 +185,22 @@ void __init setup_per_cpu_areas(void)
 #endif
        rc = -EINVAL;
        if (pcpu_chosen_fc != PCPU_FC_PAGE) {
-                const size_t atom_size = cpu_has_pse ? PMD_SIZE : PAGE_SIZE;
                const size_t dyn_size = PERCPU_MODULE_RESERVE +
                        PERCPU_DYNAMIC_RESERVE - PERCPU_FIRST_CHUNK_RESERVE;
+                size_t atom_size;
+                /*
+                 * On 64bit, use PMD_SIZE for atom_size so that embedded
+                 * percpu areas are aligned to PMD.  This, in the future,
+                 * can also allow using PMD mappings in vmalloc area.  Use
+                 * PAGE_SIZE on 32bit as vmalloc space is highly contended
+                 * and large vmalloc area allocs can easily fail.
+                 */
+#ifdef CONFIG_X86_64
+                atom_size = PMD_SIZE;
+#else
+                atom_size = PAGE_SIZE;
+#endif
                rc = pcpu_embed_first_chunk(PERCPU_FIRST_CHUNK_RESERVE,
                                            dyn_size, atom_size,
                                            pcpu_cpu_distance,
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 91a5e989abcf..185a2b823a2d 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6581,6 +6581,7 @@ void kvm_arch_async_page_present(struct kvm_vcpu *vcpu,
                kvm_inject_page_fault(vcpu, &fault);
        }
        vcpu->arch.apf.halted = false;
+        vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
 }
 bool kvm_arch_can_inject_async_page_present(struct kvm_vcpu *vcpu)
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index a8f8844b8d32..95dccce8e979 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -63,6 +63,7 @@
 #include <asm/stackprotector.h>
 #include <asm/hypervisor.h>
 #include <asm/mwait.h>
+#include <asm/pci_x86.h>
 #ifdef CONFIG_ACPI
 #include <linux/acpi.h>
@@ -809,9 +810,40 @@ static void xen_io_delay(void)
 }
 #ifdef CONFIG_X86_LOCAL_APIC
+static unsigned long xen_set_apic_id(unsigned int x)
+{
+        WARN_ON(1);
+        return x;
+}
+static unsigned int xen_get_apic_id(unsigned long x)
+{
+        return ((x)>>24) & 0xFFu;
+}
 static u32 xen_apic_read(u32 reg)
 {
-        return 0;
+        struct xen_platform_op op = {
+                .cmd = XENPF_get_cpuinfo,
+                .interface_version = XENPF_INTERFACE_VERSION,
+                .u.pcpu_info.xen_cpuid = 0,
+        };
+        int ret = 0;
+        /* Shouldn't need this as APIC is turned off for PV, and we only
+         * get called on the bootup processor. But just in case. */
+        if (!xen_initial_domain() || smp_processor_id())
+                return 0;
+        if (reg == APIC_LVR)
+                return 0x10;
+        if (reg != APIC_ID)
+                return 0;
+        ret = HYPERVISOR_dom0_op(&op);
+        if (ret)
+                return 0;
+        return op.u.pcpu_info.apic_id << 24;
 }
 static void xen_apic_write(u32 reg, u32 val)
@@ -849,6 +881,8 @@ static void set_xen_basic_apic_ops(void)
        apic->icr_write = xen_apic_icr_write;
        apic->wait_icr_idle = xen_apic_wait_icr_idle;
        apic->safe_wait_icr_idle = xen_safe_apic_wait_icr_idle;
+        apic->set_apic_id = xen_set_apic_id;
+        apic->get_apic_id = xen_get_apic_id;
 }
 #endif
@@ -1365,8 +1399,10 @@ asmlinkage void __init xen_start_kernel(void)
                /* Make sure ACS will be enabled */
                pci_request_acs();
        }
-                
+#ifdef CONFIG_PCI
+        /* PCI BIOS service won't work from a PV guest. */
+        pci_probe &= ~PCI_PROBE_BIOS;
+#endif
        xen_raw_console_write("about to get started...\n");
        xen_setup_runstate_info(0);
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index b8e279479a6b..69f5857660ac 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -353,8 +353,13 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
 {
        if (val & _PAGE_PRESENT) {
                unsigned long mfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
+                unsigned long pfn = mfn_to_pfn(mfn);
                pteval_t flags = val & PTE_FLAGS_MASK;
-                val = ((pteval_t)mfn_to_pfn(mfn) << PAGE_SHIFT) | flags;
+                if (unlikely(pfn == ~0))
+                        val = flags & ~_PAGE_PRESENT;
+                else
+                        val = ((pteval_t)pfn << PAGE_SHIFT) | flags;
        }
        return val;
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 7a3f535e481c..bb80853ff27a 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -775,9 +775,11 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
                        map->format.parse_val(val + i);
        } else {
                for (i = 0; i < val_count; i++) {
-                        ret = regmap_read(map, reg + i, val + (i * val_bytes));
+                        unsigned int ival;
+                        ret = regmap_read(map, reg + i, &ival);
                        if (ret != 0)
                                return ret;
+                        memcpy(val + (i * val_bytes), &ival, val_bytes);
                }
        }
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index abfaacaaf346..946166e13953 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -2297,7 +2297,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
                return;
        }
-        if (!cap_raised(current_cap(), CAP_SYS_ADMIN)) {
+        if (!capable(CAP_SYS_ADMIN)) {
                retcode = ERR_PERM;
                goto fail;
        }
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 1adc2ec1e383..4461540653a8 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -965,18 +965,15 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
        }
        _gpio_rmw(base, bank->regs->irqenable, l, bank->regs->irqenable_inv);
-        _gpio_rmw(base, bank->regs->irqstatus, l,
+        _gpio_rmw(base, bank->regs->irqstatus, l, !bank->regs->irqenable_inv);
-                                        bank->regs->irqenable_inv == false);
-        _gpio_rmw(base, bank->regs->irqenable, l, bank->regs->debounce_en != 0);
-        _gpio_rmw(base, bank->regs->irqenable, l, bank->regs->ctrl != 0);
        if (bank->regs->debounce_en)
-                _gpio_rmw(base, bank->regs->debounce_en, 0, 1);
+                __raw_writel(0, base + bank->regs->debounce_en);
        /* Save OE default value (0xffffffff) in the context */
        bank->context.oe = __raw_readl(bank->base + bank->regs->direction);
         /* Initialize interface clk ungated, module enabled */
        if (bank->regs->ctrl)
-                _gpio_rmw(base, bank->regs->ctrl, 0, 1);
+                __raw_writel(0, base + bank->regs->ctrl);
 }
 static __devinit void
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index e8729cc2ba2b..2cd958e0b822 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -230,16 +230,12 @@ static void pch_gpio_setup(struct pch_gpio *chip)
 static int pch_irq_type(struct irq_data *d, unsigned int type)
 {
-        u32 im;
-        u32 __iomem *im_reg;
-        u32 ien;
-        u32 im_pos;
-        int ch;
-        unsigned long flags;
-        u32 val;
-        int irq = d->irq;
        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
        struct pch_gpio *chip = gc->private;
+        u32 im, im_pos, val;
+        u32 __iomem *im_reg;
+        unsigned long flags;
+        int ch, irq = d->irq;
        ch = irq - chip->irq_base;
        if (irq <= chip->irq_base + 7) {
@@ -270,30 +266,22 @@ static int pch_irq_type(struct irq_data *d, unsigned int type)
        case IRQ_TYPE_LEVEL_LOW:
                val = PCH_LEVEL_L;
                break;
-        case IRQ_TYPE_PROBE:
-                goto end;
        default:
-                dev_warn(chip->dev, "%s: unknown type(%dd)",
+                goto unlock;
-                        __func__, type);
-                goto end;
        }
        /* Set interrupt mode */
        im = ioread32(im_reg) & ~(PCH_IM_MASK << (im_pos * 4));
        iowrite32(im | (val << (im_pos * 4)), im_reg);
-        /* iclr */
+        /* And the handler */
-        iowrite32(BIT(ch), &chip->reg->iclr);
+        if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
+                __irq_set_handler_locked(d->irq, handle_level_irq);
+        else if (type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))
+                __irq_set_handler_locked(d->irq, handle_edge_irq);
-        /* IMASKCLR */
+unlock:
-        iowrite32(BIT(ch), &chip->reg->imaskclr);
-        /* Enable interrupt */
-        ien = ioread32(&chip->reg->ien);
-        iowrite32(ien | BIT(ch), &chip->reg->ien);
-end:
        spin_unlock_irqrestore(&chip->spinlock, flags);
        return 0;
 }
@@ -313,18 +301,24 @@ static void pch_irq_mask(struct irq_data *d)
        iowrite32(1 << (d->irq - chip->irq_base), &chip->reg->imask);
 }
+static void pch_irq_ack(struct irq_data *d)
+{
+        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+        struct pch_gpio *chip = gc->private;
+        iowrite32(1 << (d->irq - chip->irq_base), &chip->reg->iclr);
+}
 static irqreturn_t pch_gpio_handler(int irq, void *dev_id)
 {
        struct pch_gpio *chip = dev_id;
        u32 reg_val = ioread32(&chip->reg->istatus);
-        int i;
+        int i, ret = IRQ_NONE;
-        int ret = IRQ_NONE;
        for (i = 0; i < gpio_pins[chip->ioh]; i++) {
                if (reg_val & BIT(i)) {
                        dev_dbg(chip->dev, "%s:[%d]:irq=%d  status=0x%x\n",
                                __func__, i, irq, reg_val);
-                        iowrite32(BIT(i), &chip->reg->iclr);
                        generic_handle_irq(chip->irq_base + i);
                        ret = IRQ_HANDLED;
                }
@@ -343,6 +337,7 @@ static __devinit void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
        gc->private = chip;
        ct = gc->chip_types;
+        ct->chip.irq_ack = pch_irq_ack;
        ct->chip.irq_mask = pch_irq_mask;
        ct->chip.irq_unmask = pch_irq_unmask;
        ct->chip.irq_set_type = pch_irq_type;
@@ -357,6 +352,7 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
        s32 ret;
        struct pch_gpio *chip;
        int irq_base;
+        u32 msk;
        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
        if (chip == NULL)
@@ -408,8 +404,13 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
        }
        chip->irq_base = irq_base;
+        /* Mask all interrupts, but enable them */
+        msk = (1 << gpio_pins[chip->ioh]) - 1;
+        iowrite32(msk, &chip->reg->imask);
+        iowrite32(msk, &chip->reg->ien);
        ret = request_irq(pdev->irq, pch_gpio_handler,
-                             IRQF_SHARED, KBUILD_MODNAME, chip);
+                          IRQF_SHARED, KBUILD_MODNAME, chip);
        if (ret != 0) {
                dev_err(&pdev->dev,
                        "%s request_irq failed\n", __func__);
@@ -418,8 +419,6 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
        pch_gpio_alloc_generic_chip(chip, irq_base, gpio_pins[chip->ioh]);
-        /* Initialize interrupt ien register */
-        iowrite32(0, &chip->reg->ien);
 end:
        return 0;
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index 19d6fc0229c3..e991d9171961 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -452,12 +452,14 @@ static struct samsung_gpio_cfg s3c24xx_gpiocfg_banka = {
 };
 #endif
+#if defined(CONFIG_ARCH_EXYNOS4) || defined(CONFIG_ARCH_EXYNOS5)
 static struct samsung_gpio_cfg exynos_gpio_cfg = {
        .set_pull       = exynos_gpio_setpull,
        .get_pull       = exynos_gpio_getpull,
        .set_config     = samsung_gpio_setcfg_4bit,
        .get_config     = samsung_gpio_getcfg_4bit,
 };
+#endif
 #if defined(CONFIG_CPU_S5P6440) || defined(CONFIG_CPU_S5P6450)
 static struct samsung_gpio_cfg s5p64x0_gpio_cfg_rbank = {
@@ -2123,8 +2125,8 @@ static struct samsung_gpio_chip s5pv210_gpios_4bit[] = {
 * uses the above macro and depends on the banks being listed in order here.
 */
-static struct samsung_gpio_chip exynos4_gpios_1[] = {
 #ifdef CONFIG_ARCH_EXYNOS4
+static struct samsung_gpio_chip exynos4_gpios_1[] = {
        {
                .chip   = {
                        .base   = EXYNOS4_GPA0(0),
@@ -2222,11 +2224,11 @@ static struct samsung_gpio_chip exynos4_gpios_1[] = {
                        .label  = "GPF3",
                },
        },
-#endif
 };
+#endif
-static struct samsung_gpio_chip exynos4_gpios_2[] = {
 #ifdef CONFIG_ARCH_EXYNOS4
+static struct samsung_gpio_chip exynos4_gpios_2[] = {
        {
                .chip   = {
                        .base   = EXYNOS4_GPJ0(0),
@@ -2367,11 +2369,11 @@ static struct samsung_gpio_chip exynos4_gpios_2[] = {
                        .to_irq = samsung_gpiolib_to_irq,
                },
        },
-#endif
 };
+#endif
-static struct samsung_gpio_chip exynos4_gpios_3[] = {
 #ifdef CONFIG_ARCH_EXYNOS4
+static struct samsung_gpio_chip exynos4_gpios_3[] = {
        {
                .chip   = {
                        .base   = EXYNOS4_GPZ(0),
@@ -2379,8 +2381,8 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = {
                        .label  = "GPZ",
                },
        },
-#endif
 };
+#endif
 #ifdef CONFIG_ARCH_EXYNOS5
 static struct samsung_gpio_chip exynos5_gpios_1[] = {
@@ -2719,7 +2721,9 @@ static __init int samsung_gpiolib_init(void)
 {
        struct samsung_gpio_chip *chip;
        int i, nr_chips;
+#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS5250)
        void __iomem *gpio_base1, *gpio_base2, *gpio_base3, *gpio_base4;
+#endif
        int group = 0;
        samsung_gpiolib_set_cfg(samsung_gpio_cfgs, ARRAY_SIZE(samsung_gpio_cfgs));
@@ -2971,6 +2975,7 @@ static __init int samsung_gpiolib_init(void)
        return 0;
+#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS5250)
 err_ioremap4:
        iounmap(gpio_base3);
 err_ioremap3:
@@ -2979,6 +2984,7 @@ err_ioremap2:
        iounmap(gpio_base1);
 err_ioremap1:
        return -ENOMEM;
+#endif
 }
 core_initcall(samsung_gpiolib_init);
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 80fce51e2f43..62892a826ede 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -398,10 +398,8 @@ static int init_render_ring(struct intel_ring_buffer *ring)
                        return ret;
        }
-        if (INTEL_INFO(dev)->gen >= 6) {
-                I915_WRITE(INSTPM,
-                           INSTPM_FORCE_ORDERING << 16 | INSTPM_FORCE_ORDERING);
+        if (IS_GEN6(dev)) {
                /* From the Sandybridge PRM, volume 1 part 3, page 24:
                 * "If this bit is set, STCunit will have LRA as replacement
                 *  policy. [...] This bit must be reset.  LRA replacement
@@ -411,6 +409,11 @@ static int init_render_ring(struct intel_ring_buffer *ring)
                           CM0_STC_EVICT_DISABLE_LRA_SNB << CM0_MASK_SHIFT);
        }
+        if (INTEL_INFO(dev)->gen >= 6) {
+                I915_WRITE(INSTPM,
+                           INSTPM_FORCE_ORDERING << 16 | INSTPM_FORCE_ORDERING);
+        }
        return ret;
 }
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 232d77d07d8b..ae5e748f39bb 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1220,8 +1220,14 @@ static bool intel_sdvo_get_capabilities(struct intel_sdvo *intel_sdvo, struct in
 static int intel_sdvo_supports_hotplug(struct intel_sdvo *intel_sdvo)
 {
+        struct drm_device *dev = intel_sdvo->base.base.dev;
        u8 response[2];
+        /* HW Erratum: SDVO Hotplug is broken on all i945G chips, there's noise
+         * on the line. */
+        if (IS_I945G(dev) || IS_I945GM(dev))
+                return false;
        return intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_HOT_PLUG_SUPPORT,
                                    &response, 2) && response[0];
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c
index e2be95af2e52..77e564667b5c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c
@@ -29,10 +29,6 @@
 #include "nouveau_i2c.h"
 #include "nouveau_hw.h"
-#define T_TIMEOUT  2200000
-#define T_RISEFALL 1000
-#define T_HOLD     5000
 static void
 i2c_drive_scl(void *data, int state)
 {
@@ -113,175 +109,6 @@ i2c_sense_sda(void *data)
        return 0;
 }
-static void
-i2c_delay(struct nouveau_i2c_chan *port, u32 nsec)
-{
-        udelay((nsec + 500) / 1000);
-}
-static bool
-i2c_raise_scl(struct nouveau_i2c_chan *port)
-{
-        u32 timeout = T_TIMEOUT / T_RISEFALL;
-        i2c_drive_scl(port, 1);
-        do {
-                i2c_delay(port, T_RISEFALL);
-        } while (!i2c_sense_scl(port) && --timeout);
-        return timeout != 0;
-}
-static int
-i2c_start(struct nouveau_i2c_chan *port)
-{
-        int ret = 0;
-        port->state  = i2c_sense_scl(port);
-        port->state |= i2c_sense_sda(port) << 1;
-        if (port->state != 3) {
-                i2c_drive_scl(port, 0);
-                i2c_drive_sda(port, 1);
-                if (!i2c_raise_scl(port))
-                        ret = -EBUSY;
-        }
-        i2c_drive_sda(port, 0);
-        i2c_delay(port, T_HOLD);
-        i2c_drive_scl(port, 0);
-        i2c_delay(port, T_HOLD);
-        return ret;
-}
-static void
-i2c_stop(struct nouveau_i2c_chan *port)
-{
-        i2c_drive_scl(port, 0);
-        i2c_drive_sda(port, 0);
-        i2c_delay(port, T_RISEFALL);
-        i2c_drive_scl(port, 1);
-        i2c_delay(port, T_HOLD);
-        i2c_drive_sda(port, 1);
-        i2c_delay(port, T_HOLD);
-}
-static int
-i2c_bitw(struct nouveau_i2c_chan *port, int sda)
-{
-        i2c_drive_sda(port, sda);
-        i2c_delay(port, T_RISEFALL);
-        if (!i2c_raise_scl(port))
-                return -ETIMEDOUT;
-        i2c_delay(port, T_HOLD);
-        i2c_drive_scl(port, 0);
-        i2c_delay(port, T_HOLD);
-        return 0;
-}
-static int
-i2c_bitr(struct nouveau_i2c_chan *port)
-{
-        int sda;
-        i2c_drive_sda(port, 1);
-        i2c_delay(port, T_RISEFALL);
-        if (!i2c_raise_scl(port))
-                return -ETIMEDOUT;
-        i2c_delay(port, T_HOLD);
-        sda = i2c_sense_sda(port);
-        i2c_drive_scl(port, 0);
-        i2c_delay(port, T_HOLD);
-        return sda;
-}
-static int
-i2c_get_byte(struct nouveau_i2c_chan *port, u8 *byte, bool last)
-{
-        int i, bit;
-        *byte = 0;
-        for (i = 7; i >= 0; i--) {
-                bit = i2c_bitr(port);
-                if (bit < 0)
-                        return bit;
-                *byte |= bit << i;
-        }
-        return i2c_bitw(port, last ? 1 : 0);
-}
-static int
-i2c_put_byte(struct nouveau_i2c_chan *port, u8 byte)
-{
-        int i, ret;
-        for (i = 7; i >= 0; i--) {
-                ret = i2c_bitw(port, !!(byte & (1 << i)));
-                if (ret < 0)
-                        return ret;
-        }
-        ret = i2c_bitr(port);
-        if (ret == 1) /* nack */
-                ret = -EIO;
-        return ret;
-}
-static int
-i2c_addr(struct nouveau_i2c_chan *port, struct i2c_msg *msg)
-{
-        u32 addr = msg->addr << 1;
-        if (msg->flags & I2C_M_RD)
-                addr |= 1;
-        return i2c_put_byte(port, addr);
-}
-static int
-i2c_bit_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
-{
-        struct nouveau_i2c_chan *port = (struct nouveau_i2c_chan *)adap;
-        struct i2c_msg *msg = msgs;
-        int ret = 0, mcnt = num;
-        while (!ret && mcnt--) {
-                u8 remaining = msg->len;
-                u8 *ptr = msg->buf;
-                ret = i2c_start(port);
-                if (ret == 0)
-                        ret = i2c_addr(port, msg);
-                if (msg->flags & I2C_M_RD) {
-                        while (!ret && remaining--)
-                                ret = i2c_get_byte(port, ptr++, !remaining);
-                } else {
-                        while (!ret && remaining--)
-                                ret = i2c_put_byte(port, *ptr++);
-                }
-                msg++;
-        }
-        i2c_stop(port);
-        return (ret < 0) ? ret : num;
-}
-static u32
-i2c_bit_func(struct i2c_adapter *adap)
-{
-        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
-}
-const struct i2c_algorithm nouveau_i2c_bit_algo = {
-        .master_xfer = i2c_bit_xfer,
-        .functionality = i2c_bit_func
-};
 static const uint32_t nv50_i2c_port[] = {
        0x00e138, 0x00e150, 0x00e168, 0x00e180,
        0x00e254, 0x00e274, 0x00e764, 0x00e780,
@@ -384,12 +211,10 @@ nouveau_i2c_init(struct drm_device *dev)
                case 0: /* NV04:NV50 */
                        port->drive = entry[0];
                        port->sense = entry[1];
-                        port->adapter.algo = &nouveau_i2c_bit_algo;
                        break;
                case 4: /* NV4E */
                        port->drive = 0x600800 + entry[1];
                        port->sense = port->drive;
-                        port->adapter.algo = &nouveau_i2c_bit_algo;
                        break;
                case 5: /* NV50- */
                        port->drive = entry[0] & 0x0f;
@@ -402,7 +227,6 @@ nouveau_i2c_init(struct drm_device *dev)
                                port->drive = 0x00d014 + (port->drive * 0x20);
                                port->sense = port->drive;
                        }
-                        port->adapter.algo = &nouveau_i2c_bit_algo;
                        break;
                case 6: /* NV50- DP AUX */
                        port->drive = entry[0];
@@ -413,7 +237,7 @@ nouveau_i2c_init(struct drm_device *dev)
                        break;
                }
-                if (!port->adapter.algo) {
+                if (!port->adapter.algo && !port->drive) {
                        NV_ERROR(dev, "I2C%d: type %d index %x/%x unknown\n",
                                 i, port->type, port->drive, port->sense);
                        kfree(port);
@@ -429,7 +253,26 @@ nouveau_i2c_init(struct drm_device *dev)
                port->dcb = ROM32(entry[0]);
                i2c_set_adapdata(&port->adapter, i2c);
-                ret = i2c_add_adapter(&port->adapter);
+                if (port->adapter.algo != &nouveau_dp_i2c_algo) {
+                        port->adapter.algo_data = &port->bit;
+                        port->bit.udelay = 10;
+                        port->bit.timeout = usecs_to_jiffies(2200);
+                        port->bit.data = port;
+                        port->bit.setsda = i2c_drive_sda;
+                        port->bit.setscl = i2c_drive_scl;
+                        port->bit.getsda = i2c_sense_sda;
+                        port->bit.getscl = i2c_sense_scl;
+                        i2c_drive_scl(port, 0);
+                        i2c_drive_sda(port, 1);
+                        i2c_drive_scl(port, 1);
+                        ret = i2c_bit_add_bus(&port->adapter);
+                } else {
+                        port->adapter.algo = &nouveau_dp_i2c_algo;
+                        ret = i2c_add_adapter(&port->adapter);
+                }
                if (ret) {
                        NV_ERROR(dev, "I2C%d: failed register: %d\n", i, ret);
                        kfree(port);
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h
index 4d2e4e9031be..1d083893a4d7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.h
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.h
@@ -34,6 +34,7 @@
 struct nouveau_i2c_chan {
        struct i2c_adapter adapter;
        struct drm_device *dev;
+        struct i2c_algo_bit_data bit;
        struct list_head head;
        u8  index;
        u8  type;
diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index d8433f2d53bc..73973fdbd8be 100644
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -112,7 +112,7 @@ err_free_addr:
        return err;
 }
-static void __devexit gpio_ext_free(struct netxbig_gpio_ext *gpio_ext)
+static void gpio_ext_free(struct netxbig_gpio_ext *gpio_ext)
 {
        int i;
@@ -294,7 +294,7 @@ static ssize_t netxbig_led_sata_show(struct device *dev,
 static DEVICE_ATTR(sata, 0644, netxbig_led_sata_show, netxbig_led_sata_store);
-static void __devexit delete_netxbig_led(struct netxbig_led_data *led_dat)
+static void delete_netxbig_led(struct netxbig_led_data *led_dat)
 {
        if (led_dat->mode_val[NETXBIG_LED_SATA] != NETXBIG_LED_INVALID_MODE)
                device_remove_file(led_dat->cdev.dev, &dev_attr_sata);
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index 2f0a14421a73..01cf89ec6944 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -255,7 +255,7 @@ err_free_cmd:
        return ret;
 }
-static void __devexit delete_ns2_led(struct ns2_led_data *led_dat)
+static void delete_ns2_led(struct ns2_led_data *led_dat)
 {
        device_remove_file(led_dat->cdev.dev, &dev_attr_sata);
        led_classdev_unregister(&led_dat->cdev);
diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c
index 1f23e048f077..08d9a207259a 100644
--- a/drivers/md/dm-log-userspace-transfer.c
+++ b/drivers/md/dm-log-userspace-transfer.c
@@ -134,7 +134,7 @@ static void cn_ulog_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)
 {
        struct dm_ulog_request *tfr = (struct dm_ulog_request *)(msg + 1);
-        if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
+        if (!capable(CAP_SYS_ADMIN))
                return;
        spin_lock(&receiving_list_lock);
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 922a3385eead..754f38f8a692 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -718,8 +718,8 @@ static int parse_hw_handler(struct dm_arg_set *as, struct multipath *m)
                return 0;
        m->hw_handler_name = kstrdup(dm_shift_arg(as), GFP_KERNEL);
-        request_module("scsi_dh_%s", m->hw_handler_name);
+        if (!try_then_request_module(scsi_dh_handler_exist(m->hw_handler_name),
-        if (scsi_dh_handler_exist(m->hw_handler_name) == 0) {
+                                     "scsi_dh_%s", m->hw_handler_name)) {
                ti->error = "unknown hardware handler type";
                ret = -EINVAL;
                goto fail;
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index 213ae32a0fc4..2fd87b544a93 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -279,8 +279,10 @@ static void __cell_release(struct cell *cell, struct bio_list *inmates)
        hlist_del(&cell->list);
-        bio_list_add(inmates, cell->holder);
+        if (inmates) {
-        bio_list_merge(inmates, &cell->bios);
+                bio_list_add(inmates, cell->holder);
+                bio_list_merge(inmates, &cell->bios);
+        }
        mempool_free(cell, prison->cell_pool);
 }
@@ -303,9 +305,10 @@ static void cell_release(struct cell *cell, struct bio_list *bios)
 */
 static void __cell_release_singleton(struct cell *cell, struct bio *bio)
 {
-        hlist_del(&cell->list);
        BUG_ON(cell->holder != bio);
        BUG_ON(!bio_list_empty(&cell->bios));
+        __cell_release(cell, NULL);
 }
 static void cell_release_singleton(struct cell *cell, struct bio *bio)
@@ -1177,6 +1180,7 @@ static void no_space(struct cell *cell)
 static void process_discard(struct thin_c *tc, struct bio *bio)
 {
        int r;
+        unsigned long flags;
        struct pool *pool = tc->pool;
        struct cell *cell, *cell2;
        struct cell_key key, key2;
@@ -1218,7 +1222,9 @@ static void process_discard(struct thin_c *tc, struct bio *bio)
                        m->bio = bio;
                        if (!ds_add_work(&pool->all_io_ds, &m->list)) {
+                                spin_lock_irqsave(&pool->lock, flags);
                                list_add(&m->list, &pool->prepared_discards);
+                                spin_unlock_irqrestore(&pool->lock, flags);
                                wake_worker(pool);
                        }
                } else {
@@ -2626,8 +2632,10 @@ static int thin_endio(struct dm_target *ti,
        if (h->all_io_entry) {
                INIT_LIST_HEAD(&work);
                ds_dec(h->all_io_entry, &work);
+                spin_lock_irqsave(&pool->lock, flags);
                list_for_each_entry_safe(m, tmp, &work, list)
                        list_add(&m->list, &pool->prepared_discards);
+                spin_unlock_irqrestore(&pool->lock, flags);
        }
        mempool_free(h, pool->endio_hook_pool);
@@ -2759,6 +2767,6 @@ static void dm_thin_exit(void)
 module_init(dm_thin_init);
 module_exit(dm_thin_exit);
-MODULE_DESCRIPTION(DM_NAME "device-mapper thin provisioning target");
+MODULE_DESCRIPTION(DM_NAME " thin provisioning target");
 MODULE_AUTHOR("Joe Thornber <dm-devel@redhat.com>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 1d3bfb26080c..0f50ef38b87b 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
@@ -74,11 +75,13 @@ static void orion_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
 static int __init orion_nand_probe(struct platform_device *pdev)
 {
        struct mtd_info *mtd;
+        struct mtd_part_parser_data ppdata = {};
        struct nand_chip *nc;
        struct orion_nand_data *board;
        struct resource *res;
        void __iomem *io_base;
        int ret = 0;
+        u32 val = 0;
        nc = kzalloc(sizeof(struct nand_chip) + sizeof(struct mtd_info), GFP_KERNEL);
        if (!nc) {
@@ -101,7 +104,32 @@ static int __init orion_nand_probe(struct platform_device *pdev)
                goto no_res;
        }
-        board = pdev->dev.platform_data;
+        if (pdev->dev.of_node) {
+                board = devm_kzalloc(&pdev->dev, sizeof(struct orion_nand_data),
+                                        GFP_KERNEL);
+                if (!board) {
+                        printk(KERN_ERR "orion_nand: failed to allocate board structure.\n");
+                        ret = -ENOMEM;
+                        goto no_res;
+                }
+                if (!of_property_read_u32(pdev->dev.of_node, "cle", &val))
+                        board->cle = (u8)val;
+                else
+                        board->cle = 0;
+                if (!of_property_read_u32(pdev->dev.of_node, "ale", &val))
+                        board->ale = (u8)val;
+                else
+                        board->ale = 1;
+                if (!of_property_read_u32(pdev->dev.of_node,
+                                                "bank-width", &val))
+                        board->width = (u8)val * 8;
+                else
+                        board->width = 8;
+                if (!of_property_read_u32(pdev->dev.of_node,
+                                                "chip-delay", &val))
+                        board->chip_delay = (u8)val;
+        } else
+                board = pdev->dev.platform_data;
        mtd->priv = nc;
        mtd->owner = THIS_MODULE;
@@ -115,6 +143,10 @@ static int __init orion_nand_probe(struct platform_device *pdev)
        if (board->chip_delay)
                nc->chip_delay = board->chip_delay;
+        WARN(board->width > 16,
+                "%d bit bus width out of range",
+                board->width);
        if (board->width == 16)
                nc->options |= NAND_BUSWIDTH_16;
@@ -129,8 +161,9 @@ static int __init orion_nand_probe(struct platform_device *pdev)
        }
        mtd->name = "orion_nand";
-        ret = mtd_device_parse_register(mtd, NULL, NULL, board->parts,
+        ppdata.of_node = pdev->dev.of_node;
-                                        board->nr_parts);
+        ret = mtd_device_parse_register(mtd, NULL, &ppdata,
+                        board->parts, board->nr_parts);
        if (ret) {
                nand_release(mtd);
                goto no_dev;
@@ -161,11 +194,19 @@ static int __devexit orion_nand_remove(struct platform_device *pdev)
        return 0;
 }
+#ifdef CONFIG_OF
+static struct of_device_id orion_nand_of_match_table[] = {
+        { .compatible = "mrvl,orion-nand", },
+        {},
+};
+#endif
 static struct platform_driver orion_nand_driver = {
        .remove         = __devexit_p(orion_nand_remove),
        .driver         = {
                .name   = "orion_nand",
                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(orion_nand_of_match_table),
        },
 };
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 793b00138275..3463b469e657 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2173,9 +2173,10 @@ re_arm:
 * received frames (loopback). Since only the payload is given to this
 * function, it check for loopback.
 */
-static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u16 length)
+static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u16 length)
 {
        struct port *port;
+        int ret = RX_HANDLER_ANOTHER;
        if (length >= sizeof(struct lacpdu)) {
@@ -2184,11 +2185,12 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                if (!port->slave) {
                        pr_warning("%s: Warning: port of slave %s is uninitialized\n",
                                   slave->dev->name, slave->dev->master->name);
-                        return;
+                        return ret;
                }
                switch (lacpdu->subtype) {
                case AD_TYPE_LACPDU:
+                        ret = RX_HANDLER_CONSUMED;
                        pr_debug("Received LACPDU on port %d\n",
                                 port->actor_port_number);
                        /* Protect against concurrent state machines */
@@ -2198,6 +2200,7 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                        break;
                case AD_TYPE_MARKER:
+                        ret = RX_HANDLER_CONSUMED;
                        // No need to convert fields to Little Endian since we don't use the marker's fields.
                        switch (((struct bond_marker *)lacpdu)->tlv_type) {
@@ -2219,6 +2222,7 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                        }
                }
        }
+        return ret;
 }
 /**
@@ -2456,18 +2460,20 @@ out:
        return NETDEV_TX_OK;
 }
-void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
+int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
                          struct slave *slave)
 {
+        int ret = RX_HANDLER_ANOTHER;
        if (skb->protocol != PKT_TYPE_LACPDU)
-                return;
+                return ret;
        if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
-                return;
+                return ret;
        read_lock(&bond->lock);
-        bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);
+        ret = bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);
        read_unlock(&bond->lock);
+        return ret;
 }
 /*
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 235b2cc58b28..5ee7e3c45db7 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -274,7 +274,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave);
 void bond_3ad_handle_link_change(struct slave *slave, char link);
 int  bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info);
 int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev);
-void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
+int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
                          struct slave *slave);
 int bond_3ad_set_carrier(struct bonding *bond);
 void bond_3ad_update_lacp_rate(struct bonding *bond);
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 62d2409bb293..bc13b3d77432 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1444,8 +1444,9 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
        struct sk_buff *skb = *pskb;
        struct slave *slave;
        struct bonding *bond;
-        void (*recv_probe)(struct sk_buff *, struct bonding *,
+        int (*recv_probe)(struct sk_buff *, struct bonding *,
                                struct slave *);
+        int ret = RX_HANDLER_ANOTHER;
        skb = skb_share_check(skb, GFP_ATOMIC);
        if (unlikely(!skb))
@@ -1464,8 +1465,12 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
                struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);
                if (likely(nskb)) {
-                        recv_probe(nskb, bond, slave);
+                        ret = recv_probe(nskb, bond, slave);
                        dev_kfree_skb(nskb);
+                        if (ret == RX_HANDLER_CONSUMED) {
+                                consume_skb(skb);
+                                return ret;
+                        }
                }
        }
@@ -1487,7 +1492,7 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
                memcpy(eth_hdr(skb)->h_dest, bond->dev->dev_addr, ETH_ALEN);
        }
-        return RX_HANDLER_ANOTHER;
+        return ret;
 }
 /* enslave device <slave> to bond device <master> */
@@ -2723,7 +2728,7 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32
        }
 }
-static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
+static int bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
                         struct slave *slave)
 {
        struct arphdr *arp;
@@ -2731,7 +2736,7 @@ static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
        __be32 sip, tip;
        if (skb->protocol != __cpu_to_be16(ETH_P_ARP))
-                return;
+                return RX_HANDLER_ANOTHER;
        read_lock(&bond->lock);
@@ -2776,6 +2781,7 @@ static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
 out_unlock:
        read_unlock(&bond->lock);
+        return RX_HANDLER_ANOTHER;
 }
 /*
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index e077d2508727..6af310195bae 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -9122,13 +9122,34 @@ static int __devinit bnx2x_prev_unload_common(struct bnx2x *bp)
        return bnx2x_prev_mcp_done(bp);
 }
+/* previous driver DMAE transaction may have occurred when pre-boot stage ended
+ * and boot began, or when kdump kernel was loaded. Either case would invalidate
+ * the addresses of the transaction, resulting in was-error bit set in the pci
+ * causing all hw-to-host pcie transactions to timeout. If this happened we want
+ * to clear the interrupt which detected this from the pglueb and the was done
+ * bit
+ */
+static void __devinit bnx2x_prev_interrupted_dmae(struct bnx2x *bp)
+{
+        u32 val = REG_RD(bp, PGLUE_B_REG_PGLUE_B_INT_STS);
+        if (val & PGLUE_B_PGLUE_B_INT_STS_REG_WAS_ERROR_ATTN) {
+                BNX2X_ERR("was error bit was found to be set in pglueb upon startup. Clearing");
+                REG_WR(bp, PGLUE_B_REG_WAS_ERROR_PF_7_0_CLR, 1 << BP_FUNC(bp));
+        }
+}
 static int __devinit bnx2x_prev_unload(struct bnx2x *bp)
 {
        int time_counter = 10;
        u32 rc, fw, hw_lock_reg, hw_lock_val;
        BNX2X_DEV_INFO("Entering Previous Unload Flow\n");
-       /* Release previously held locks */
+        /* clear hw from errors which may have resulted from an interrupted
+         * dmae transaction.
+         */
+        bnx2x_prev_interrupted_dmae(bp);
+        /* Release previously held locks */
        hw_lock_reg = (BP_FUNC(bp) <= 5) ?
                      (MISC_REG_DRIVER_CONTROL_1 + BP_FUNC(bp) * 8) :
                      (MISC_REG_DRIVER_CONTROL_7 + (BP_FUNC(bp) - 6) * 8);
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index c9069a28832b..f4d2da0db1b1 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -3335,6 +3335,8 @@ static int __devinit ehea_probe_adapter(struct platform_device *dev,
                goto out_shutdown_ports;
        }
+        /* Handle any events that might be pending. */
+        tasklet_hi_schedule(&adapter->neq_tasklet);
        ret = 0;
        goto out;
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 4348b6fd44fa..37caa8885c2a 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -3380,7 +3380,7 @@ static void e1000_dump(struct e1000_adapter *adapter)
        for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
                struct e1000_tx_desc *tx_desc = E1000_TX_DESC(*tx_ring, i);
                struct e1000_buffer *buffer_info = &tx_ring->buffer_info[i];
-                struct my_u { u64 a; u64 b; };
+                struct my_u { __le64 a; __le64 b; };
                struct my_u *u = (struct my_u *)tx_desc;
                const char *type;
@@ -3424,7 +3424,7 @@ rx_ring_summary:
        for (i = 0; rx_ring->desc && (i < rx_ring->count); i++) {
                struct e1000_rx_desc *rx_desc = E1000_RX_DESC(*rx_ring, i);
                struct e1000_buffer *buffer_info = &rx_ring->buffer_info[i];
-                struct my_u { u64 a; u64 b; };
+                struct my_u { __le64 a; __le64 b; };
                struct my_u *u = (struct my_u *)rx_desc;
                const char *type;
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 5ec31598ee47..8683ca4748c8 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1111,9 +1111,12 @@ msi_only:
                adapter->flags |= IGB_FLAG_HAS_MSI;
 out:
        /* Notify the stack of the (possibly) reduced queue counts. */
+        rtnl_lock();
        netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);
-        return netif_set_real_num_rx_queues(adapter->netdev,
+        err = netif_set_real_num_rx_queues(adapter->netdev,
-                                            adapter->num_rx_queues);
+                adapter->num_rx_queues);
+        rtnl_unlock();
+        return err;
 }
 /**
@@ -2771,8 +2774,6 @@ void igb_configure_tx_ring(struct igb_adapter *adapter,
        txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
        wr32(E1000_TXDCTL(reg_idx), txdctl);
-        netdev_tx_reset_queue(txring_txq(ring));
 }
 /**
@@ -3282,6 +3283,8 @@ static void igb_clean_tx_ring(struct igb_ring *tx_ring)
                igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
        }
+        netdev_tx_reset_queue(txring_txq(tx_ring));
        size = sizeof(struct igb_tx_buffer) * tx_ring->count;
        memset(tx_ring->tx_buffer_info, 0, size);
@@ -6796,18 +6799,7 @@ static int igb_resume(struct device *dev)
        pci_enable_wake(pdev, PCI_D3hot, 0);
        pci_enable_wake(pdev, PCI_D3cold, 0);
-        if (!rtnl_is_locked()) {
+        if (igb_init_interrupt_scheme(adapter)) {
-                /*
-                 * shut up ASSERT_RTNL() warning in
-                 * netif_set_real_num_tx/rx_queues.
-                 */
-                rtnl_lock();
-                err = igb_init_interrupt_scheme(adapter);
-                rtnl_unlock();
-        } else {
-                err = igb_init_interrupt_scheme(adapter);
-        }
-        if (err) {
                dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
                return -ENOMEM;
        }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 74e192107f9a..81b155589532 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -574,9 +574,6 @@ extern struct ixgbe_info ixgbe_82599_info;
 extern struct ixgbe_info ixgbe_X540_info;
 #ifdef CONFIG_IXGBE_DCB
 extern const struct dcbnl_rtnl_ops dcbnl_ops;
-extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
-                              struct ixgbe_dcb_config *dst_dcb_cfg,
-                              int tc_max);
 #endif
 extern char ixgbe_driver_name[];
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index 652e4b09546d..32e5c02ff6d0 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -44,18 +44,26 @@
 #define DCB_NO_HW_CHG   1  /* DCB configuration did not change */
 #define DCB_HW_CHG      2  /* DCB configuration changed, no reset */
-int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *scfg,
+static int ixgbe_copy_dcb_cfg(struct ixgbe_adapter *adapter, int tc_max)
-                       struct ixgbe_dcb_config *dcfg, int tc_max)
 {
+        struct ixgbe_dcb_config *scfg = &adapter->temp_dcb_cfg;
+        struct ixgbe_dcb_config *dcfg = &adapter->dcb_cfg;
        struct tc_configuration *src = NULL;
        struct tc_configuration *dst = NULL;
        int i, j;
        int tx = DCB_TX_CONFIG;
        int rx = DCB_RX_CONFIG;
        int changes = 0;
+#ifdef IXGBE_FCOE
+        struct dcb_app app = {
+                              .selector = DCB_APP_IDTYPE_ETHTYPE,
+                              .protocol = ETH_P_FCOE,
+                             };
+        u8 up = dcb_getapp(adapter->netdev, &app);
-        if (!scfg || !dcfg)
+        if (up && !(up & (1 << adapter->fcoe.up)))
-                return changes;
+                changes |= BIT_APP_UPCHG;
+#endif
        for (i = DCB_PG_ATTR_TC_0; i < tc_max + DCB_PG_ATTR_TC_0; i++) {
                src = &scfg->tc_config[i - DCB_PG_ATTR_TC_0];
@@ -332,28 +340,12 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
        int ret = DCB_NO_HW_CHG;
        int i;
-#ifdef IXGBE_FCOE
-        struct dcb_app app = {
-                              .selector = DCB_APP_IDTYPE_ETHTYPE,
-                              .protocol = ETH_P_FCOE,
-                             };
-        u8 up;
-        /* In IEEE mode, use the IEEE Ethertype selector value */
-        if (adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE) {
-                app.selector = IEEE_8021QAZ_APP_SEL_ETHERTYPE;
-                up = dcb_ieee_getapp_mask(netdev, &app);
-        } else {
-                up = dcb_getapp(netdev, &app);
-        }
-#endif
        /* Fail command if not in CEE mode */
        if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
                return ret;
-        adapter->dcb_set_bitmap |= ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg,
+        adapter->dcb_set_bitmap |= ixgbe_copy_dcb_cfg(adapter,
-                                                      &adapter->dcb_cfg,
                                                      MAX_TRAFFIC_CLASS);
        if (!adapter->dcb_set_bitmap)
                return ret;
@@ -440,8 +432,13 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
         * FCoE is using changes. This happens if the APP info
         * changes or the up2tc mapping is updated.
         */
-        if ((up && !(up & (1 << adapter->fcoe.up))) ||
+        if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
-            (adapter->dcb_set_bitmap & BIT_APP_UPCHG)) {
+                struct dcb_app app = {
+                                      .selector = DCB_APP_IDTYPE_ETHTYPE,
+                                      .protocol = ETH_P_FCOE,
+                                     };
+                u8 up = dcb_getapp(netdev, &app);
                adapter->fcoe.up = ffs(up) - 1;
                ixgbe_dcbnl_devreset(netdev);
                ret = DCB_HW_CHG_RST;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 31a2bf76a346..cfe7d269590c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -1780,6 +1780,8 @@ static u16 ixgbe_clean_test_rings(struct ixgbe_ring *rx_ring,
                rx_desc = IXGBE_RX_DESC(rx_ring, rx_ntc);
        }
+        netdev_tx_reset_queue(txring_txq(tx_ring));
        /* re-map buffers to ring, store next to clean values */
        ixgbe_alloc_rx_buffers(rx_ring, count);
        rx_ring->next_to_clean = rx_ntc;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 88f6b2e9b72d..467948e9ecd9 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -2671,8 +2671,6 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter,
        /* enable queue */
        IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx), txdctl);
-        netdev_tx_reset_queue(txring_txq(ring));
        /* TXDCTL.EN will return 0 on 82598 if link is down, so skip it */
        if (hw->mac.type == ixgbe_mac_82598EB &&
            !(IXGBE_READ_REG(hw, IXGBE_LINKS) & IXGBE_LINKS_UP))
@@ -4167,6 +4165,8 @@ static void ixgbe_clean_tx_ring(struct ixgbe_ring *tx_ring)
                ixgbe_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);
        }
+        netdev_tx_reset_queue(txring_txq(tx_ring));
        size = sizeof(struct ixgbe_tx_buffer) * tx_ring->count;
        memset(tx_ring->tx_buffer_info, 0, size);
@@ -4418,8 +4418,8 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
        adapter->dcb_cfg.pfc_mode_enable = false;
        adapter->dcb_set_bitmap = 0x00;
        adapter->dcbx_cap = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_CEE;
-        ixgbe_copy_dcb_cfg(&adapter->dcb_cfg, &adapter->temp_dcb_cfg,
+        memcpy(&adapter->temp_dcb_cfg, &adapter->dcb_cfg,
-                           MAX_TRAFFIC_CLASS);
+               sizeof(adapter->temp_dcb_cfg));
 #endif
@@ -4866,10 +4866,12 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
        netif_device_detach(netdev);
        if (netif_running(netdev)) {
+                rtnl_lock();
                ixgbe_down(adapter);
                ixgbe_free_irq(adapter);
                ixgbe_free_all_tx_resources(adapter);
                ixgbe_free_all_rx_resources(adapter);
+                rtnl_unlock();
        }
        ixgbe_clear_interrupt_scheme(adapter);
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index f8dda009d3c0..5e313e9a252f 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -618,10 +618,8 @@ static void ks8851_irq_work(struct work_struct *work)
        netif_dbg(ks, intr, ks->netdev,
                  "%s: status 0x%04x\n", __func__, status);
-        if (status & IRQ_LCI) {
+        if (status & IRQ_LCI)
-                /* should do something about checking link status */
                handled |= IRQ_LCI;
-        }
        if (status & IRQ_LDI) {
                u16 pmecr = ks8851_rdreg16(ks, KS_PMECR);
@@ -684,6 +682,9 @@ static void ks8851_irq_work(struct work_struct *work)
        mutex_unlock(&ks->lock);
+        if (status & IRQ_LCI)
+                mii_check_link(&ks->mii);
        if (status & IRQ_TXI)
                netif_wake_queue(ks->netdev);
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index f54509377efa..ce6b44d1f252 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -61,8 +61,12 @@
 #define R8169_MSG_DEFAULT \
        (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN)
-#define TX_BUFFS_AVAIL(tp) \
+#define TX_SLOTS_AVAIL(tp) \
-        (tp->dirty_tx + NUM_TX_DESC - tp->cur_tx - 1)
+        (tp->dirty_tx + NUM_TX_DESC - tp->cur_tx)
+/* A skbuff with nr_frags needs nr_frags+1 entries in the tx queue */
+#define TX_FRAGS_READY_FOR(tp,nr_frags) \
+        (TX_SLOTS_AVAIL(tp) >= (nr_frags + 1))
 /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
   The RTL chips use a 64 element hash table based on the Ethernet CRC. */
@@ -5115,7 +5119,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
        u32 opts[2];
        int frags;
-        if (unlikely(TX_BUFFS_AVAIL(tp) < skb_shinfo(skb)->nr_frags)) {
+        if (unlikely(!TX_FRAGS_READY_FOR(tp, skb_shinfo(skb)->nr_frags))) {
                netif_err(tp, drv, dev, "BUG! Tx Ring full when queue awake!\n");
                goto err_stop_0;
        }
@@ -5169,7 +5173,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
        mmiowb();
-        if (TX_BUFFS_AVAIL(tp) < MAX_SKB_FRAGS) {
+        if (!TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS)) {
                /* Avoid wrongly optimistic queue wake-up: rtl_tx thread must
                 * not miss a ring update when it notices a stopped queue.
                 */
@@ -5183,7 +5187,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
                 * can't.
                 */
                smp_mb();
-                if (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)
+                if (TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS))
                        netif_wake_queue(dev);
        }
@@ -5306,7 +5310,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp)
                 */
                smp_mb();
                if (netif_queue_stopped(dev) &&
-                    (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {
+                    TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS)) {
                        netif_wake_queue(dev);
                }
                /*
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 3cbfbffe3f00..4a0005342e65 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1349,7 +1349,7 @@ static int efx_probe_interrupts(struct efx_nic *efx)
        }
        /* RSS might be usable on VFs even if it is disabled on the PF */
-        efx->rss_spread = (efx->n_rx_channels > 1 ?
+        efx->rss_spread = ((efx->n_rx_channels > 1 || !efx_sriov_wanted(efx)) ?
                           efx->n_rx_channels : efx_vf_size(efx));
        return 0;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index f975afdc315c..025367a94add 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -259,7 +259,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
 xmit_world:
        skb->ip_summed = ip_summed;
-        skb_set_dev(skb, vlan->lowerdev);
+        skb->dev = vlan->lowerdev;
        return dev_queue_xmit(skb);
 }
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 0427c6561c84..cb8fd5069dbe 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -1,5 +1,6 @@
 #include <linux/etherdevice.h>
 #include <linux/if_macvlan.h>
+#include <linux/if_vlan.h>
 #include <linux/interrupt.h>
 #include <linux/nsproxy.h>
 #include <linux/compat.h>
@@ -759,6 +760,8 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
        struct macvlan_dev *vlan;
        int ret;
        int vnet_hdr_len = 0;
+        int vlan_offset = 0;
+        int copied;
        if (q->flags & IFF_VNET_HDR) {
                struct virtio_net_hdr vnet_hdr;
@@ -773,18 +776,48 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
                if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr)))
                        return -EFAULT;
        }
+        copied = vnet_hdr_len;
+        if (!vlan_tx_tag_present(skb))
+                len = min_t(int, skb->len, len);
+        else {
+                int copy;
+                struct {
+                        __be16 h_vlan_proto;
+                        __be16 h_vlan_TCI;
+                } veth;
+                veth.h_vlan_proto = htons(ETH_P_8021Q);
+                veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb));
+                vlan_offset = offsetof(struct vlan_ethhdr, h_vlan_proto);
+                len = min_t(int, skb->len + VLAN_HLEN, len);
+                copy = min_t(int, vlan_offset, len);
+                ret = skb_copy_datagram_const_iovec(skb, 0, iv, copied, copy);
+                len -= copy;
+                copied += copy;
+                if (ret || !len)
+                        goto done;
+                copy = min_t(int, sizeof(veth), len);
+                ret = memcpy_toiovecend(iv, (void *)&veth, copied, copy);
+                len -= copy;
+                copied += copy;
+                if (ret || !len)
+                        goto done;
+        }
-        len = min_t(int, skb->len, len);
+        ret = skb_copy_datagram_const_iovec(skb, vlan_offset, iv, copied, len);
+        copied += len;
-        ret = skb_copy_datagram_const_iovec(skb, 0, iv, vnet_hdr_len, len);
+done:
        rcu_read_lock_bh();
        vlan = rcu_dereference_bh(q->vlan);
        if (vlan)
-                macvlan_count_rx(vlan, len, ret == 0, 0);
+                macvlan_count_rx(vlan, copied - vnet_hdr_len, ret == 0, 0);
        rcu_read_unlock_bh();
-        return ret ? ret : (len + vnet_hdr_len);
+        return ret ? ret : copied;
 }
 static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 90a30026a931..00880edba048 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -83,6 +83,7 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
        struct cdc_state                *info = (void *) &dev->data;
        int                             status;
        int                             rndis;
+        bool                            android_rndis_quirk = false;
        struct usb_driver               *driver = driver_of(intf);
        struct usb_cdc_mdlm_desc        *desc = NULL;
        struct usb_cdc_mdlm_detail_desc *detail = NULL;
@@ -195,6 +196,11 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf)
                                        info->control,
                                        info->u->bSlaveInterface0,
                                        info->data);
+                                /* fall back to hard-wiring for RNDIS */
+                                if (rndis) {
+                                        android_rndis_quirk = true;
+                                        goto next_desc;
+                                }
                                goto bad_desc;
                        }
                        if (info->control != intf) {
@@ -271,11 +277,15 @@ next_desc:
        /* Microsoft ActiveSync based and some regular RNDIS devices lack the
         * CDC descriptors, so we'll hard-wire the interfaces and not check
         * for descriptors.
+         *
+         * Some Android RNDIS devices have a CDC Union descriptor pointing
+         * to non-existing interfaces.  Ignore that and attempt the same
+         * hard-wired 0 and 1 interfaces.
         */
-        if (rndis && !info->u) {
+        if (rndis && (!info->u || android_rndis_quirk)) {
                info->control = usb_ifnum_to_if(dev->udev, 0);
                info->data = usb_ifnum_to_if(dev->udev, 1);
-                if (!info->control || !info->data) {
+                if (!info->control || !info->data || info->control != intf) {
                        dev_dbg(&intf->dev,
                                "rndis: master #0/%p slave #1/%p\n",
                                info->control,
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index deb6cfb2959a..600aca9fe6b1 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -373,7 +373,7 @@ static void ar9003_hw_spur_ofdm_work(struct ath_hw *ah,
                        else
                                spur_subchannel_sd = 0;
-                        spur_freq_sd = (freq_offset << 9) / 11;
+                        spur_freq_sd = ((freq_offset + 10) << 9) / 11;
                } else {
                        if (REG_READ_FIELD(ah, AR_PHY_GEN_CTRL,
@@ -382,7 +382,7 @@ static void ar9003_hw_spur_ofdm_work(struct ath_hw *ah,
                        else
                                spur_subchannel_sd = 1;
-                        spur_freq_sd = (freq_offset << 9) / 11;
+                        spur_freq_sd = ((freq_offset - 10) << 9) / 11;
                }
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index eb3829b03cd3..e2b34e1563f4 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -2637,6 +2637,7 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
                                /* after stopping the bus, exit thread */
                                brcmf_sdbrcm_bus_stop(bus->sdiodev->dev);
                                bus->dpc_tsk = NULL;
+                                spin_lock_irqsave(&bus->dpc_tl_lock, flags);
                                break;
                        }
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
index f4b84d1596e3..22474608a70b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
@@ -773,8 +773,7 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
        struct sk_buff *skb;
        __le16 fc = hdr->frame_control;
        struct iwl_rxon_context *ctx;
-        struct page *p;
+        unsigned int hdrlen, fraglen;
-        int offset;
        /* We only process data packets if the interface is open */
        if (unlikely(!priv->is_open)) {
@@ -788,16 +787,24 @@ static void iwlagn_pass_packet_to_mac80211(struct iwl_priv *priv,
            iwlagn_set_decrypted_flag(priv, hdr, ampdu_status, stats))
                return;
-        skb = dev_alloc_skb(128);
+        /* Dont use dev_alloc_skb(), we'll have enough headroom once
+         * ieee80211_hdr pulled.
+         */
+        skb = alloc_skb(128, GFP_ATOMIC);
        if (!skb) {
-                IWL_ERR(priv, "dev_alloc_skb failed\n");
+                IWL_ERR(priv, "alloc_skb failed\n");
                return;
        }
+        hdrlen = min_t(unsigned int, len, skb_tailroom(skb));
+        memcpy(skb_put(skb, hdrlen), hdr, hdrlen);
+        fraglen = len - hdrlen;
-        offset = (void *)hdr - rxb_addr(rxb);
+        if (fraglen) {
-        p = rxb_steal_page(rxb);
+                int offset = (void *)hdr + hdrlen - rxb_addr(rxb);
-        skb_add_rx_frag(skb, 0, p, offset, len, len);
+                skb_add_rx_frag(skb, 0, rxb_steal_page(rxb), offset,
+                                fraglen, rxb->truesize);
+        }
        iwl_update_stats(priv, false, fc, len);
        /*
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 8b1a7988e176..aa7aea168138 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -374,8 +374,9 @@ static void iwl_rx_handle_rxbuf(struct iwl_trans *trans,
        if (WARN_ON(!rxb))
                return;
+        rxcb.truesize = PAGE_SIZE << hw_params(trans).rx_page_order;
        dma_unmap_page(trans->dev, rxb->page_dma,
-                       PAGE_SIZE << hw_params(trans).rx_page_order,
+                       rxcb.truesize,
                       DMA_FROM_DEVICE);
        rxcb._page = rxb->page;
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 0c81cbaa8088..fdf97886a5e4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -260,6 +260,7 @@ static inline void iwl_free_resp(struct iwl_host_cmd *cmd)
 struct iwl_rx_cmd_buffer {
        struct page *_page;
+        unsigned int truesize;
 };
 static inline void *rxb_addr(struct iwl_rx_cmd_buffer *r)
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 8644d5372e7f..42cfcd9eb9aa 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -44,6 +44,7 @@
 #include <asm/ropes.h>
 #include <asm/mckinley.h>       /* for proc_mckinley_root */
 #include <asm/runway.h>         /* for proc_runway_root */
+#include <asm/page.h>           /* for PAGE0 */
 #include <asm/pdc.h>            /* for PDC_MODEL_* */
 #include <asm/pdcpat.h>         /* for is_pdc_pat() */
 #include <asm/parisc-device.h>
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index e70dd382a009..046fb1bd8619 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1431,7 +1431,10 @@ void devm_regulator_put(struct regulator *regulator)
        rc = devres_destroy(regulator->dev, devm_regulator_release,
                            devm_regulator_match, regulator);
-        WARN_ON(rc);
+        if (rc == 0)
+                regulator_put(regulator);
+        else
+                WARN_ON(rc);
 }
 EXPORT_SYMBOL_GPL(devm_regulator_put);
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index 96579296f04d..17a58c56eebf 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -684,7 +684,7 @@ static int max8997_set_voltage_buck(struct regulator_dev *rdev,
                }
                new_val++;
-        } while (desc->min + desc->step + new_val <= desc->max);
+        } while (desc->min + desc->step * new_val <= desc->max);
        new_idx = tmp_idx;
        new_val = tmp_val;
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 351dc0b86fab..a3a056a9db67 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -218,6 +218,9 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,
        if (!shost->shost_gendev.parent)
                shost->shost_gendev.parent = dev ? dev : &platform_bus;
+        if (!dma_dev)
+                dma_dev = shost->shost_gendev.parent;
        shost->dma_dev = dma_dev;
        error = device_add(&shost->shost_gendev);
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index f74cc0602f3b..bc3cc6d91117 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -1367,6 +1367,9 @@ qla2x00_read_optrom(struct fc_bsg_job *bsg_job)
        struct qla_hw_data *ha = vha->hw;
        int rval = 0;
+        if (ha->flags.isp82xx_reset_hdlr_active)
+                return -EBUSY;
        rval = qla2x00_optrom_setup(bsg_job, vha, 0);
        if (rval)
                return rval;
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 897731b93df2..62324a1d5573 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -15,7 +15,7 @@
 * | Mailbox commands             |       0x113e       | 0x112c-0x112e  |
 * |                              |                    | 0x113a         |
 * | Device Discovery             |       0x2086       | 0x2020-0x2022  |
- * | Queue Command and IO tracing |       0x302f       | 0x3006,0x3008  |
+ * | Queue Command and IO tracing |       0x3030       | 0x3006,0x3008  |
 * |                              |                    | 0x302d-0x302e  |
 * | DPC Thread                   |       0x401c       |                |
 * | Async Events                 |       0x505d       | 0x502b-0x502f  |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index f79844ce7122..ce42288049b5 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1715,13 +1715,24 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                                res = DID_ERROR << 16;
                                break;
                        }
-                } else {
+                } else if (lscsi_status != SAM_STAT_TASK_SET_FULL &&
+                            lscsi_status != SAM_STAT_BUSY) {
+                        /*
+                         * scsi status of task set and busy are considered to be
+                         * task not completed.
+                         */
                        ql_dbg(ql_dbg_io, fcport->vha, 0x301f,
                            "Dropped frame(s) detected (0x%x "
-                            "of 0x%x bytes).\n", resid, scsi_bufflen(cp));
+                            "of 0x%x bytes).\n", resid,
+                            scsi_bufflen(cp));
                        res = DID_ERROR << 16 | lscsi_status;
                        goto check_scsi_status;
+                } else {
+                        ql_dbg(ql_dbg_io, fcport->vha, 0x3030,
+                            "scsi_status: 0x%x, lscsi_status: 0x%x\n",
+                            scsi_status, lscsi_status);
                }
                res = DID_OK << 16 | lscsi_status;
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index f0528539bbbc..de722a933438 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -3125,6 +3125,7 @@ qla82xx_need_reset_handler(scsi_qla_host_t *vha)
                ql_log(ql_log_info, vha, 0x00b7,
                    "HW State: COLD/RE-INIT.\n");
                qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA82XX_DEV_COLD);
+                qla82xx_set_rst_ready(ha);
                if (ql2xmdenable) {
                        if (qla82xx_md_collect(vha))
                                ql_log(ql_log_warn, vha, 0xb02c,
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index a2f999273a5f..7db803377c64 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3577,9 +3577,25 @@ void qla2x00_relogin(struct scsi_qla_host *vha)
                                                continue;
                                        /* Attempt a retry. */
                                        status = 1;
-                                } else
+                                } else {
                                        status = qla2x00_fabric_login(vha,
                                            fcport, &next_loopid);
+                                        if (status ==  QLA_SUCCESS) {
+                                                int status2;
+                                                uint8_t opts;
+                                                opts = 0;
+                                                if (fcport->flags &
+                                                    FCF_FCP2_DEVICE)
+                                                        opts |= BIT_1;
+                                                        status2 =
+                                                            qla2x00_get_port_database(
+                                                                vha, fcport,
+                                                                opts);
+                                                if (status2 != QLA_SUCCESS)
+                                                        status = 1;
+                                        }
+                                }
                        } else
                                status = qla2x00_local_device_login(vha,
                                                                fcport);
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 3c13c0a6be63..a683e766d1ae 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -1017,6 +1017,9 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)
            !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha))
                return;
+        if (ha->flags.isp82xx_reset_hdlr_active)
+                return;
        ha->isp_ops->read_optrom(vha, (uint8_t *)&hdr,
            ha->flt_region_npiv_conf << 2, sizeof(struct qla_npiv_header));
        if (hdr.version == __constant_cpu_to_le16(0xffff))
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 29d780c38040..f5fdb16bec9b 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,9 +7,9 @@
 /*
 * Driver version
 */
-#define QLA2XXX_VERSION      "8.03.07.13-k"
+#define QLA2XXX_VERSION      "8.04.00.03-k"
 #define QLA_DRIVER_MAJOR_VER    8
-#define QLA_DRIVER_MINOR_VER    3
+#define QLA_DRIVER_MINOR_VER    4
-#define QLA_DRIVER_PATCH_VER    7
+#define QLA_DRIVER_PATCH_VER    0
 #define QLA_DRIVER_BETA_VER     3
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index efccd72c4a3e..1b3843117268 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -175,7 +175,8 @@ static void virtscsi_complete_free(void *buf)
        if (cmd->comp)
                complete_all(cmd->comp);
-        mempool_free(cmd, virtscsi_cmd_pool);
+        else
+                mempool_free(cmd, virtscsi_cmd_pool);
 }
 static void virtscsi_ctrl_done(struct virtqueue *vq)
@@ -311,21 +312,22 @@ out:
 static int virtscsi_tmf(struct virtio_scsi *vscsi, struct virtio_scsi_cmd *cmd)
 {
        DECLARE_COMPLETION_ONSTACK(comp);
-        int ret;
+        int ret = FAILED;
        cmd->comp = &comp;
-        ret = virtscsi_kick_cmd(vscsi, vscsi->ctrl_vq, cmd,
+        if (virtscsi_kick_cmd(vscsi, vscsi->ctrl_vq, cmd,
-                               sizeof cmd->req.tmf, sizeof cmd->resp.tmf,
+                              sizeof cmd->req.tmf, sizeof cmd->resp.tmf,
-                               GFP_NOIO);
+                              GFP_NOIO) < 0)
-        if (ret < 0)
+                goto out;
-                return FAILED;
        wait_for_completion(&comp);
-        if (cmd->resp.tmf.response != VIRTIO_SCSI_S_OK &&
+        if (cmd->resp.tmf.response == VIRTIO_SCSI_S_OK ||
-            cmd->resp.tmf.response != VIRTIO_SCSI_S_FUNCTION_SUCCEEDED)
+            cmd->resp.tmf.response == VIRTIO_SCSI_S_FUNCTION_SUCCEEDED)
-                return FAILED;
+                ret = SUCCESS;
-        return SUCCESS;
+out:
+        mempool_free(cmd, virtscsi_cmd_pool);
+        return ret;
 }
 static int virtscsi_device_reset(struct scsi_cmnd *sc)
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index 70c3ffb981e7..e320ec24aa1b 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -60,7 +60,6 @@ static void core_clear_initiator_node_from_tpg(
        int i;
        struct se_dev_entry *deve;
        struct se_lun *lun;
-        struct se_lun_acl *acl, *acl_tmp;
        spin_lock_irq(&nacl->device_list_lock);
        for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
@@ -81,28 +80,7 @@ static void core_clear_initiator_node_from_tpg(
                core_update_device_list_for_node(lun, NULL, deve->mapped_lun,
                        TRANSPORT_LUNFLAGS_NO_ACCESS, nacl, tpg, 0);
-                spin_lock(&lun->lun_acl_lock);
-                list_for_each_entry_safe(acl, acl_tmp,
-                                        &lun->lun_acl_list, lacl_list) {
-                        if (!strcmp(acl->initiatorname, nacl->initiatorname) &&
-                            (acl->mapped_lun == deve->mapped_lun))
-                                break;
-                }
-                if (!acl) {
-                        pr_err("Unable to locate struct se_lun_acl for %s,"
-                                " mapped_lun: %u\n", nacl->initiatorname,
-                                deve->mapped_lun);
-                        spin_unlock(&lun->lun_acl_lock);
-                        spin_lock_irq(&nacl->device_list_lock);
-                        continue;
-                }
-                list_del(&acl->lacl_list);
-                spin_unlock(&lun->lun_acl_lock);
                spin_lock_irq(&nacl->device_list_lock);
-                kfree(acl);
        }
        spin_unlock_irq(&nacl->device_list_lock);
 }
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 1f21d2a1e528..5c170100de9c 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -24,6 +24,7 @@
 #include <linux/if_arp.h>
 #include <linux/if_tun.h>
 #include <linux/if_macvlan.h>
+#include <linux/if_vlan.h>
 #include <net/sock.h>
@@ -283,8 +284,12 @@ static int peek_head_len(struct sock *sk)
        spin_lock_irqsave(&sk->sk_receive_queue.lock, flags);
        head = skb_peek(&sk->sk_receive_queue);
-        if (likely(head))
+        if (likely(head)) {
                len = head->len;
+                if (vlan_tx_tag_present(head))
+                        len += VLAN_HLEN;
+        }
        spin_unlock_irqrestore(&sk->sk_receive_queue.lock, flags);
        return len;
 }
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 6468a297e341..39571f9e0162 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -22,7 +22,9 @@
 #include <linux/font.h>
 #include <asm/hardware.h>
+#include <asm/page.h>
 #include <asm/parisc-device.h>
+#include <asm/pdc.h>
 #include <asm/cacheflush.h>
 #include <asm/grfioctl.h>
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 26e83d7fdd6f..b0e2a4261afe 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -73,7 +73,7 @@ static void uvesafb_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *ns
        struct uvesafb_task *utask;
        struct uvesafb_ktask *task;
-        if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
+        if (!capable(CAP_SYS_ADMIN))
                return;
        if (msg->seq >= UVESAFB_TASKS_MAX)
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index cb4529c40d74..b7f5173ff9e9 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -365,7 +365,7 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
        struct fb_info *fb_info;
        int fb_size;
        int val;
-        int ret;
+        int ret = 0;
        info = kzalloc(sizeof(*info), GFP_KERNEL);
        if (info == NULL) {
@@ -458,26 +458,31 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
        xenfb_init_shared_page(info, fb_info);
        ret = xenfb_connect_backend(dev, info);
-        if (ret < 0)
+        if (ret < 0) {
-                goto error;
+                xenbus_dev_fatal(dev, ret, "xenfb_connect_backend");
+                goto error_fb;
+        }
        ret = register_framebuffer(fb_info);
        if (ret) {
-                fb_deferred_io_cleanup(fb_info);
-                fb_dealloc_cmap(&fb_info->cmap);
-                framebuffer_release(fb_info);
                xenbus_dev_fatal(dev, ret, "register_framebuffer");
-                goto error;
+                goto error_fb;
        }
        info->fb_info = fb_info;
        xenfb_make_preferred_console();
        return 0;
- error_nomem:
+error_fb:
-        ret = -ENOMEM;
+        fb_deferred_io_cleanup(fb_info);
-        xenbus_dev_fatal(dev, ret, "allocating device memory");
+        fb_dealloc_cmap(&fb_info->cmap);
- error:
+        framebuffer_release(fb_info);
+error_nomem:
+        if (!ret) {
+                ret = -ENOMEM;
+                xenbus_dev_fatal(dev, ret, "allocating device memory");
+        }
+error:
        xenfb_remove(dev);
        return ret;
 }
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 94243136f6bf..ea20c51d24c7 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -183,15 +183,17 @@ config XEN_ACPI_PROCESSOR
        depends on XEN && X86 && ACPI_PROCESSOR && CPU_FREQ
        default m
        help
-          This ACPI processor uploads Power Management information to the Xen hypervisor.
+          This ACPI processor uploads Power Management information to the Xen
+          hypervisor.
-          To do that the driver parses the Power Management data and uploads said
-          information to the Xen hypervisor. Then the Xen hypervisor can select the
+          To do that the driver parses the Power Management data and uploads
-          proper Cx and Pxx states. It also registers itslef as the SMM so that
+          said information to the Xen hypervisor. Then the Xen hypervisor can
-          other drivers (such as ACPI cpufreq scaling driver) will not load.
+          select the proper Cx and Pxx states. It also registers itslef as the
+          SMM so that other drivers (such as ACPI cpufreq scaling driver) will
-          To compile this driver as a module, choose M here: the
+          not load.
-          module will be called xen_acpi_processor  If you do not know what to choose,
-          select M here. If the CPUFREQ drivers are built in, select Y here.
+          To compile this driver as a module, choose M here: the module will be
+          called xen_acpi_processor  If you do not know what to choose, select
+          M here. If the CPUFREQ drivers are built in, select Y here.
 endmenu
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index ca6a3796a33b..541ef81f6ae8 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -699,7 +699,7 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int origin)
         * origin == SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate
         * the cached file length
         */
-        if (origin != SEEK_SET || origin != SEEK_CUR) {
+        if (origin != SEEK_SET && origin != SEEK_CUR) {
                int rc;
                struct inode *inode = file->f_path.dentry->d_inode;
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 2d60492d6df8..1030a716d155 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -747,6 +747,8 @@ static void pte_to_pagemap_entry(pagemap_entry_t *pme, pte_t pte)
        else if (pte_present(pte))
                *pme = make_pme(PM_PFRAME(pte_pfn(pte))
                                | PM_PSHIFT(PAGE_SHIFT) | PM_PRESENT);
+        else
+                *pme = make_pme(PM_NOT_PRESENT);
 }
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
@@ -761,6 +763,8 @@ static void thp_pmd_to_pagemap_entry(pagemap_entry_t *pme,
        if (pmd_present(pmd))
                *pme = make_pme(PM_PFRAME(pmd_pfn(pmd) + offset)
                                | PM_PSHIFT(PAGE_SHIFT) | PM_PRESENT);
+        else
+                *pme = make_pme(PM_NOT_PRESENT);
 }
 #else
 static inline void thp_pmd_to_pagemap_entry(pagemap_entry_t *pme,
@@ -801,8 +805,10 @@ static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
                /* check to see if we've left 'vma' behind
                 * and need a new, higher one */
-                if (vma && (addr >= vma->vm_end))
+                if (vma && (addr >= vma->vm_end)) {
                        vma = find_vma(walk->mm, addr);
+                        pme = make_pme(PM_NOT_PRESENT);
+                }
                /* check that 'vma' actually covers this address,
                 * and that it isn't a huge page vma */
@@ -830,6 +836,8 @@ static void huge_pte_to_pagemap_entry(pagemap_entry_t *pme,
        if (pte_present(pte))
                *pme = make_pme(PM_PFRAME(pte_pfn(pte) + offset)
                                | PM_PSHIFT(PAGE_SHIFT) | PM_PRESENT);
+        else
+                *pme = make_pme(PM_NOT_PRESENT);
 }
 /* This function walks within one hugetlb entry in the single call */
@@ -839,7 +847,7 @@ static int pagemap_hugetlb_range(pte_t *pte, unsigned long hmask,
 {
        struct pagemapread *pm = walk->private;
        int err = 0;
-        pagemap_entry_t pme = make_pme(PM_NOT_PRESENT);
+        pagemap_entry_t pme;
        for (; addr != end; addr += PAGE_SIZE) {
                int offset = (addr & ~hmask) >> PAGE_SHIFT;
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 8a1835855faa..fe5136d81454 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -159,7 +159,8 @@ static inline void eth_hw_addr_random(struct net_device *dev)
 * @addr1: Pointer to a six-byte array containing the Ethernet address
 * @addr2: Pointer other six-byte array containing the Ethernet address
 *
- * Compare two ethernet addresses, returns 0 if equal
+ * Compare two ethernet addresses, returns 0 if equal, non-zero otherwise.
+ * Unlike memcmp(), it doesn't return a value suitable for sorting.
 */
 static inline unsigned compare_ether_addr(const u8 *addr1, const u8 *addr2)
 {
@@ -184,10 +185,10 @@ static inline unsigned long zap_last_2bytes(unsigned long value)
 * @addr1: Pointer to an array of 8 bytes
 * @addr2: Pointer to an other array of 8 bytes
 *
- * Compare two ethernet addresses, returns 0 if equal.
+ * Compare two ethernet addresses, returns 0 if equal, non-zero otherwise.
- * Same result than "memcmp(addr1, addr2, ETH_ALEN)" but without conditional
+ * Unlike memcmp(), it doesn't return a value suitable for sorting.
- * branches, and possibly long word memory accesses on CPU allowing cheap
+ * The function doesn't need any conditional branches and possibly uses
- * unaligned memory reads.
+ * word memory accesses on CPU allowing cheap unaligned memory reads.
 * arrays = { byte1, byte2, byte3, byte4, byte6, byte7, pad1, pad2}
 *
 * Please note that alignment of addr1 & addr2 is only guaranted to be 16 bits.
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 5cbaa20f1659..33900a53c990 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1403,15 +1403,6 @@ static inline bool netdev_uses_dsa_tags(struct net_device *dev)
        return 0;
 }
-#ifndef CONFIG_NET_NS
-static inline void skb_set_dev(struct sk_buff *skb, struct net_device *dev)
-{
-        skb->dev = dev;
-}
-#else /* CONFIG_NET_NS */
-void skb_set_dev(struct sk_buff *skb, struct net_device *dev);
-#endif
 static inline bool netdev_uses_trailer_tags(struct net_device *dev)
 {
 #ifdef CONFIG_NET_DSA_TAG_TRAILER
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 6ee44b24864a..a2ef81466b00 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -704,4 +704,17 @@ static inline void sctp_v4_map_v6(union sctp_addr *addr)
        addr->v6.sin6_addr.s6_addr32[2] = htonl(0x0000ffff);
 }
+/* The cookie is always 0 since this is how it's used in the
+ * pmtu code.
+ */
+static inline struct dst_entry *sctp_transport_dst_check(struct sctp_transport *t)
+{
+        if (t->dst && !dst_check(t->dst, 0)) {
+                dst_release(t->dst);
+                t->dst = NULL;
+        }
+        return t->dst;
+}
 #endif /* __net_sctp_h__ */
diff --git a/kernel/compat.c b/kernel/compat.c
index 74ff8498809a..d2c67aa49ae6 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -372,25 +372,54 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
 #ifdef __ARCH_WANT_SYS_SIGPROCMASK
-asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set,
+/*
-                compat_old_sigset_t __user *oset)
+ * sys_sigprocmask SIG_SETMASK sets the first (compat) word of the
+ * blocked set of signals to the supplied signal set
+ */
+static inline void compat_sig_setmask(sigset_t *blocked, compat_sigset_word set)
 {
-        old_sigset_t s;
+        memcpy(blocked->sig, &set, sizeof(set));
-        long ret;
+}
-        mm_segment_t old_fs;
-        if (set && get_user(s, set))
+asmlinkage long compat_sys_sigprocmask(int how,
-                return -EFAULT;
+                                       compat_old_sigset_t __user *nset,
-        old_fs = get_fs();
+                                       compat_old_sigset_t __user *oset)
-        set_fs(KERNEL_DS);
+{
-        ret = sys_sigprocmask(how,
+        old_sigset_t old_set, new_set;
-                              set ? (old_sigset_t __user *) &s : NULL,
+        sigset_t new_blocked;
-                              oset ? (old_sigset_t __user *) &s : NULL);
-        set_fs(old_fs);
+        old_set = current->blocked.sig[0];
-        if (ret == 0)
-                if (oset)
+        if (nset) {
-                        ret = put_user(s, oset);
+                if (get_user(new_set, nset))
-        return ret;
+                        return -EFAULT;
+                new_set &= ~(sigmask(SIGKILL) | sigmask(SIGSTOP));
+                new_blocked = current->blocked;
+                switch (how) {
+                case SIG_BLOCK:
+                        sigaddsetmask(&new_blocked, new_set);
+                        break;
+                case SIG_UNBLOCK:
+                        sigdelsetmask(&new_blocked, new_set);
+                        break;
+                case SIG_SETMASK:
+                        compat_sig_setmask(&new_blocked, new_set);
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                set_current_blocked(&new_blocked);
+        }
+        if (oset) {
+                if (put_user(old_set, oset))
+                        return -EFAULT;
+        }
+        return 0;
 }
 #endif
diff --git a/kernel/fork.c b/kernel/fork.c
index b9372a0bff18..687a15d56243 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -47,6 +47,7 @@
 #include <linux/audit.h>
 #include <linux/memcontrol.h>
 #include <linux/ftrace.h>
+#include <linux/proc_fs.h>
 #include <linux/profile.h>
 #include <linux/rmap.h>
 #include <linux/ksm.h>
@@ -1464,6 +1465,8 @@ bad_fork_cleanup_io:
        if (p->io_context)
                exit_io_context(p);
 bad_fork_cleanup_namespaces:
+        if (unlikely(clone_flags & CLONE_NEWPID))
+                pid_ns_release_proc(p->nsproxy->pid_ns);
        exit_task_namespaces(p);
 bad_fork_cleanup_mm:
        if (p->mm)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 5a16423a512c..ae8f708e3d75 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2498,7 +2498,6 @@ retry_avoidcopy:
                if (outside_reserve) {
                        BUG_ON(huge_pte_none(pte));
                        if (unmap_ref_private(mm, vma, old_page, address)) {
-                                BUG_ON(page_count(old_page) != 1);
                                BUG_ON(huge_pte_none(pte));
                                spin_lock(&mm->page_table_lock);
                                ptep = huge_pte_offset(mm, address & huge_page_mask(h));
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 31ab9c3f0178..b659260c56ad 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4507,6 +4507,12 @@ static void mem_cgroup_usage_unregister_event(struct cgroup *cgrp,
 swap_buffers:
        /* Swap primary and spare array */
        thresholds->spare = thresholds->primary;
+        /* If all events are unregistered, free the spare array */
+        if (!new) {
+                kfree(thresholds->spare);
+                thresholds->spare = NULL;
+        }
        rcu_assign_pointer(thresholds->primary, new);
        /* To be sure that nobody uses thresholds */
diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index e53bb8a256b1..1983fb1c7026 100644
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c
@@ -82,8 +82,7 @@ void __init free_bootmem_late(unsigned long addr, unsigned long size)
 static void __init __free_pages_memory(unsigned long start, unsigned long end)
 {
-        int i;
+        unsigned long i, start_aligned, end_aligned;
-        unsigned long start_aligned, end_aligned;
        int order = ilog2(BITS_PER_LONG);
        start_aligned = (start + (BITS_PER_LONG - 1)) & ~(BITS_PER_LONG - 1);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index a712fb9e04ce..918330f71dba 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5203,7 +5203,7 @@ int percpu_pagelist_fraction_sysctl_handler(ctl_table *table, int write,
        int ret;
        ret = proc_dointvec_minmax(table, write, buffer, length, ppos);
-        if (!write || (ret == -EINVAL))
+        if (!write || (ret < 0))
                return ret;
        for_each_populated_zone(zone) {
                for_each_possible_cpu(cpu) {
diff --git a/mm/percpu.c b/mm/percpu.c
index f47af9123af7..bb4be7435ce3 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1132,20 +1132,20 @@ static void pcpu_dump_alloc_info(const char *lvl,
                for (alloc_end += gi->nr_units / upa;
                     alloc < alloc_end; alloc++) {
                        if (!(alloc % apl)) {
-                                printk("\n");
+                                printk(KERN_CONT "\n");
                                printk("%spcpu-alloc: ", lvl);
                        }
-                        printk("[%0*d] ", group_width, group);
+                        printk(KERN_CONT "[%0*d] ", group_width, group);
                        for (unit_end += upa; unit < unit_end; unit++)
                                if (gi->cpu_map[unit] != NR_CPUS)
-                                        printk("%0*d ", cpu_width,
+                                        printk(KERN_CONT "%0*d ", cpu_width,
                                               gi->cpu_map[unit]);
                                else
-                                        printk("%s ", empty_str);
+                                        printk(KERN_CONT "%s ", empty_str);
                }
        }
-        printk("\n");
+        printk(KERN_CONT "\n");
 }
 /**
@@ -1650,6 +1650,16 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
                areas[group] = ptr;
                base = min(ptr, base);
+        }
+        /*
+         * Copy data and free unused parts.  This should happen after all
+         * allocations are complete; otherwise, we may end up with
+         * overlapping groups.
+         */
+        for (group = 0; group < ai->nr_groups; group++) {
+                struct pcpu_group_info *gi = &ai->groups[group];
+                void *ptr = areas[group];
                for (i = 0; i < gi->nr_units; i++, ptr += ai->unit_size) {
                        if (gi->cpu_map[i] == NR_CPUS) {
@@ -1885,6 +1895,8 @@ void __init setup_per_cpu_areas(void)
        fc = __alloc_bootmem(unit_size, PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
        if (!ai || !fc)
                panic("Failed to allocate memory for percpu areas.");
+        /* kmemleak tracks the percpu allocations separately */
+        kmemleak_free(fc);
        ai->dyn_size = unit_size;
        ai->unit_size = unit_size;
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 9988d4abb372..9757c193c86b 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -157,7 +157,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
                skb = __vlan_hwaccel_put_tag(skb, vlan_tci);
        }
-        skb_set_dev(skb, vlan_dev_priv(dev)->real_dev);
+        skb->dev = vlan_dev_priv(dev)->real_dev;
        len = skb->len;
        if (netpoll_tx_running(dev))
                return skb->dev->netdev_ops->ndo_start_xmit(skb, skb->dev);
diff --git a/net/core/dev.c b/net/core/dev.c
index 9bb8f87c4cda..99e1d759f41e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1617,10 +1617,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
                return NET_RX_DROP;
        }
        skb->skb_iif = 0;
-        skb_set_dev(skb, dev);
+        skb->dev = dev;
+        skb_dst_drop(skb);
        skb->tstamp.tv64 = 0;
        skb->pkt_type = PACKET_HOST;
        skb->protocol = eth_type_trans(skb, dev);
+        skb->mark = 0;
+        secpath_reset(skb);
+        nf_reset(skb);
        return netif_rx(skb);
 }
 EXPORT_SYMBOL_GPL(dev_forward_skb);
@@ -1869,36 +1873,6 @@ void netif_device_attach(struct net_device *dev)
 }
 EXPORT_SYMBOL(netif_device_attach);
-/**
- * skb_dev_set -- assign a new device to a buffer
- * @skb: buffer for the new device
- * @dev: network device
- *
- * If an skb is owned by a device already, we have to reset
- * all data private to the namespace a device belongs to
- * before assigning it a new device.
- */
-#ifdef CONFIG_NET_NS
-void skb_set_dev(struct sk_buff *skb, struct net_device *dev)
-{
-        skb_dst_drop(skb);
-        if (skb->dev && !net_eq(dev_net(skb->dev), dev_net(dev))) {
-                secpath_reset(skb);
-                nf_reset(skb);
-                skb_init_secmark(skb);
-                skb->mark = 0;
-                skb->priority = 0;
-                skb->nf_trace = 0;
-                skb->ipvs_property = 0;
-#ifdef CONFIG_NET_SCHED
-                skb->tc_index = 0;
-#endif
-        }
-        skb->dev = dev;
-}
-EXPORT_SYMBOL(skb_set_dev);
-#endif /* CONFIG_NET_NS */
 static void skb_warn_bad_offload(const struct sk_buff *skb)
 {
        static const netdev_features_t null_features = 0;
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 4d8ce93cd503..77a59980b579 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -1931,7 +1931,7 @@ static int pktgen_device_event(struct notifier_block *unused,
 {
        struct net_device *dev = ptr;
-        if (!net_eq(dev_net(dev), &init_net))
+        if (!net_eq(dev_net(dev), &init_net) || pktgen_exiting)
                return NOTIFY_DONE;
        /* It is OK that we do not hold the group lock right now,
@@ -3755,12 +3755,18 @@ static void __exit pg_cleanup(void)
 {
        struct pktgen_thread *t;
        struct list_head *q, *n;
+        struct list_head list;
        /* Stop all interfaces & threads */
        pktgen_exiting = true;
-        list_for_each_safe(q, n, &pktgen_threads) {
+        mutex_lock(&pktgen_thread_lock);
+        list_splice(&list, &pktgen_threads);
+        mutex_unlock(&pktgen_thread_lock);
+        list_for_each_safe(q, n, &list) {
                t = list_entry(q, struct pktgen_thread, th_list);
+                list_del(&t->th_list);
                kthread_stop(t->tsk);
                kfree(t);
        }
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index bce36f1a37b4..30b88d7b4bd6 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1370,6 +1370,8 @@ static int check_leaf(struct fib_table *tb, struct trie *t, struct leaf *l,
                        if (fa->fa_tos && fa->fa_tos != flp->flowi4_tos)
                                continue;
+                        if (fi->fib_dead)
+                                continue;
                        if (fa->fa_info->fib_scope < flp->flowi4_scope)
                                continue;
                        fib_alias_accessed(fa);
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index e44e631ea952..777716bc80f7 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -421,6 +421,19 @@ static int validate_sample(const struct nlattr *attr,
        return validate_actions(actions, key, depth + 1);
 }
+static int validate_tp_port(const struct sw_flow_key *flow_key)
+{
+        if (flow_key->eth.type == htons(ETH_P_IP)) {
+                if (flow_key->ipv4.tp.src && flow_key->ipv4.tp.dst)
+                        return 0;
+        } else if (flow_key->eth.type == htons(ETH_P_IPV6)) {
+                if (flow_key->ipv6.tp.src && flow_key->ipv6.tp.dst)
+                        return 0;
+        }
+        return -EINVAL;
+}
 static int validate_set(const struct nlattr *a,
                        const struct sw_flow_key *flow_key)
 {
@@ -462,18 +475,13 @@ static int validate_set(const struct nlattr *a,
                if (flow_key->ip.proto != IPPROTO_TCP)
                        return -EINVAL;
-                if (!flow_key->ipv4.tp.src || !flow_key->ipv4.tp.dst)
+                return validate_tp_port(flow_key);
-                        return -EINVAL;
-                break;
        case OVS_KEY_ATTR_UDP:
                if (flow_key->ip.proto != IPPROTO_UDP)
                        return -EINVAL;
-                if (!flow_key->ipv4.tp.src || !flow_key->ipv4.tp.dst)
+                return validate_tp_port(flow_key);
-                        return -EINVAL;
-                break;
        default:
                return -EINVAL;
@@ -1641,10 +1649,9 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
        reply = ovs_vport_cmd_build_info(vport, info->snd_pid, info->snd_seq,
                                         OVS_VPORT_CMD_NEW);
        if (IS_ERR(reply)) {
-                err = PTR_ERR(reply);
                netlink_set_err(init_net.genl_sock, 0,
-                                ovs_dp_vport_multicast_group.id, err);
+                                ovs_dp_vport_multicast_group.id, PTR_ERR(reply));
-                return 0;
+                goto exit_unlock;
        }
        genl_notify(reply, genl_info_net(info), info->snd_pid,
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 1252c3081ef1..2a11ec2383ee 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -183,7 +183,8 @@ void ovs_flow_used(struct sw_flow *flow, struct sk_buff *skb)
        u8 tcp_flags = 0;
        if (flow->key.eth.type == htons(ETH_P_IP) &&
-            flow->key.ip.proto == IPPROTO_TCP) {
+            flow->key.ip.proto == IPPROTO_TCP &&
+            likely(skb->len >= skb_transport_offset(skb) + sizeof(struct tcphdr))) {
                u8 *tcp = (u8 *)tcp_hdr(skb);
                tcp_flags = *(tcp + TCP_FLAGS_OFFSET) & TCP_FLAG_MASK;
        }
diff --git a/net/sctp/output.c b/net/sctp/output.c
index 817174eb5f41..8fc4dcd294ab 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -377,9 +377,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
         */
        skb_set_owner_w(nskb, sk);
-        /* The 'obsolete' field of dst is set to 2 when a dst is freed. */
+        if (!sctp_transport_dst_check(tp)) {
-        if (!dst || (dst->obsolete > 1)) {
-                dst_release(dst);
                sctp_transport_route(tp, NULL, sctp_sk(sk));
                if (asoc && (asoc->param_flags & SPP_PMTUD_ENABLE)) {
                        sctp_assoc_sync_pmtu(asoc);
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 3889330b7b04..b026ba0c6992 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -226,23 +226,6 @@ void sctp_transport_pmtu(struct sctp_transport *transport, struct sock *sk)
                transport->pathmtu = SCTP_DEFAULT_MAXSEGMENT;
 }
-/* this is a complete rip-off from __sk_dst_check
- * the cookie is always 0 since this is how it's used in the
- * pmtu code
- */
-static struct dst_entry *sctp_transport_dst_check(struct sctp_transport *t)
-{
-        struct dst_entry *dst = t->dst;
-        if (dst && dst->obsolete && dst->ops->check(dst, 0) == NULL) {
-                dst_release(t->dst);
-                t->dst = NULL;
-                return NULL;
-        }
-        return dst;
-}
 void sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu)
 {
        struct dst_entry *dst;
diff --git a/net/sunrpc/auth_gss/gss_mech_switch.c b/net/sunrpc/auth_gss/gss_mech_switch.c
index ca8cad8251c7..782bfe1b6465 100644
--- a/net/sunrpc/auth_gss/gss_mech_switch.c
+++ b/net/sunrpc/auth_gss/gss_mech_switch.c
@@ -242,12 +242,13 @@ EXPORT_SYMBOL_GPL(gss_mech_get_by_pseudoflavor);
 int gss_mech_list_pseudoflavors(rpc_authflavor_t *array_ptr)
 {
        struct gss_api_mech *pos = NULL;
-        int i = 0;
+        int j, i = 0;
        spin_lock(&registered_mechs_lock);
        list_for_each_entry(pos, &registered_mechs, gm_list) {
-                array_ptr[i] = pos->gm_pfs->pseudoflavor;
+                for (j=0; j < pos->gm_pf_num; j++) {
-                i++;
+                        array_ptr[i++] = pos->gm_pfs[j].pseudoflavor;
+                }
        }
        spin_unlock(&registered_mechs_lock);
        return i;
diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c
index 64417a733220..d8c670c9d62c 100644
--- a/sound/pci/echoaudio/echoaudio_dsp.c
+++ b/sound/pci/echoaudio/echoaudio_dsp.c
@@ -475,7 +475,7 @@ static int load_firmware(struct echoaudio *chip)
        const struct firmware *fw;
        int box_type, err;
-        if (snd_BUG_ON(!chip->dsp_code_to_load || !chip->comm_page))
+        if (snd_BUG_ON(!chip->comm_page))
                return -EPERM;
        /* See if the ASIC is present and working - only if the DSP is already loaded */
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 7a8fcc4c15f8..841475cc13b6 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -5444,10 +5444,6 @@ int snd_hda_suspend(struct hda_bus *bus)
        list_for_each_entry(codec, &bus->codec_list, list) {
                if (hda_codec_is_power_on(codec))
                        hda_call_codec_suspend(codec);
-                else /* forcibly change the power to D3 even if not used */
-                        hda_set_power_state(codec,
-                                            codec->afg ? codec->afg : codec->mfg,
-                                            AC_PWRST_D3);
                if (codec->patch_ops.post_suspend)
                        codec->patch_ops.post_suspend(codec);
        }
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index c19e71a94e1b..1f350522bed4 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -783,11 +783,13 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
 {
        struct azx *chip = bus->private_data;
        unsigned long timeout;
+        unsigned long loopcounter;
        int do_poll = 0;
 again:
        timeout = jiffies + msecs_to_jiffies(1000);
-        for (;;) {
+        for (loopcounter = 0;; loopcounter++) {
                if (chip->polling_mode || do_poll) {
                        spin_lock_irq(&chip->reg_lock);
                        azx_update_rirb(chip);
@@ -803,7 +805,7 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
                }
                if (time_after(jiffies, timeout))
                        break;
-                if (bus->needs_damn_long_delay)
+                if (bus->needs_damn_long_delay || loopcounter > 3000)
                        msleep(2); /* temporary workaround */
                else {
                        udelay(10);
@@ -2351,6 +2353,17 @@ static void azx_power_notify(struct hda_bus *bus)
 * power management
 */
+static int snd_hda_codecs_inuse(struct hda_bus *bus)
+{
+        struct hda_codec *codec;
+        list_for_each_entry(codec, &bus->codec_list, list) {
+                if (snd_hda_codec_needs_resume(codec))
+                        return 1;
+        }
+        return 0;
+}
 static int azx_suspend(struct pci_dev *pci, pm_message_t state)
 {
        struct snd_card *card = pci_get_drvdata(pci);
@@ -2397,7 +2410,8 @@ static int azx_resume(struct pci_dev *pci)
                return -EIO;
        azx_init_pci(chip);
-        azx_init_chip(chip, 1);
+        if (snd_hda_codecs_inuse(chip->bus))
+                azx_init_chip(chip, 1);
        snd_hda_resume(chip->bus);
        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 818f90bc7d57..7810913d07a0 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5405,6 +5405,8 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
        SND_PCI_QUIRK(0x1025, 0x0142, "Acer Aspire 7730G",
                      ALC882_FIXUP_ACER_ASPIRE_4930G),
        SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", ALC882_FIXUP_PB_M5210),
+        SND_PCI_QUIRK(0x1025, 0x021e, "Acer Aspire 5739G",
+                      ALC882_FIXUP_ACER_ASPIRE_4930G),
        SND_PCI_QUIRK(0x1025, 0x0259, "Acer Aspire 5935", ALC889_FIXUP_DAC_ROUTE),
        SND_PCI_QUIRK(0x1025, 0x026b, "Acer Aspire 8940G", ALC882_FIXUP_ACER_ASPIRE_8930G),
        SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", ALC882_FIXUP_ACER_ASPIRE_7736),
@@ -5438,6 +5440,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
        SND_PCI_QUIRK(0x106b, 0x4a00, "Macbook 5,2", ALC889_FIXUP_IMAC91_VREF),
        SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC882_FIXUP_EAPD),
+        SND_PCI_QUIRK(0x1462, 0x7350, "MSI-7350", ALC889_FIXUP_CD),
        SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),
        SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3", ALC889_FIXUP_CD),
        SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),
@@ -5638,13 +5641,13 @@ static int patch_alc262(struct hda_codec *codec)
        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PROC_COEF, tmp | 0x80);
        }
 #endif
-        alc_auto_parse_customize_define(codec);
        alc_fix_pll_init(codec, 0x20, 0x0a, 10);
        alc_pick_fixup(codec, NULL, alc262_fixup_tbl, alc262_fixups);
        alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+        alc_auto_parse_customize_define(codec);
        /* automatic parse from the BIOS config */
        err = alc262_parse_auto_config(codec);
        if (err < 0)
@@ -6249,8 +6252,6 @@ static int patch_alc269(struct hda_codec *codec)
        spec->mixer_nid = 0x0b;
-        alc_auto_parse_customize_define(codec);
        err = alc_codec_rename_from_preset(codec);
        if (err < 0)
                goto error;
@@ -6283,6 +6284,8 @@ static int patch_alc269(struct hda_codec *codec)
                       alc269_fixup_tbl, alc269_fixups);
        alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+        alc_auto_parse_customize_define(codec);
        /* automatic parse from the BIOS config */
        err = alc269_parse_auto_config(codec);
        if (err < 0)
@@ -6859,8 +6862,6 @@ static int patch_alc662(struct hda_codec *codec)
        /* handle multiple HPs as is */
        spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;
-        alc_auto_parse_customize_define(codec);
        alc_fix_pll_init(codec, 0x20, 0x04, 15);
        err = alc_codec_rename_from_preset(codec);
@@ -6877,6 +6878,9 @@ static int patch_alc662(struct hda_codec *codec)
        alc_pick_fixup(codec, alc662_fixup_models,
                       alc662_fixup_tbl, alc662_fixups);
        alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+        alc_auto_parse_customize_define(codec);
        /* automatic parse from the BIOS config */
        err = alc662_parse_auto_config(codec);
        if (err < 0)
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index b68cdec03b9e..0b2aea2ce172 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -5170,6 +5170,7 @@ static int snd_hdsp_create_hwdep(struct snd_card *card, struct hdsp *hdsp)
        strcpy(hw->name, "HDSP hwdep interface");
        hw->ops.ioctl = snd_hdsp_hwdep_ioctl;
+        hw->ops.ioctl_compat = snd_hdsp_hwdep_ioctl;
        return 0;
 }
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c
index 9d9ad8d61c0a..8526e1edaf45 100644
--- a/sound/soc/sh/migor.c
+++ b/sound/soc/sh/migor.c
@@ -35,7 +35,7 @@ static unsigned long siumckb_recalc(struct clk *clk)
        return codec_freq;
 }
-static struct clk_ops siumckb_clk_ops = {
+static struct sh_clk_ops siumckb_clk_ops = {
        .recalc = siumckb_recalc,
 };
author	Arnd Bergmann <arnd@arndb.de>	2012-05-15 04:41:07 -0400
committer	Arnd Bergmann <arnd@arndb.de>	2012-05-15 04:41:07 -0400
commit	423b742bec02b6c8d4e060517ce05b4cd3fd91c1 (patch)
tree	3d4e090581970646d0afc92166bd490cc4977021
parent	be944f1e79063e4f27b46c74f10c86b2387afa9f (diff)
parent	f5520363532690f56e12126029864d9383d5203f (diff)