Merge branch 'akpm' (Andrew's patch-bomb)

Merge misc patches from Andrew Morton:
 "The MM tree is rather stuck while I wait to find out what the heck is
  happening with sched/numa.  Probably I'll need to route around all the
  code which was added to -next, sigh.

  So this is "everything else", or at least most of it - other small
  bits are still awaiting resolutions of various kinds."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (180 commits)
  lib/decompress.c add __init to decompress_method and data
  kernel/resource.c: fix stack overflow in __reserve_region_with_split()
  omfs: convert to use beXX_add_cpu()
  taskstats: cgroupstats_user_cmd() may leak on error
  aoe: update aoe-internal version number to 50
  aoe: update documentation to better reflect aoe-plus-udev usage
  aoe: remove unused code
  aoe: make dynamic block minor numbers the default
  aoe: update and specify AoE address guards and error messages
  aoe: retain static block device numbers for backwards compatibility
  aoe: support more AoE addresses with dynamic block device minor numbers
  aoe: update documentation with new URL and VM settings reference
  aoe: update copyright year in touched files
  aoe: update internal version number to 49
  aoe: remove unused code and add cosmetic improvements
  aoe: increase net_device reference count while using it
  aoe: associate frames with the AoE storage target
  aoe: disallow unsupported AoE minor addresses
  aoe: do revalidation steps in order
  aoe: failover remote interface based on aoe_deadsecs parameter
  ...

308 files changed, 7393 insertions, 2728 deletions

diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle
index cb9258b8fd35..495e5ba1634c 100644
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
@@ -454,6 +454,16 @@ The preferred style for long (multi-line) comments is:
          * with beginning and ending almost-blank lines.
          */
 
+For files in net/ and drivers/net/ the preferred style for long (multi-line)
+comments is a little different.
+
+        /* The preferred comment style for files in net/ and drivers/net
+         * looks like this.
+         *
+         * It is nearly the same as the generally preferred comment style,
+         * but there is no initial almost-blank line.
+         */
+
 It's also important to comment data, whether they are basic types or derived
 types.  To this end, use just one data declaration per line (no commas for
 multiple data declarations).  This leaves you room for a small comment on each
diff --git a/Documentation/aoe/aoe.txt b/Documentation/aoe/aoe.txt
index 5f5aa16047ff..bfc9cb19abcd 100644
--- a/Documentation/aoe/aoe.txt
+++ b/Documentation/aoe/aoe.txt
@@ -1,8 +1,16 @@
-The EtherDrive (R) HOWTO for users of 2.6 kernels is found at ...
+ATA over Ethernet is a network protocol that provides simple access to
+block storage on the LAN.
 
-  http://www.coraid.com/SUPPORT/EtherDrive-HBA  
+  http://support.coraid.com/documents/AoEr11.txt
 
-  It has many tips and hints!
+The EtherDrive (R) HOWTO for 2.6 and 3.x kernels is found at ...
+
+  http://support.coraid.com/support/linux/EtherDrive-2.6-HOWTO.html
+
+It has many tips and hints!  Please see, especially, recommended
+tunings for virtual memory:
+
+  http://support.coraid.com/support/linux/EtherDrive-2.6-HOWTO-5.html#ss5.19
 
 The aoetools are userland programs that are designed to work with this
 driver.  The aoetools are on sourceforge.
@@ -23,20 +31,12 @@ CREATING DEVICE NODES
   There is a udev-install.sh script that shows how to install these
   rules on your system.
 
-  If you are not using udev, two scripts are provided in
-  Documentation/aoe as examples of static device node creation for
-  using the aoe driver.
-
-    rm -rf /dev/etherd
-    sh Documentation/aoe/mkdevs.sh /dev/etherd
-
-  ... or to make just one shelf's worth of block device nodes ...
-
-    sh Documentation/aoe/mkshelf.sh /dev/etherd 0
-
   There is also an autoload script that shows how to edit
   /etc/modprobe.d/aoe.conf to ensure that the aoe module is loaded when
-  necessary.
+  necessary.  Preloading the aoe module is preferable to autoloading,
+  however, because AoE discovery takes a few seconds.  It can be
+  confusing when an AoE device is not present the first time the a
+  command is run but appears a second later.
 
 USING DEVICE NODES
 
@@ -51,9 +51,9 @@ USING DEVICE NODES
   "echo > /dev/etherd/discover" tells the driver to find out what AoE
   devices are available.
 
-  These character devices may disappear and be replaced by sysfs
-  counterparts.  Using the commands in aoetools insulates users from
-  these implementation details.
+  In the future these character devices may disappear and be replaced
+  by sysfs counterparts.  Using the commands in aoetools insulates
+  users from these implementation details.
 
   The block devices are named like this:
 
@@ -76,8 +76,8 @@ USING SYSFS
   The netif attribute is the network interface on the localhost
   through which we are communicating with the remote AoE device.
 
-  There is a script in this directory that formats this information
-  in a convenient way.  Users with aoetools can use the aoe-stat
+  There is a script in this directory that formats this information in
+  a convenient way.  Users with aoetools should use the aoe-stat
   command.
 
   root@makki root# sh Documentation/aoe/status.sh 
@@ -121,3 +121,21 @@ DRIVER OPTIONS
   usage example for the module parameter.
 
     modprobe aoe_iflist="eth1 eth3"
+
+  The aoe_deadsecs module parameter determines the maximum number of
+  seconds that the driver will wait for an AoE device to provide a
+  response to an AoE command.  After aoe_deadsecs seconds have
+  elapsed, the AoE device will be marked as "down".
+
+  The aoe_maxout module parameter has a default of 128.  This is the
+  maximum number of unresponded packets that will be sent to an AoE
+  target at one time.
+
+  The aoe_dyndevs module parameter defaults to 1, meaning that the
+  driver will assign a block device minor number to a discovered AoE
+  target based on the order of its discovery.  With dynamic minor
+  device numbers in use, a greater range of AoE shelf and slot
+  addresses can be supported.  Users with udev will never have to
+  think about minor numbers.  Using aoe_dyndevs=0 allows device nodes
+  to be pre-created using a static minor-number scheme with the
+  aoe-mkshelf script in the aoetools.
diff --git a/Documentation/aoe/mkdevs.sh b/Documentation/aoe/mkdevs.sh
deleted file mode 100644
index 44c0ab702432..000000000000
--- a/Documentation/aoe/mkdevs.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-n_shelves=${n_shelves:-10}
-n_partitions=${n_partitions:-16}
-
-if test "$#" != "1"; then
-        echo "Usage: sh `basename $0` {dir}" 1>&2
-        echo "       n_partitions=16 sh `basename $0` {dir}" 1>&2
-        exit 1
-fi
-dir=$1
-
-MAJOR=152
-
-echo "Creating AoE devnode files in $dir ..."
-
-set -e
-
-mkdir -p $dir
-
-# (Status info is in sysfs.  See status.sh.)
-# rm -f $dir/stat
-# mknod -m 0400 $dir/stat c $MAJOR 1
-rm -f $dir/err
-mknod -m 0400 $dir/err c $MAJOR 2
-rm -f $dir/discover
-mknod -m 0200 $dir/discover c $MAJOR 3
-rm -f $dir/interfaces
-mknod -m 0200 $dir/interfaces c $MAJOR 4
-rm -f $dir/revalidate
-mknod -m 0200 $dir/revalidate c $MAJOR 5
-rm -f $dir/flush
-mknod -m 0200 $dir/flush c $MAJOR 6
-
-export n_partitions
-mkshelf=`echo $0 | sed 's!mkdevs!mkshelf!'`
-i=0
-while test $i -lt $n_shelves; do
-        sh -xc "sh $mkshelf $dir $i"
-        i=`expr $i + 1`
-done
diff --git a/Documentation/aoe/mkshelf.sh b/Documentation/aoe/mkshelf.sh
deleted file mode 100644
index 32615814271c..000000000000
--- a/Documentation/aoe/mkshelf.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-
-if test "$#" != "2"; then
-        echo "Usage: sh `basename $0` {dir} {shelfaddress}" 1>&2
-        echo "       n_partitions=16 sh `basename $0` {dir} {shelfaddress}" 1>&2
-        exit 1
-fi
-n_partitions=${n_partitions:-16}
-dir=$1
-shelf=$2
-nslots=16
-maxslot=`echo $nslots 1 - p | dc`
-MAJOR=152
-
-set -e
-
-minor=`echo $nslots \* $shelf \* $n_partitions | bc`
-endp=`echo $n_partitions - 1 | bc`
-for slot in `seq 0 $maxslot`; do
-        for part in `seq 0 $endp`; do
-                name=e$shelf.$slot
-                test "$part" != "0" && name=${name}p$part
-                rm -f $dir/$name
-                mknod -m 0660 $dir/$name b $MAJOR $minor
-
-                minor=`expr $minor + 1`
-        done
-done
diff --git a/Documentation/aoe/status.sh b/Documentation/aoe/status.sh
index 751f3be514b8..eeec7baae57a 100644
--- a/Documentation/aoe/status.sh
+++ b/Documentation/aoe/status.sh
@@ -1,5 +1,8 @@
 #! /bin/sh
 # collate and present sysfs information about AoE storage
+#
+# A more complete version of this script is aoe-stat, in the
+# aoetools.
 
 set -e
 format="%8s\t%8s\t%8s\n"
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
index bf57ecd5d73a..bd7ce120bc13 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -9,6 +9,7 @@ Copyright (C) 2008-2011 Freescale Semiconductor Inc.
    -Run Time Integrity Check (RTIC) Node
    -Run Time Integrity Check (RTIC) Memory Node
    -Secure Non-Volatile Storage (SNVS) Node
+   -Secure Non-Volatile Storage (SNVS) Low Power (LP) RTC Node
    -Full Example
 
 NOTE: the SEC 4 is also known as Freescale's Cryptographic Accelerator
@@ -294,6 +295,27 @@ Secure Non-Volatile Storage (SNVS) Node
           address and length of the SEC4 configuration
           registers.
 
+   - #address-cells
+       Usage: required
+       Value type: <u32>
+       Definition: A standard property.  Defines the number of cells
+           for representing physical addresses in child nodes.  Must
+           have a value of 1.
+
+   - #size-cells
+       Usage: required
+       Value type: <u32>
+       Definition: A standard property.  Defines the number of cells
+           for representing the size of physical addresses in
+           child nodes.  Must have a value of 1.
+
+   - ranges
+       Usage: required
+       Value type: <prop-encoded-array>
+       Definition: A standard property.  Specifies the physical address
+           range of the SNVS register space.  A triplet that includes
+           the child address, parent address, & length.
+
    - interrupts
       Usage: required
       Value type: <prop_encoded-array>
@@ -314,11 +336,34 @@ EXAMPLE
         sec_mon@314000 {
                 compatible = "fsl,sec-v4.0-mon";
                 reg = <0x314000 0x1000>;
+                ranges = <0 0x314000 0x1000>;
                 interrupt-parent = <&mpic>;
                 interrupts = <93 2>;
         };
 
 =====================================================================
+Secure Non-Volatile Storage (SNVS) Low Power (LP) RTC Node
+
+  A SNVS child node that defines SNVS LP RTC.
+
+  - compatible
+      Usage: required
+      Value type: <string>
+      Definition: Must include "fsl,sec-v4.0-mon-rtc-lp".
+
+  - reg
+      Usage: required
+      Value type: <prop-encoded-array>
+      Definition: A standard property.  Specifies the physical
+          address and length of the SNVS LP configuration registers.
+
+EXAMPLE
+        sec_mon_rtc_lp@314000 {
+                compatible = "fsl,sec-v4.0-mon-rtc-lp";
+                reg = <0x34 0x58>;
+        };
+
+=====================================================================
 FULL EXAMPLE
 
         crypto: crypto@300000 {
@@ -390,8 +435,14 @@ FULL EXAMPLE
         sec_mon: sec_mon@314000 {
                 compatible = "fsl,sec-v4.0-mon";
                 reg = <0x314000 0x1000>;
+                ranges = <0 0x314000 0x1000>;
                 interrupt-parent = <&mpic>;
                 interrupts = <93 2>;
+
+                sec_mon_rtc_lp@34 {
+                        compatible = "fsl,sec-v4.0-mon-rtc-lp";
+                        reg = <0x34 0x58>;
+                };
         };
 
 =====================================================================
diff --git a/Documentation/devicetree/bindings/rtc/snvs-rtc.txt b/Documentation/devicetree/bindings/rtc/snvs-rtc.txt
new file mode 100644
index 000000000000..fb61ed77ada3
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/snvs-rtc.txt
@@ -0,0 +1 @@
+See Documentation/devicetree/bindings/crypto/fsl-sec4.txt for details.
diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index 7561d7ed8e11..8ffb274367c7 100644
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -69,6 +69,7 @@ MAC/FDDI addresses:
         %pMR    05:04:03:02:01:00
         %pMF    00-01-02-03-04-05
         %pm     000102030405
+        %pmR    050403020100
 
         For printing 6-byte MAC/FDDI addresses in hex notation. The 'M' and 'm'
         specifiers result in a printed address with ('M') or without ('m') byte
diff --git a/Documentation/rtc.txt b/Documentation/rtc.txt
index 250160469d83..32aa4002de4a 100644
--- a/Documentation/rtc.txt
+++ b/Documentation/rtc.txt
@@ -119,8 +119,9 @@ three different userspace interfaces:
     *   /sys/class/rtc/rtcN ... sysfs attributes support readonly
         access to some RTC attributes.
 
-    *   /proc/driver/rtc ... the first RTC (rtc0) may expose itself
-        using a procfs interface.  More information is (currently) shown
+    *   /proc/driver/rtc ... the system clock RTC may expose itself
+        using a procfs interface. If there is no RTC for the system clock,
+        rtc0 is used by default. More information is (currently) shown
         here than through sysfs.
 
 The RTC Class framework supports a wide variety of RTCs, ranging from those
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 6d78841fd416..2907ba6c3607 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -181,6 +181,8 @@ core_pattern is used to specify a core dumpfile pattern name.
         %p      pid
         %u      uid
         %g      gid
+        %d      dump mode, matches PR_SET_DUMPABLE and
+                /proc/sys/fs/suid_dumpable
         %s      signal number
         %t      UNIX time of dump
         %h      hostname
diff --git a/MAINTAINERS b/MAINTAINERS
index f883fc1b1b46..0976bd1381b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -572,7 +572,7 @@ F:	drivers/net/appletalk/
 F:      net/appletalk/
 
 ARASAN COMPACT FLASH PATA CONTROLLER
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      linux-ide@vger.kernel.org
 S:      Maintained
 F:      include/linux/pata_arasan_cf_data.h
@@ -760,6 +760,7 @@ S:	Maintained
 T:      git git://git.pengutronix.de/git/imx/linux-2.6.git
 F:      arch/arm/mach-imx/
 F:      arch/arm/plat-mxc/
+F:      arch/arm/configs/imx*_defconfig
 
 ARM/FREESCALE IMX6
 M:      Shawn Guo <shawn.guo@linaro.org>
@@ -1245,7 +1246,7 @@ F:	include/linux/i2c/at24.h
 
 ATA OVER ETHERNET (AOE) DRIVER
 M:      "Ed L. Cashin" <ecashin@coraid.com>
-W:      http://www.coraid.com/support/linux
+W:      http://support.coraid.com/support/linux
 S:      Supported
 F:      Documentation/aoe/
 F:      drivers/block/aoe/
@@ -3123,6 +3124,7 @@ T:	git git://git.secretlab.ca/git/linux-2.6.git
 F:      Documentation/gpio.txt
 F:      drivers/gpio/
 F:      include/linux/gpio*
+F:      include/asm-generic/gpio.h
 
 GRE DEMULTIPLEXER DRIVER
 M:      Dmitry Kozlov <xeb@mail.ru>
@@ -5265,7 +5267,7 @@ F:	include/linux/i2c-algo-pca.h
 F:      include/linux/i2c-pca-platform.h
 
 PCDP - PRIMARY CONSOLE AND DEBUG PORT
-M:      Khalid Aziz <khalid.aziz@hp.com>
+M:      Khalid Aziz <khalid@gonehiking.org>
 S:      Maintained
 F:      drivers/firmware/pcdp.*
 
@@ -5554,7 +5556,7 @@ S:	Maintained
 W:      http://linuxptp.sourceforge.net/
 F:      Documentation/ABI/testing/sysfs-ptp
 F:      Documentation/ptp/*
-F:      drivers/net/gianfar_ptp.c
+F:      drivers/net/ethernet/freescale/gianfar_ptp.c
 F:      drivers/net/phy/dp83640*
 F:      drivers/ptp/*
 F:      include/linux/ptp_cl*
@@ -5986,7 +5988,7 @@ S:	Maintained
 F:      drivers/tty/serial
 
 SYNOPSYS DESIGNWARE DMAC DRIVER
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 S:      Maintained
 F:      include/linux/dw_dmac.h
 F:      drivers/dma/dw_dmac_regs.h
@@ -6134,7 +6136,7 @@ S:	Maintained
 F:      drivers/mmc/host/sdhci-s3c.c
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-mmc@vger.kernel.org
 S:      Maintained
@@ -6499,7 +6501,7 @@ S:	Maintained
 F:      include/linux/compiler.h
 
 SPEAR PLATFORM SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6508,7 +6510,7 @@ S:	Maintained
 F:      arch/arm/plat-spear/
 
 SPEAR13XX MACHINE SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6517,7 +6519,7 @@ S:	Maintained
 F:      arch/arm/mach-spear13xx/
 
 SPEAR3XX MACHINE SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -6528,7 +6530,7 @@ F:	arch/arm/mach-spear3xx/
 SPEAR6XX MACHINE SUPPORT
 M:      Rajeev Kumar <rajeev-dlh.kumar@st.com>
 M:      Shiraz Hashim <shiraz.hashim@st.com>
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.st.com/spear
@@ -6536,7 +6538,7 @@ S:	Maintained
 F:      arch/arm/mach-spear6xx/
 
 SPEAR CLOCK FRAMEWORK SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.st.com/spear
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 188c82971ebd..33361505c0cd 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -625,7 +625,7 @@ fail:
         return 0;
 }
 
-static struct clk *const standard_pmc_clocks[] __initdata = {
+static struct clk *const standard_pmc_clocks[] __initconst = {
         /* four primary clocks */
         &clk32k,
         &main_clk,
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index ac4e003ad863..be3099733b1f 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -88,7 +88,7 @@ static struct davinci_mmc_config mmc_config = {
         .version        = MMC_CTLR_VERSION_1,
 };
 
-static const short sdio1_pins[] __initdata = {
+static const short sdio1_pins[] __initconst = {
         TNETV107X_SDIO1_CLK_1,          TNETV107X_SDIO1_CMD_1,
         TNETV107X_SDIO1_DATA0_1,        TNETV107X_SDIO1_DATA1_1,
         TNETV107X_SDIO1_DATA2_1,        TNETV107X_SDIO1_DATA3_1,
@@ -96,12 +96,12 @@ static const short sdio1_pins[] __initdata = {
         -1
 };
 
-static const short uart1_pins[] __initdata = {
+static const short uart1_pins[] __initconst = {
         TNETV107X_UART1_RD,             TNETV107X_UART1_TD,
         -1
 };
 
-static const short ssp_pins[] __initdata = {
+static const short ssp_pins[] __initconst = {
         TNETV107X_SSP0_0, TNETV107X_SSP0_1, TNETV107X_SSP0_2,
         TNETV107X_SSP1_0, TNETV107X_SSP1_1, TNETV107X_SSP1_2,
         TNETV107X_SSP1_3, -1
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index deee5c2da754..510648e0394b 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -838,7 +838,7 @@ static const struct mux_config da830_pins[] = {
 #endif
 };
 
-const short da830_emif25_pins[] __initdata = {
+const short da830_emif25_pins[] __initconst = {
         DA830_EMA_D_0, DA830_EMA_D_1, DA830_EMA_D_2, DA830_EMA_D_3,
         DA830_EMA_D_4, DA830_EMA_D_5, DA830_EMA_D_6, DA830_EMA_D_7,
         DA830_EMA_D_8, DA830_EMA_D_9, DA830_EMA_D_10, DA830_EMA_D_11,
@@ -853,19 +853,19 @@ const short da830_emif25_pins[] __initdata = {
         -1
 };
 
-const short da830_spi0_pins[] __initdata = {
+const short da830_spi0_pins[] __initconst = {
         DA830_SPI0_SOMI_0, DA830_SPI0_SIMO_0, DA830_SPI0_CLK, DA830_NSPI0_ENA,
         DA830_NSPI0_SCS_0,
         -1
 };
 
-const short da830_spi1_pins[] __initdata = {
+const short da830_spi1_pins[] __initconst = {
         DA830_SPI1_SOMI_0, DA830_SPI1_SIMO_0, DA830_SPI1_CLK, DA830_NSPI1_ENA,
         DA830_NSPI1_SCS_0,
         -1
 };
 
-const short da830_mmc_sd_pins[] __initdata = {
+const short da830_mmc_sd_pins[] __initconst = {
         DA830_MMCSD_DAT_0, DA830_MMCSD_DAT_1, DA830_MMCSD_DAT_2,
         DA830_MMCSD_DAT_3, DA830_MMCSD_DAT_4, DA830_MMCSD_DAT_5,
         DA830_MMCSD_DAT_6, DA830_MMCSD_DAT_7, DA830_MMCSD_CLK,
@@ -873,32 +873,32 @@ const short da830_mmc_sd_pins[] __initdata = {
         -1
 };
 
-const short da830_uart0_pins[] __initdata = {
+const short da830_uart0_pins[] __initconst = {
         DA830_NUART0_CTS, DA830_NUART0_RTS, DA830_UART0_RXD, DA830_UART0_TXD,
         -1
 };
 
-const short da830_uart1_pins[] __initdata = {
+const short da830_uart1_pins[] __initconst = {
         DA830_UART1_RXD, DA830_UART1_TXD,
         -1
 };
 
-const short da830_uart2_pins[] __initdata = {
+const short da830_uart2_pins[] __initconst = {
         DA830_UART2_RXD, DA830_UART2_TXD,
         -1
 };
 
-const short da830_usb20_pins[] __initdata = {
+const short da830_usb20_pins[] __initconst = {
         DA830_USB0_DRVVBUS, DA830_USB_REFCLKIN,
         -1
 };
 
-const short da830_usb11_pins[] __initdata = {
+const short da830_usb11_pins[] __initconst = {
         DA830_USB_REFCLKIN,
         -1
 };
 
-const short da830_uhpi_pins[] __initdata = {
+const short da830_uhpi_pins[] __initconst = {
         DA830_UHPI_HD_0, DA830_UHPI_HD_1, DA830_UHPI_HD_2, DA830_UHPI_HD_3,
         DA830_UHPI_HD_4, DA830_UHPI_HD_5, DA830_UHPI_HD_6, DA830_UHPI_HD_7,
         DA830_UHPI_HD_8, DA830_UHPI_HD_9, DA830_UHPI_HD_10, DA830_UHPI_HD_11,
@@ -909,14 +909,14 @@ const short da830_uhpi_pins[] __initdata = {
         -1
 };
 
-const short da830_cpgmac_pins[] __initdata = {
+const short da830_cpgmac_pins[] __initconst = {
         DA830_RMII_TXD_0, DA830_RMII_TXD_1, DA830_RMII_TXEN, DA830_RMII_CRS_DV,
         DA830_RMII_RXD_0, DA830_RMII_RXD_1, DA830_RMII_RXER, DA830_MDIO_CLK,
         DA830_MDIO_D,
         -1
 };
 
-const short da830_emif3c_pins[] __initdata = {
+const short da830_emif3c_pins[] __initconst = {
         DA830_EMB_SDCKE, DA830_EMB_CLK_GLUE, DA830_EMB_CLK, DA830_NEMB_CS_0,
         DA830_NEMB_CAS, DA830_NEMB_RAS, DA830_NEMB_WE, DA830_EMB_BA_1,
         DA830_EMB_BA_0, DA830_EMB_A_0, DA830_EMB_A_1, DA830_EMB_A_2,
@@ -935,7 +935,7 @@ const short da830_emif3c_pins[] __initdata = {
         -1
 };
 
-const short da830_mcasp0_pins[] __initdata = {
+const short da830_mcasp0_pins[] __initconst = {
         DA830_AHCLKX0, DA830_ACLKX0, DA830_AFSX0,
         DA830_AHCLKR0, DA830_ACLKR0, DA830_AFSR0, DA830_AMUTE0,
         DA830_AXR0_0, DA830_AXR0_1, DA830_AXR0_2, DA830_AXR0_3,
@@ -945,7 +945,7 @@ const short da830_mcasp0_pins[] __initdata = {
         -1
 };
 
-const short da830_mcasp1_pins[] __initdata = {
+const short da830_mcasp1_pins[] __initconst = {
         DA830_AHCLKX1, DA830_ACLKX1, DA830_AFSX1,
         DA830_AHCLKR1, DA830_ACLKR1, DA830_AFSR1, DA830_AMUTE1,
         DA830_AXR1_0, DA830_AXR1_1, DA830_AXR1_2, DA830_AXR1_3,
@@ -954,24 +954,24 @@ const short da830_mcasp1_pins[] __initdata = {
         -1
 };
 
-const short da830_mcasp2_pins[] __initdata = {
+const short da830_mcasp2_pins[] __initconst = {
         DA830_AHCLKX2, DA830_ACLKX2, DA830_AFSX2,
         DA830_AHCLKR2, DA830_ACLKR2, DA830_AFSR2, DA830_AMUTE2,
         DA830_AXR2_0, DA830_AXR2_1, DA830_AXR2_2, DA830_AXR2_3,
         -1
 };
 
-const short da830_i2c0_pins[] __initdata = {
+const short da830_i2c0_pins[] __initconst = {
         DA830_I2C0_SDA, DA830_I2C0_SCL,
         -1
 };
 
-const short da830_i2c1_pins[] __initdata = {
+const short da830_i2c1_pins[] __initconst = {
         DA830_I2C1_SCL, DA830_I2C1_SDA,
         -1
 };
 
-const short da830_lcdcntl_pins[] __initdata = {
+const short da830_lcdcntl_pins[] __initconst = {
         DA830_LCD_D_0, DA830_LCD_D_1, DA830_LCD_D_2, DA830_LCD_D_3,
         DA830_LCD_D_4, DA830_LCD_D_5, DA830_LCD_D_6, DA830_LCD_D_7,
         DA830_LCD_D_8, DA830_LCD_D_9, DA830_LCD_D_10, DA830_LCD_D_11,
@@ -981,34 +981,34 @@ const short da830_lcdcntl_pins[] __initdata = {
         -1
 };
 
-const short da830_pwm_pins[] __initdata = {
+const short da830_pwm_pins[] __initconst = {
         DA830_ECAP0_APWM0, DA830_ECAP1_APWM1, DA830_EPWM0B, DA830_EPWM0A,
         DA830_EPWMSYNCI, DA830_EPWMSYNC0, DA830_ECAP2_APWM2, DA830_EHRPWMGLUETZ,
         DA830_EPWM2B, DA830_EPWM2A, DA830_EPWM1B, DA830_EPWM1A,
         -1
 };
 
-const short da830_ecap0_pins[] __initdata = {
+const short da830_ecap0_pins[] __initconst = {
         DA830_ECAP0_APWM0,
         -1
 };
 
-const short da830_ecap1_pins[] __initdata = {
+const short da830_ecap1_pins[] __initconst = {
         DA830_ECAP1_APWM1,
         -1
 };
 
-const short da830_ecap2_pins[] __initdata = {
+const short da830_ecap2_pins[] __initconst = {
         DA830_ECAP2_APWM2,
         -1
 };
 
-const short da830_eqep0_pins[] __initdata = {
+const short da830_eqep0_pins[] __initconst = {
         DA830_EQEP0I, DA830_EQEP0S, DA830_EQEP0A, DA830_EQEP0B,
         -1
 };
 
-const short da830_eqep1_pins[] __initdata = {
+const short da830_eqep1_pins[] __initconst = {
         DA830_EQEP1I, DA830_EQEP1S, DA830_EQEP1A, DA830_EQEP1B,
         -1
 };
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index b44dc844e15e..6676dee7104e 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -576,17 +576,17 @@ static const struct mux_config da850_pins[] = {
 #endif
 };
 
-const short da850_i2c0_pins[] __initdata = {
+const short da850_i2c0_pins[] __initconst = {
         DA850_I2C0_SDA, DA850_I2C0_SCL,
         -1
 };
 
-const short da850_i2c1_pins[] __initdata = {
+const short da850_i2c1_pins[] __initconst = {
         DA850_I2C1_SCL, DA850_I2C1_SDA,
         -1
 };
 
-const short da850_lcdcntl_pins[] __initdata = {
+const short da850_lcdcntl_pins[] __initconst = {
         DA850_LCD_D_0, DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3,
         DA850_LCD_D_4, DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7,
         DA850_LCD_D_8, DA850_LCD_D_9, DA850_LCD_D_10, DA850_LCD_D_11,
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index a344a373928b..2448fcf09eb1 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -37,8 +37,8 @@
 #include "devices.h"
 #include "common.h"
 
-static const resource_size_t qsd8x50_surf_smc91x_base __initdata = 0x70000300;
-static const unsigned        qsd8x50_surf_smc91x_gpio __initdata = 156;
+static const resource_size_t qsd8x50_surf_smc91x_base __initconst = 0x70000300;
+static const unsigned        qsd8x50_surf_smc91x_gpio __initconst = 156;
 
 /* Leave smc91x resources empty here, as we'll fill them in
  * at run-time: they vary from board to board, and the true
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index af1ed7d24a1f..e470c6e50acd 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -76,14 +76,14 @@ struct omap_dss_hwmod_data {
         const int id;
 };
 
-static const struct omap_dss_hwmod_data omap2_dss_hwmod_data[] __initdata = {
+static const struct omap_dss_hwmod_data omap2_dss_hwmod_data[] __initconst = {
         { "dss_core", "omapdss_dss", -1 },
         { "dss_dispc", "omapdss_dispc", -1 },
         { "dss_rfbi", "omapdss_rfbi", -1 },
         { "dss_venc", "omapdss_venc", -1 },
 };
 
-static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initdata = {
+static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initconst = {
         { "dss_core", "omapdss_dss", -1 },
         { "dss_dispc", "omapdss_dispc", -1 },
         { "dss_rfbi", "omapdss_rfbi", -1 },
@@ -91,7 +91,7 @@ static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initdata = {
         { "dss_dsi1", "omapdss_dsi", 0 },
 };
 
-static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {
+static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initconst = {
         { "dss_core", "omapdss_dss", -1 },
         { "dss_dispc", "omapdss_dispc", -1 },
         { "dss_rfbi", "omapdss_rfbi", -1 },
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h
index a670a33ad736..37e610dc084e 100644
--- a/arch/arm64/include/asm/compat.h
+++ b/arch/arm64/include/asm/compat.h
@@ -55,6 +55,7 @@ typedef s64		compat_s64;
 typedef u32             compat_uint_t;
 typedef u32             compat_ulong_t;
 typedef u64             compat_u64;
+typedef u32             compat_uptr_t;
 
 struct compat_timespec {
         compat_time_t   tv_sec;
@@ -130,6 +131,64 @@ typedef u32		compat_old_sigset_t;
 
 typedef u32             compat_sigset_word;
 
+typedef union compat_sigval {
+        compat_int_t    sival_int;
+        compat_uptr_t   sival_ptr;
+} compat_sigval_t;
+
+typedef struct compat_siginfo {
+        int si_signo;
+        int si_errno;
+        int si_code;
+
+        union {
+                /* The padding is the same size as AArch64. */
+                int _pad[128/sizeof(int) - 3];
+
+                /* kill() */
+                struct {
+                        compat_pid_t _pid;      /* sender's pid */
+                        __compat_uid32_t _uid;  /* sender's uid */
+                } _kill;
+
+                /* POSIX.1b timers */
+                struct {
+                        compat_timer_t _tid;    /* timer id */
+                        int _overrun;           /* overrun count */
+                        compat_sigval_t _sigval;        /* same as below */
+                        int _sys_private;       /* not to be passed to user */
+                } _timer;
+
+                /* POSIX.1b signals */
+                struct {
+                        compat_pid_t _pid;      /* sender's pid */
+                        __compat_uid32_t _uid;  /* sender's uid */
+                        compat_sigval_t _sigval;
+                } _rt;
+
+                /* SIGCHLD */
+                struct {
+                        compat_pid_t _pid;      /* which child */
+                        __compat_uid32_t _uid;  /* sender's uid */
+                        int _status;            /* exit code */
+                        compat_clock_t _utime;
+                        compat_clock_t _stime;
+                } _sigchld;
+
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+                struct {
+                        compat_uptr_t _addr; /* faulting insn/memory ref. */
+                        short _addr_lsb; /* LSB of the reported address */
+                } _sigfault;
+
+                /* SIGPOLL */
+                struct {
+                        compat_long_t _band;    /* POLL_IN, POLL_OUT, POLL_MSG */
+                        int _fd;
+                } _sigpoll;
+        } _sifields;
+} compat_siginfo_t;
+
 #define COMPAT_OFF_T_MAX        0x7fffffff
 #define COMPAT_LOFF_T_MAX       0x7fffffffffffffffL
 
@@ -139,7 +198,6 @@ typedef u32		compat_sigset_word;
  * as pointers because the syscall entry code will have
  * appropriately converted them already.
  */
-typedef u32             compat_uptr_t;
 
 static inline void __user *compat_ptr(compat_uptr_t uptr)
 {
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
index ac74c2f261e3..0790a87a4346 100644
--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
@@ -30,59 +30,6 @@
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 
-typedef struct compat_siginfo {
-        int si_signo;
-        int si_errno;
-        int si_code;
-
-        union {
-                /* The padding is the same size as AArch64. */
-                int _pad[SI_PAD_SIZE];
-
-                /* kill() */
-                struct {
-                        compat_pid_t _pid;      /* sender's pid */
-                        __compat_uid32_t _uid;  /* sender's uid */
-                } _kill;
-
-                /* POSIX.1b timers */
-                struct {
-                        compat_timer_t _tid;    /* timer id */
-                        int _overrun;           /* overrun count */
-                        compat_sigval_t _sigval;        /* same as below */
-                        int _sys_private;       /* not to be passed to user */
-                } _timer;
-
-                /* POSIX.1b signals */
-                struct {
-                        compat_pid_t _pid;      /* sender's pid */
-                        __compat_uid32_t _uid;  /* sender's uid */
-                        compat_sigval_t _sigval;
-                } _rt;
-
-                /* SIGCHLD */
-                struct {
-                        compat_pid_t _pid;      /* which child */
-                        __compat_uid32_t _uid;  /* sender's uid */
-                        int _status;            /* exit code */
-                        compat_clock_t _utime;
-                        compat_clock_t _stime;
-                } _sigchld;
-
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        compat_uptr_t _addr; /* faulting insn/memory ref. */
-                        short _addr_lsb; /* LSB of the reported address */
-                } _sigfault;
-
-                /* SIGPOLL */
-                struct {
-                        compat_long_t _band;    /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-        } _sifields;
-} compat_siginfo_t;
-
 struct compat_sigaction {
         compat_uptr_t                   sa_handler;
         compat_ulong_t                  sa_flags;
diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
index 3b3159b710d4..e2c328739808 100644
--- a/arch/avr32/include/asm/elf.h
+++ b/arch/avr32/include/asm/elf.h
@@ -102,6 +102,7 @@ typedef struct user_fpu_struct elf_fpregset_t;
 
 #define ELF_PLATFORM  (NULL)
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX_32BIT | (current->personality & (~PER_MASK)))
 
 #endif /* __ASM_AVR32_ELF_H */
diff --git a/arch/blackfin/include/asm/elf.h b/arch/blackfin/include/asm/elf.h
index e6c6812a9abd..14bc98ff668f 100644
--- a/arch/blackfin/include/asm/elf.h
+++ b/arch/blackfin/include/asm/elf.h
@@ -132,6 +132,7 @@ do {											\
 
 #define ELF_PLATFORM  (NULL)
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 
 #endif
diff --git a/arch/c6x/include/asm/elf.h b/arch/c6x/include/asm/elf.h
index f4552db20b4a..32b997126adf 100644
--- a/arch/c6x/include/asm/elf.h
+++ b/arch/c6x/include/asm/elf.h
@@ -77,7 +77,8 @@ do {								\
 
 #define ELF_PLATFORM  (NULL)
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 
 /* C6X specific section types */
 #define SHT_C6000_UNWIND        0x70000001
diff --git a/arch/cris/include/asm/elf.h b/arch/cris/include/asm/elf.h
index 8a3d8e2b33c1..8182f2dc89d0 100644
--- a/arch/cris/include/asm/elf.h
+++ b/arch/cris/include/asm/elf.h
@@ -86,6 +86,7 @@ typedef unsigned long elf_fpregset_t;
 
 #define ELF_PLATFORM  (NULL)
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 
 #endif
diff --git a/arch/frv/include/asm/elf.h b/arch/frv/include/asm/elf.h
index c3819804a74b..9ccbc80f0b11 100644
--- a/arch/frv/include/asm/elf.h
+++ b/arch/frv/include/asm/elf.h
@@ -137,6 +137,7 @@ do {											\
 
 #define ELF_PLATFORM  (NULL)
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 
 #endif
diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c
index 5fa3889d858b..0b579927439d 100644
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
@@ -153,23 +153,22 @@ static int user_atoi(char __user *ubuf, size_t len)
 static int sysctl_pm_do_suspend(ctl_table *ctl, int write,
                                 void __user *buffer, size_t *lenp, loff_t *fpos)
 {
-        int retval, mode;
+        int mode;
 
         if (*lenp <= 0)
                 return -EIO;
 
         mode = user_atoi(buffer, *lenp);
-        if ((mode != 1) && (mode != 5))
-                return -EINVAL;
+        switch (mode) {
+        case 1:
+            return pm_do_suspend();
 
-        if (retval == 0) {
-                if (mode == 5)
-                    retval = pm_do_bus_sleep();
-                else
-                    retval = pm_do_suspend();
-        }
+        case 5:
+            return pm_do_bus_sleep();
 
-        return retval;
+        default:
+            return -EINVAL;
+        }
 }
 
 static int try_set_cmode(int new_cmode)
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index 75cf7f4b2fa8..1f1e5efb3385 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -184,7 +184,7 @@ static struct clock_cmode __pminitdata clock_cmodes_fr555[16] = {
         [6]     = {     _x1,    _x1_5,  _x1_5,  _x4_5,  _x0_375 },
 };
 
-static const struct clock_cmode __pminitdata *clock_cmodes;
+static const struct clock_cmode __pminitconst *clock_cmodes;
 static int __pminitdata clock_doubled;
 
 static struct uart_port __pminitdata __frv_uart0 = {
diff --git a/arch/frv/mb93090-mb00/pci-irq.c b/arch/frv/mb93090-mb00/pci-irq.c
index 20f6497b2cd5..c677b9d81d30 100644
--- a/arch/frv/mb93090-mb00/pci-irq.c
+++ b/arch/frv/mb93090-mb00/pci-irq.c
@@ -28,7 +28,7 @@
  *
  */
 
-static const uint8_t __initdata pci_bus0_irq_routing[32][4] = {
+static const uint8_t __initconst pci_bus0_irq_routing[32][4] = {
         [0 ] = { IRQ_FPGA_MB86943_PCI_INTA },
         [16] = { IRQ_FPGA_RTL8029_INTA },
         [17] = { IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB },
diff --git a/arch/h8300/include/asm/elf.h b/arch/h8300/include/asm/elf.h
index c24fa250d653..41193c396bff 100644
--- a/arch/h8300/include/asm/elf.h
+++ b/arch/h8300/include/asm/elf.h
@@ -54,7 +54,8 @@ typedef unsigned long elf_fpregset_t;
 
 #define ELF_PLATFORM  (NULL)
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 
 #define R_H8_NONE       0
 #define R_H8_DIR32      1
diff --git a/arch/h8300/kernel/sys_h8300.c b/arch/h8300/kernel/sys_h8300.c
index aaf5e5a48f93..4bdc7311784e 100644
--- a/arch/h8300/kernel/sys_h8300.c
+++ b/arch/h8300/kernel/sys_h8300.c
@@ -51,6 +51,7 @@ asmlinkage void syscall_print(void *dummy,...)
  * Do a system call from kernel instead of calling sys_execve so we
  * end up with proper pt_regs.
  */
+asmlinkage
 int kernel_execve(const char *filename,
                   const char *const argv[],
                   const char *const envp[])
diff --git a/arch/h8300/kernel/timer/itu.c b/arch/h8300/kernel/timer/itu.c
index a2ae5e952137..0a8b5cd5bf38 100644
--- a/arch/h8300/kernel/timer/itu.c
+++ b/arch/h8300/kernel/timer/itu.c
@@ -62,7 +62,7 @@ static struct irqaction itu_irq = {
         .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
-static const int __initdata divide_rate[] = {1, 2, 4, 8};
+static const int __initconst divide_rate[] = {1, 2, 4, 8};
 
 void __init h8300_timer_setup(void)
 {
diff --git a/arch/h8300/kernel/timer/timer16.c b/arch/h8300/kernel/timer/timer16.c
index ae0d38161139..462d9f581719 100644
--- a/arch/h8300/kernel/timer/timer16.c
+++ b/arch/h8300/kernel/timer/timer16.c
@@ -57,7 +57,7 @@ static struct irqaction timer16_irq = {
         .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
-static const int __initdata divide_rate[] = {1, 2, 4, 8};
+static const int __initconst divide_rate[] = {1, 2, 4, 8};
 
 void __init h8300_timer_setup(void)
 {
diff --git a/arch/h8300/kernel/timer/timer8.c b/arch/h8300/kernel/timer/timer8.c
index 7a1533fad47d..505f3415b40f 100644
--- a/arch/h8300/kernel/timer/timer8.c
+++ b/arch/h8300/kernel/timer/timer8.c
@@ -77,7 +77,7 @@ static struct irqaction timer8_irq = {
         .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
-static const int __initdata divide_rate[] = {8, 64, 8192};
+static const int __initconst divide_rate[] = {8, 64, 8192};
 
 void __init h8300_timer_setup(void)
 {
diff --git a/arch/h8300/kernel/timer/tpu.c b/arch/h8300/kernel/timer/tpu.c
index 2193a2e2859a..0350f6204ecf 100644
--- a/arch/h8300/kernel/timer/tpu.c
+++ b/arch/h8300/kernel/timer/tpu.c
@@ -66,7 +66,7 @@ static struct irqaction tpu_irq = {
         .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
-static const int __initdata divide_rate[] = {
+static const int __initconst divide_rate[] = {
 #if CONFIG_H8300_TPU_CH == 0
         1,4,16,64,0,0,0,0,
 #elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5)
diff --git a/arch/h8300/platform/h8300h/irq.c b/arch/h8300/platform/h8300h/irq.c
index bc4f51bceef5..0a50353e09d5 100644
--- a/arch/h8300/platform/h8300h/irq.c
+++ b/arch/h8300/platform/h8300h/irq.c
@@ -14,14 +14,14 @@
 #include <asm/gpio-internal.h>
 #include <asm/regs306x.h>
 
-const int __initdata h8300_saved_vectors[] = {
+const int __initconst h8300_saved_vectors[] = {
 #if defined(CONFIG_GDB_DEBUG)
         TRAP3_VEC,      /* TRAPA #3 is GDB breakpoint */
 #endif
         -1,
 };
 
-const h8300_vector __initdata h8300_trap_table[] = {
+const h8300_vector __initconst h8300_trap_table[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
         system_call,
         0,
diff --git a/arch/h8300/platform/h8s/irq.c b/arch/h8300/platform/h8s/irq.c
index 7b5f29febc07..f3a5511c16b1 100644
--- a/arch/h8300/platform/h8s/irq.c
+++ b/arch/h8300/platform/h8s/irq.c
@@ -18,7 +18,7 @@
 #include <asm/regs267x.h>
 
 /* saved vector list */
-const int __initdata h8300_saved_vectors[]={
+const int __initconst h8300_saved_vectors[] = {
 #if defined(CONFIG_GDB_DEBUG)
         TRACE_VEC,
         TRAP3_VEC,
@@ -27,7 +27,7 @@ const int __initdata h8300_saved_vectors[]={
 };
 
 /* trap entry table */
-const H8300_VECTOR __initdata h8300_trap_table[] = {
+const H8300_VECTOR __initconst h8300_trap_table[] = {
         0,0,0,0,0,
         trace_break,  /* TRACE */
         0,0,
diff --git a/arch/hexagon/include/asm/elf.h b/arch/hexagon/include/asm/elf.h
index 37976a0d3650..82b499621e05 100644
--- a/arch/hexagon/include/asm/elf.h
+++ b/arch/hexagon/include/asm/elf.h
@@ -217,7 +217,8 @@ do {					\
 #define ELF_PLATFORM  (NULL)
 
 #ifdef __KERNEL__
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 #endif
 
 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
diff --git a/arch/ia64/xen/irq_xen.c b/arch/ia64/xen/irq_xen.c
index 3bb12230721f..01f479ee1c43 100644
--- a/arch/ia64/xen/irq_xen.c
+++ b/arch/ia64/xen/irq_xen.c
@@ -433,7 +433,7 @@ xen_resend_irq(unsigned int vector)
         (void)resend_irq_on_evtchn(vector);
 }
 
-const struct pv_irq_ops xen_irq_ops __initdata = {
+const struct pv_irq_ops xen_irq_ops __initconst = {
         .register_ipi = xen_register_ipi,
 
         .assign_irq_vector = xen_assign_irq_vector,
diff --git a/arch/ia64/xen/irq_xen.h b/arch/ia64/xen/irq_xen.h
index 26110f330c87..1778517b90fe 100644
--- a/arch/ia64/xen/irq_xen.h
+++ b/arch/ia64/xen/irq_xen.h
@@ -27,7 +27,7 @@ extern void (*late_time_init)(void);
 extern char xen_event_callback;
 void __init xen_init_IRQ(void);
 
-extern const struct pv_irq_ops xen_irq_ops __initdata;
+extern const struct pv_irq_ops xen_irq_ops __initconst;
 extern void xen_smp_intr_init(void);
 extern void xen_send_ipi(int cpu, int vec);
 
diff --git a/arch/m32r/include/asm/elf.h b/arch/m32r/include/asm/elf.h
index b8da7d0574d2..70896161c636 100644
--- a/arch/m32r/include/asm/elf.h
+++ b/arch/m32r/include/asm/elf.h
@@ -128,6 +128,7 @@ typedef elf_fpreg_t elf_fpregset_t;
    intent than poking at uname or /proc/cpuinfo.  */
 #define ELF_PLATFORM    (NULL)
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 
 #endif  /* _ASM_M32R__ELF_H */
diff --git a/arch/m68k/include/asm/elf.h b/arch/m68k/include/asm/elf.h
index e9b7cda59744..f83c1d0a87cf 100644
--- a/arch/m68k/include/asm/elf.h
+++ b/arch/m68k/include/asm/elf.h
@@ -113,6 +113,7 @@ typedef struct user_m68kfp_struct elf_fpregset_t;
 
 #define ELF_PLATFORM  (NULL)
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 
 #endif
diff --git a/arch/microblaze/include/asm/elf.h b/arch/microblaze/include/asm/elf.h
index 834849f59ae8..640ddd4b6a9b 100644
--- a/arch/microblaze/include/asm/elf.h
+++ b/arch/microblaze/include/asm/elf.h
@@ -116,7 +116,8 @@ do {							\
 } while (0)
 
 #ifdef __KERNEL__
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX_32BIT | (current->personality & (~PER_MASK)))
 #endif
 
 #endif /* __uClinux__ */
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index feb05258a4d1..dd18e4b761a8 100644
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -632,7 +632,7 @@ static struct board_info __initdata board_DWVS0 = {
 /*
  * all boards
  */
-static const struct board_info __initdata *bcm963xx_boards[] = {
+static const struct board_info __initconst *bcm963xx_boards[] = {
 #ifdef CONFIG_BCM63XX_CPU_6328
         &board_96328avng,
 #endif
diff --git a/arch/mips/include/asm/compat-signal.h b/arch/mips/include/asm/compat-signal.h
index 368a99e5c3e1..6599a901b63e 100644
--- a/arch/mips/include/asm/compat-signal.h
+++ b/arch/mips/include/asm/compat-signal.h
@@ -10,68 +10,6 @@
 
 #include <asm/uaccess.h>
 
-#define SI_PAD_SIZE32   ((SI_MAX_SIZE/sizeof(int)) - 3)
-
-typedef struct compat_siginfo {
-        int si_signo;
-        int si_code;
-        int si_errno;
-
-        union {
-                int _pad[SI_PAD_SIZE32];
-
-                /* kill() */
-                struct {
-                        compat_pid_t _pid;      /* sender's pid */
-                        compat_uid_t _uid;      /* sender's uid */
-                } _kill;
-
-                /* SIGCHLD */
-                struct {
-                        compat_pid_t _pid;      /* which child */
-                        compat_uid_t _uid;      /* sender's uid */
-                        int _status;            /* exit code */
-                        compat_clock_t _utime;
-                        compat_clock_t _stime;
-                } _sigchld;
-
-                /* IRIX SIGCHLD */
-                struct {
-                        compat_pid_t _pid;      /* which child */
-                        compat_clock_t _utime;
-                        int _status;            /* exit code */
-                        compat_clock_t _stime;
-                } _irix_sigchld;
-
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        s32 _addr; /* faulting insn/memory ref. */
-                } _sigfault;
-
-                /* SIGPOLL, SIGXFSZ (To do ...)  */
-                struct {
-                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-
-                /* POSIX.1b timers */
-                struct {
-                        timer_t _tid;           /* timer id */
-                        int _overrun;           /* overrun count */
-                        compat_sigval_t _sigval;/* same as below */
-                        int _sys_private;       /* not to be passed to user */
-                } _timer;
-
-                /* POSIX.1b signals */
-                struct {
-                        compat_pid_t _pid;      /* sender's pid */
-                        compat_uid_t _uid;      /* sender's uid */
-                        compat_sigval_t _sigval;
-                } _rt;
-
-        } _sifields;
-} compat_siginfo_t;
-
 static inline int __copy_conv_sigset_to_user(compat_sigset_t __user *d,
         const sigset_t *s)
 {
diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h
index b77df0366ee6..58277e0e9cd4 100644
--- a/arch/mips/include/asm/compat.h
+++ b/arch/mips/include/asm/compat.h
@@ -43,6 +43,7 @@ typedef s64		compat_s64;
 typedef u32             compat_uint_t;
 typedef u32             compat_ulong_t;
 typedef u64             compat_u64;
+typedef u32             compat_uptr_t;
 
 struct compat_timespec {
         compat_time_t   tv_sec;
@@ -124,6 +125,73 @@ typedef u32		compat_old_sigset_t;	/* at least 32 bits */
 
 typedef u32             compat_sigset_word;
 
+typedef union compat_sigval {
+        compat_int_t    sival_int;
+        compat_uptr_t   sival_ptr;
+} compat_sigval_t;
+
+#define SI_PAD_SIZE32   (128/sizeof(int) - 3)
+
+typedef struct compat_siginfo {
+        int si_signo;
+        int si_code;
+        int si_errno;
+
+        union {
+                int _pad[SI_PAD_SIZE32];
+
+                /* kill() */
+                struct {
+                        compat_pid_t _pid;      /* sender's pid */
+                        __compat_uid_t _uid;    /* sender's uid */
+                } _kill;
+
+                /* SIGCHLD */
+                struct {
+                        compat_pid_t _pid;      /* which child */
+                        __compat_uid_t _uid;    /* sender's uid */
+                        int _status;            /* exit code */
+                        compat_clock_t _utime;
+                        compat_clock_t _stime;
+                } _sigchld;
+
+                /* IRIX SIGCHLD */
+                struct {
+                        compat_pid_t _pid;      /* which child */
+                        compat_clock_t _utime;
+                        int _status;            /* exit code */
+                        compat_clock_t _stime;
+                } _irix_sigchld;
+
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+                struct {
+                        s32 _addr; /* faulting insn/memory ref. */
+                } _sigfault;
+
+                /* SIGPOLL, SIGXFSZ (To do ...)  */
+                struct {
+                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
+                        int _fd;
+                } _sigpoll;
+
+                /* POSIX.1b timers */
+                struct {
+                        timer_t _tid;           /* timer id */
+                        int _overrun;           /* overrun count */
+                        compat_sigval_t _sigval;/* same as below */
+                        int _sys_private;       /* not to be passed to user */
+                } _timer;
+
+                /* POSIX.1b signals */
+                struct {
+                        compat_pid_t _pid;      /* sender's pid */
+                        __compat_uid_t _uid;    /* sender's uid */
+                        compat_sigval_t _sigval;
+                } _rt;
+
+        } _sifields;
+} compat_siginfo_t;
+
 #define COMPAT_OFF_T_MAX        0x7fffffff
 #define COMPAT_LOFF_T_MAX       0x7fffffffffffffffL
 
@@ -133,7 +201,6 @@ typedef u32		compat_sigset_word;
  * as pointers because the syscall entry code will have
  * appropriately converted them already.
  */
-typedef u32             compat_uptr_t;
 
 static inline void __user *compat_ptr(compat_uptr_t uptr)
 {
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
index c5dfb2c87d44..4b0c347d7a82 100644
--- a/arch/mips/pci/pci-octeon.c
+++ b/arch/mips/pci/pci-octeon.c
@@ -58,7 +58,7 @@ union octeon_pci_address {
         } s;
 };
 
-int __initdata (*octeon_pcibios_map_irq)(const struct pci_dev *dev,
+int __initconst (*octeon_pcibios_map_irq)(const struct pci_dev *dev,
                                          u8 slot, u8 pin);
 enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID;
 
diff --git a/arch/mn10300/Makefile b/arch/mn10300/Makefile
index 33188b6e81e4..a3d0fef3b126 100644
--- a/arch/mn10300/Makefile
+++ b/arch/mn10300/Makefile
@@ -26,7 +26,7 @@ CHECKFLAGS	+=
 PROCESSOR       := unset
 UNIT            := unset
 
-KBUILD_CFLAGS   += -mam33 -mmem-funcs -DCPU=AM33
+KBUILD_CFLAGS   += -mam33 -DCPU=AM33 $(call cc-option,-mmem-funcs,)
 KBUILD_AFLAGS   += -mam33 -DCPU=AM33
 
 ifeq ($(CONFIG_MN10300_CURRENT_IN_E2),y)
diff --git a/arch/mn10300/include/asm/elf.h b/arch/mn10300/include/asm/elf.h
index 8157c9267f42..4ebd6b3a0a1e 100644
--- a/arch/mn10300/include/asm/elf.h
+++ b/arch/mn10300/include/asm/elf.h
@@ -151,7 +151,8 @@ do {						\
 #define ELF_PLATFORM  (NULL)
 
 #ifdef __KERNEL__
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 #endif
 
 #endif /* _ASM_ELF_H */
diff --git a/arch/openrisc/include/asm/elf.h b/arch/openrisc/include/asm/elf.h
index a8fe2c513070..225a7ff320ad 100644
--- a/arch/openrisc/include/asm/elf.h
+++ b/arch/openrisc/include/asm/elf.h
@@ -110,7 +110,8 @@ extern void dump_elf_thread(elf_greg_t *dest, struct pt_regs *pt);
 
 #define ELF_PLATFORM    (NULL)
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 
 #endif /* __KERNEL__ */
 #endif
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 3ff21b536f28..b87438bb3384 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -13,6 +13,7 @@ config PARISC
         select HAVE_PERF_EVENTS
         select GENERIC_ATOMIC64 if !64BIT
         select HAVE_GENERIC_HARDIRQS
+        select BROKEN_RODATA
         select GENERIC_IRQ_PROBE
         select GENERIC_PCI_IOMAP
         select IRQ_PER_CPU
diff --git a/arch/parisc/include/asm/compat.h b/arch/parisc/include/asm/compat.h
index 760f331d4fa3..db7a662691a8 100644
--- a/arch/parisc/include/asm/compat.h
+++ b/arch/parisc/include/asm/compat.h
@@ -36,6 +36,7 @@ typedef s64	compat_s64;
 typedef u32     compat_uint_t;
 typedef u32     compat_ulong_t;
 typedef u64     compat_u64;
+typedef u32     compat_uptr_t;
 
 struct compat_timespec {
         compat_time_t           tv_sec;
@@ -127,6 +128,63 @@ typedef u32		compat_old_sigset_t;	/* at least 32 bits */
 
 typedef u32             compat_sigset_word;
 
+typedef union compat_sigval {
+        compat_int_t    sival_int;
+        compat_uptr_t   sival_ptr;
+} compat_sigval_t;
+
+typedef struct compat_siginfo {
+        int si_signo;
+        int si_errno;
+        int si_code;
+
+        union {
+                int _pad[128/sizeof(int) - 3];
+
+                /* kill() */
+                struct {
+                        unsigned int _pid;      /* sender's pid */
+                        unsigned int _uid;      /* sender's uid */
+                } _kill;
+
+                /* POSIX.1b timers */
+                struct {
+                        compat_timer_t _tid;            /* timer id */
+                        int _overrun;           /* overrun count */
+                        char _pad[sizeof(unsigned int) - sizeof(int)];
+                        compat_sigval_t _sigval;        /* same as below */
+                        int _sys_private;       /* not to be passed to user */
+                } _timer;
+
+                /* POSIX.1b signals */
+                struct {
+                        unsigned int _pid;      /* sender's pid */
+                        unsigned int _uid;      /* sender's uid */
+                        compat_sigval_t _sigval;
+                } _rt;
+
+                /* SIGCHLD */
+                struct {
+                        unsigned int _pid;      /* which child */
+                        unsigned int _uid;      /* sender's uid */
+                        int _status;            /* exit code */
+                        compat_clock_t _utime;
+                        compat_clock_t _stime;
+                } _sigchld;
+
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+                struct {
+                        unsigned int _addr;     /* faulting insn/memory ref. */
+                } _sigfault;
+
+                /* SIGPOLL */
+                struct {
+                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
+                        int _fd;
+                } _sigpoll;
+        } _sifields;
+} compat_siginfo_t;
+
 #define COMPAT_OFF_T_MAX        0x7fffffff
 #define COMPAT_LOFF_T_MAX       0x7fffffffffffffffL
 
@@ -136,7 +194,6 @@ typedef u32		compat_sigset_word;
  * as pointers because the syscall entry code will have
  * appropriately converted them already.
  */
-typedef u32             compat_uptr_t;
 
 static inline void __user *compat_ptr(compat_uptr_t uptr)
 {
diff --git a/arch/parisc/kernel/signal32.h b/arch/parisc/kernel/signal32.h
index c7800846422c..08a88b5349a2 100644
--- a/arch/parisc/kernel/signal32.h
+++ b/arch/parisc/kernel/signal32.h
@@ -55,58 +55,6 @@ struct k_sigaction32 {
         struct compat_sigaction sa;
 };
 
-typedef struct compat_siginfo {
-        int si_signo;
-        int si_errno;
-        int si_code;
-
-        union {
-                int _pad[((128/sizeof(int)) - 3)];
-
-                /* kill() */
-                struct {
-                        unsigned int _pid;      /* sender's pid */
-                        unsigned int _uid;      /* sender's uid */
-                } _kill;
-
-                /* POSIX.1b timers */
-                struct {
-                        compat_timer_t _tid;            /* timer id */
-                        int _overrun;           /* overrun count */
-                        char _pad[sizeof(unsigned int) - sizeof(int)];
-                        compat_sigval_t _sigval;        /* same as below */
-                        int _sys_private;       /* not to be passed to user */
-                } _timer;
-
-                /* POSIX.1b signals */
-                struct {
-                        unsigned int _pid;      /* sender's pid */
-                        unsigned int _uid;      /* sender's uid */
-                        compat_sigval_t _sigval;
-                } _rt;
-
-                /* SIGCHLD */
-                struct {
-                        unsigned int _pid;      /* which child */
-                        unsigned int _uid;      /* sender's uid */
-                        int _status;            /* exit code */
-                        compat_clock_t _utime;
-                        compat_clock_t _stime;
-                } _sigchld;
-
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        unsigned int _addr;     /* faulting insn/memory ref. */
-                } _sigfault;
-
-                /* SIGPOLL */
-                struct {
-                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-        } _sifields;
-} compat_siginfo_t;
-
 int copy_siginfo_to_user32 (compat_siginfo_t __user *to, siginfo_t *from);
 int copy_siginfo_from_user32 (siginfo_t *to, compat_siginfo_t __user *from);
 
diff --git a/arch/powerpc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h
index efdc92618b38..dc2cf9c6d9e6 100644
--- a/arch/powerpc/include/asm/bitops.h
+++ b/arch/powerpc/include/asm/bitops.h
@@ -288,6 +288,16 @@ static __inline__ int test_bit_le(unsigned long nr,
         return (tmp[nr >> 3] >> (nr & 7)) & 1;
 }
 
+static inline void set_bit_le(int nr, void *addr)
+{
+        set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline void clear_bit_le(int nr, void *addr)
+{
+        clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
 static inline void __set_bit_le(int nr, void *addr)
 {
         __set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h
index 88e602f6430d..84fdf6857c31 100644
--- a/arch/powerpc/include/asm/compat.h
+++ b/arch/powerpc/include/asm/compat.h
@@ -38,6 +38,7 @@ typedef s64		compat_s64;
 typedef u32             compat_uint_t;
 typedef u32             compat_ulong_t;
 typedef u64             compat_u64;
+typedef u32             compat_uptr_t;
 
 struct compat_timespec {
         compat_time_t   tv_sec;
@@ -114,6 +115,64 @@ typedef u32		compat_old_sigset_t;
 
 typedef u32             compat_sigset_word;
 
+typedef union compat_sigval {
+        compat_int_t    sival_int;
+        compat_uptr_t   sival_ptr;
+} compat_sigval_t;
+
+#define SI_PAD_SIZE32   (128/sizeof(int) - 3)
+
+typedef struct compat_siginfo {
+        int si_signo;
+        int si_errno;
+        int si_code;
+
+        union {
+                int _pad[SI_PAD_SIZE32];
+
+                /* kill() */
+                struct {
+                        compat_pid_t _pid;              /* sender's pid */
+                        __compat_uid_t _uid;            /* sender's uid */
+                } _kill;
+
+                /* POSIX.1b timers */
+                struct {
+                        compat_timer_t _tid;            /* timer id */
+                        int _overrun;                   /* overrun count */
+                        compat_sigval_t _sigval;        /* same as below */
+                        int _sys_private;       /* not to be passed to user */
+                } _timer;
+
+                /* POSIX.1b signals */
+                struct {
+                        compat_pid_t _pid;              /* sender's pid */
+                        __compat_uid_t _uid;            /* sender's uid */
+                        compat_sigval_t _sigval;
+                } _rt;
+
+                /* SIGCHLD */
+                struct {
+                        compat_pid_t _pid;              /* which child */
+                        __compat_uid_t _uid;            /* sender's uid */
+                        int _status;                    /* exit code */
+                        compat_clock_t _utime;
+                        compat_clock_t _stime;
+                } _sigchld;
+
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGEMT */
+                struct {
+                        unsigned int _addr; /* faulting insn/memory ref. */
+                } _sigfault;
+
+                /* SIGPOLL */
+                struct {
+                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
+                        int _fd;
+                } _sigpoll;
+        } _sifields;
+} compat_siginfo_t;
+
 #define COMPAT_OFF_T_MAX        0x7fffffff
 #define COMPAT_LOFF_T_MAX       0x7fffffffffffffffL
 
@@ -123,7 +182,6 @@ typedef u32		compat_sigset_word;
  * as pointers because the syscall entry code will have
  * appropriately converted them already.
  */
-typedef u32             compat_uptr_t;
 
 static inline void __user *compat_ptr(compat_uptr_t uptr)
 {
diff --git a/arch/powerpc/include/asm/siginfo.h b/arch/powerpc/include/asm/siginfo.h
index 49495b0534ed..ccce3ef5cd86 100644
--- a/arch/powerpc/include/asm/siginfo.h
+++ b/arch/powerpc/include/asm/siginfo.h
@@ -10,7 +10,6 @@
 
 #ifdef __powerpc64__
 #    define __ARCH_SI_PREAMBLE_SIZE     (4 * sizeof(int))
-#    define SI_PAD_SIZE32               ((SI_MAX_SIZE/sizeof(int)) - 3)
 #endif
 
 #include <asm-generic/siginfo.h>
diff --git a/arch/powerpc/kernel/ppc32.h b/arch/powerpc/kernel/ppc32.h
index dc16aefe1dd0..02fb0ee26093 100644
--- a/arch/powerpc/kernel/ppc32.h
+++ b/arch/powerpc/kernel/ppc32.h
@@ -16,57 +16,6 @@
 
 /* These are here to support 32-bit syscalls on a 64-bit kernel. */
 
-typedef struct compat_siginfo {
-        int si_signo;
-        int si_errno;
-        int si_code;
-
-        union {
-                int _pad[SI_PAD_SIZE32];
-
-                /* kill() */
-                struct {
-                        compat_pid_t _pid;              /* sender's pid */
-                        compat_uid_t _uid;              /* sender's uid */
-                } _kill;
-
-                /* POSIX.1b timers */
-                struct {
-                        compat_timer_t _tid;                    /* timer id */
-                        int _overrun;                   /* overrun count */
-                        compat_sigval_t _sigval;                /* same as below */
-                        int _sys_private;               /* not to be passed to user */
-                } _timer;
-
-                /* POSIX.1b signals */
-                struct {
-                        compat_pid_t _pid;              /* sender's pid */
-                        compat_uid_t _uid;              /* sender's uid */
-                        compat_sigval_t _sigval;
-                } _rt;
-
-                /* SIGCHLD */
-                struct {
-                        compat_pid_t _pid;              /* which child */
-                        compat_uid_t _uid;              /* sender's uid */
-                        int _status;                    /* exit code */
-                        compat_clock_t _utime;
-                        compat_clock_t _stime;
-                } _sigchld;
-
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGEMT */
-                struct {
-                        unsigned int _addr; /* faulting insn/memory ref. */
-                } _sigfault;
-
-                /* SIGPOLL */
-                struct {
-                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-        } _sifields;
-} compat_siginfo_t;
-
 #define __old_sigaction32       old_sigaction32
 
 struct __old_sigaction32 {
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
index 97612068fae3..969dddcf3320 100644
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -50,7 +50,7 @@ machine_device_initcall(ppc40x_simple, ppc40x_device_probe);
  * Again, if your board needs to do things differently then create a
  * board.c file for it rather than adding it to this list.
  */
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
         "amcc,acadia",
         "amcc,haleakala",
         "amcc,kilauea",
diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc5121_generic.c
index 926731f1ff01..ca1ca6669990 100644
--- a/arch/powerpc/platforms/512x/mpc5121_generic.c
+++ b/arch/powerpc/platforms/512x/mpc5121_generic.c
@@ -26,7 +26,7 @@
 /*
  * list of supported boards
  */
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
         "prt,prtlvt",
         NULL
 };
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 01ffa64d2aa7..448d862bcf3d 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -172,7 +172,7 @@ static void __init lite5200_setup_arch(void)
         mpc52xx_setup_pci();
 }
 
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
         "fsl,lite5200",
         "fsl,lite5200b",
         NULL,
diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index 17d91b7da315..070d315dd6cd 100644
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -232,7 +232,7 @@ static void __init media5200_setup_arch(void)
 }
 
 /* list of the supported boards */
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
         "fsl,media5200",
         NULL
 };
diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
index 16c9c9cbbb7f..eca1f0960fff 100644
--- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
@@ -60,7 +60,7 @@ static void __init mpc837x_rdb_setup_arch(void)
 
 machine_device_initcall(mpc837x_rdb, mpc83xx_declare_of_platform_devices);
 
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
         "fsl,mpc8377rdb",
         "fsl,mpc8378rdb",
         "fsl,mpc8379rdb",
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index 3e70a2035e53..b62fa87521a3 100644
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -125,7 +125,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1520,
 
 machine_device_initcall(tqm85xx, mpc85xx_common_publish_devices);
 
-static const char *board[] __initdata = {
+static const char * const board[] __initconst = {
         "tqc,tqm8540",
         "tqc,tqm8541",
         "tqc,tqm8548",
diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
index 234f1d859cea..a34a9d612fc0 100644
--- a/arch/s390/include/asm/compat.h
+++ b/arch/s390/include/asm/compat.h
@@ -65,6 +65,7 @@ typedef s64		compat_s64;
 typedef u32             compat_uint_t;
 typedef u32             compat_ulong_t;
 typedef u64             compat_u64;
+typedef u32             compat_uptr_t;
 
 struct compat_timespec {
         compat_time_t   tv_sec;
@@ -144,6 +145,79 @@ typedef u32		compat_old_sigset_t;	/* at least 32 bits */
 
 typedef u32             compat_sigset_word;
 
+typedef union compat_sigval {
+        compat_int_t    sival_int;
+        compat_uptr_t   sival_ptr;
+} compat_sigval_t;
+
+typedef struct compat_siginfo {
+        int     si_signo;
+        int     si_errno;
+        int     si_code;
+
+        union {
+                int _pad[128/sizeof(int) - 3];
+
+                /* kill() */
+                struct {
+                        pid_t   _pid;   /* sender's pid */
+                        uid_t   _uid;   /* sender's uid */
+                } _kill;
+
+                /* POSIX.1b timers */
+                struct {
+                        compat_timer_t _tid;            /* timer id */
+                        int _overrun;                   /* overrun count */
+                        compat_sigval_t _sigval;        /* same as below */
+                        int _sys_private;       /* not to be passed to user */
+                } _timer;
+
+                /* POSIX.1b signals */
+                struct {
+                        pid_t                   _pid;   /* sender's pid */
+                        uid_t                   _uid;   /* sender's uid */
+                        compat_sigval_t         _sigval;
+                } _rt;
+
+                /* SIGCHLD */
+                struct {
+                        pid_t                   _pid;   /* which child */
+                        uid_t                   _uid;   /* sender's uid */
+                        int                     _status;/* exit code */
+                        compat_clock_t          _utime;
+                        compat_clock_t          _stime;
+                } _sigchld;
+
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+                struct {
+                        __u32   _addr;  /* faulting insn/memory ref. - pointer */
+                } _sigfault;
+
+                /* SIGPOLL */
+                struct {
+                        int     _band;  /* POLL_IN, POLL_OUT, POLL_MSG */
+                        int     _fd;
+                } _sigpoll;
+        } _sifields;
+} compat_siginfo_t;
+
+/*
+ * How these fields are to be accessed.
+ */
+#define si_pid          _sifields._kill._pid
+#define si_uid          _sifields._kill._uid
+#define si_status       _sifields._sigchld._status
+#define si_utime        _sifields._sigchld._utime
+#define si_stime        _sifields._sigchld._stime
+#define si_value        _sifields._rt._sigval
+#define si_int          _sifields._rt._sigval.sival_int
+#define si_ptr          _sifields._rt._sigval.sival_ptr
+#define si_addr         _sifields._sigfault._addr
+#define si_band         _sifields._sigpoll._band
+#define si_fd           _sifields._sigpoll._fd
+#define si_tid          _sifields._timer._tid
+#define si_overrun      _sifields._timer._overrun
+
 #define COMPAT_OFF_T_MAX        0x7fffffff
 #define COMPAT_LOFF_T_MAX       0x7fffffffffffffffL
 
@@ -153,7 +227,6 @@ typedef u32		compat_sigset_word;
  * as pointers because the syscall entry code will have
  * appropriately converted them already.
  */
-typedef u32             compat_uptr_t;
 
 static inline void __user *compat_ptr(compat_uptr_t uptr)
 {
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h
index 9635d759c2b9..90887bd98cf0 100644
--- a/arch/s390/kernel/compat_linux.h
+++ b/arch/s390/kernel/compat_linux.h
@@ -23,74 +23,6 @@ struct old_sigaction32 {
        __u32                    sa_flags;
        __u32                    sa_restorer;    /* Another 32 bit pointer */
 };
- 
-typedef struct compat_siginfo {
-        int     si_signo;
-        int     si_errno;
-        int     si_code;
-
-        union {
-                int _pad[((128/sizeof(int)) - 3)];
-
-                /* kill() */
-                struct {
-                        pid_t   _pid;   /* sender's pid */
-                        uid_t   _uid;   /* sender's uid */
-                } _kill;
-
-                /* POSIX.1b timers */
-                struct {
-                        compat_timer_t _tid;            /* timer id */
-                        int _overrun;           /* overrun count */
-                        compat_sigval_t _sigval;        /* same as below */
-                        int _sys_private;       /* not to be passed to user */
-                } _timer;
-
-                /* POSIX.1b signals */
-                struct {
-                        pid_t                   _pid;   /* sender's pid */
-                        uid_t                   _uid;   /* sender's uid */
-                        compat_sigval_t         _sigval;
-                } _rt;
-
-                /* SIGCHLD */
-                struct {
-                        pid_t                   _pid;   /* which child */
-                        uid_t                   _uid;   /* sender's uid */
-                        int                     _status;/* exit code */
-                        compat_clock_t          _utime;
-                        compat_clock_t          _stime;
-                } _sigchld;
-
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        __u32   _addr;  /* faulting insn/memory ref. - pointer */
-                } _sigfault;
-                          
-                /* SIGPOLL */
-                struct {
-                        int     _band;  /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int     _fd;
-                } _sigpoll;
-        } _sifields;
-} compat_siginfo_t;
-
-/*
- * How these fields are to be accessed.
- */
-#define si_pid          _sifields._kill._pid
-#define si_uid          _sifields._kill._uid
-#define si_status       _sifields._sigchld._status
-#define si_utime        _sifields._sigchld._utime
-#define si_stime        _sifields._sigchld._stime
-#define si_value        _sifields._rt._sigval
-#define si_int          _sifields._rt._sigval.sival_int
-#define si_ptr          _sifields._rt._sigval.sival_ptr
-#define si_addr         _sifields._sigfault._addr
-#define si_band         _sifields._sigpoll._band
-#define si_fd           _sifields._sigpoll._fd    
-#define si_tid          _sifields._timer._tid
-#define si_overrun      _sifields._timer._overrun
 
 /* asm/sigcontext.h */
 typedef union
diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index ba0f412920be..461c23747491 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -5,6 +5,7 @@ config SCORE
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
        select GENERIC_IOMAP
+       select GENERIC_ATOMIC64
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select ARCH_DISCARD_MEMBLOCK
diff --git a/arch/score/include/asm/elf.h b/arch/score/include/asm/elf.h
index f478ce94181f..5d566c7a0af2 100644
--- a/arch/score/include/asm/elf.h
+++ b/arch/score/include/asm/elf.h
@@ -54,7 +54,7 @@ typedef elf_fpreg_t	elf_fpregset_t;
 
 #define SET_PERSONALITY(ex)                                     \
 do {                                                            \
-        set_personality(PER_LINUX);                             \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK))); \
 } while (0)
 
 struct task_struct;
diff --git a/arch/score/kernel/sys_score.c b/arch/score/kernel/sys_score.c
index e478bf9a7e91..21e867974066 100644
--- a/arch/score/kernel/sys_score.c
+++ b/arch/score/kernel/sys_score.c
@@ -112,6 +112,7 @@ score_execve(struct pt_regs *regs)
  * Do a system call from kernel instead of calling sys_execve so we
  * end up with proper pt_regs.
  */
+asmlinkage
 int kernel_execve(const char *filename,
                   const char *const argv[],
                   const char *const envp[])
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h
index f38112be67d2..37924afa8d8a 100644
--- a/arch/sh/include/asm/elf.h
+++ b/arch/sh/include/asm/elf.h
@@ -183,7 +183,8 @@ do {									\
 } while (0)
 #endif
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX_32BIT | (current->personality & (~PER_MASK)))
 
 #ifdef CONFIG_VSYSCALL
 /* vDSO has arch_setup_additional_pages */
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 0cf60a628814..73a23f4617a3 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -134,7 +134,7 @@ __BUILD_MEMORY_STRING(__raw_, q, u64)
  * load/store instructions. sh_io_port_base is the virtual address to
  * which all ports are being mapped.
  */
-extern const unsigned long sh_io_port_base;
+extern unsigned long sh_io_port_base;
 
 static inline void __set_io_port_base(unsigned long pbase)
 {
diff --git a/arch/sh/kernel/ioport.c b/arch/sh/kernel/ioport.c
index e3ad6103e7c1..cca14ba84a37 100644
--- a/arch/sh/kernel/ioport.c
+++ b/arch/sh/kernel/ioport.c
@@ -11,7 +11,7 @@
 #include <linux/module.h>
 #include <linux/io.h>
 
-const unsigned long sh_io_port_base __read_mostly = -1;
+unsigned long sh_io_port_base __read_mostly = -1;
 EXPORT_SYMBOL(sh_io_port_base);
 
 void __iomem *__ioport_map(unsigned long addr, unsigned int size)
diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h
index b8be20d42a0a..cef99fbc0a21 100644
--- a/arch/sparc/include/asm/compat.h
+++ b/arch/sparc/include/asm/compat.h
@@ -36,6 +36,7 @@ typedef s64		compat_s64;
 typedef u32             compat_uint_t;
 typedef u32             compat_ulong_t;
 typedef u64             compat_u64;
+typedef u32             compat_uptr_t;
 
 struct compat_timespec {
         compat_time_t   tv_sec;
@@ -147,6 +148,65 @@ typedef u32		compat_old_sigset_t;
 
 typedef u32             compat_sigset_word;
 
+typedef union compat_sigval {
+        compat_int_t    sival_int;
+        compat_uptr_t   sival_ptr;
+} compat_sigval_t;
+
+#define SI_PAD_SIZE32   (128/sizeof(int) - 3)
+
+typedef struct compat_siginfo {
+        int si_signo;
+        int si_errno;
+        int si_code;
+
+        union {
+                int _pad[SI_PAD_SIZE32];
+
+                /* kill() */
+                struct {
+                        compat_pid_t _pid;              /* sender's pid */
+                        unsigned int _uid;              /* sender's uid */
+                } _kill;
+
+                /* POSIX.1b timers */
+                struct {
+                        compat_timer_t _tid;            /* timer id */
+                        int _overrun;                   /* overrun count */
+                        compat_sigval_t _sigval;        /* same as below */
+                        int _sys_private;       /* not to be passed to user */
+                } _timer;
+
+                /* POSIX.1b signals */
+                struct {
+                        compat_pid_t _pid;              /* sender's pid */
+                        unsigned int _uid;              /* sender's uid */
+                        compat_sigval_t _sigval;
+                } _rt;
+
+                /* SIGCHLD */
+                struct {
+                        compat_pid_t _pid;              /* which child */
+                        unsigned int _uid;              /* sender's uid */
+                        int _status;                    /* exit code */
+                        compat_clock_t _utime;
+                        compat_clock_t _stime;
+                } _sigchld;
+
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGEMT */
+                struct {
+                        u32 _addr; /* faulting insn/memory ref. */
+                        int _trapno;
+                } _sigfault;
+
+                /* SIGPOLL */
+                struct {
+                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
+                        int _fd;
+                } _sigpoll;
+        } _sifields;
+} compat_siginfo_t;
+
 #define COMPAT_OFF_T_MAX        0x7fffffff
 #define COMPAT_LOFF_T_MAX       0x7fffffffffffffffL
 
@@ -156,7 +216,6 @@ typedef u32		compat_sigset_word;
  * as pointers because the syscall entry code will have
  * appropriately converted them already.
  */
-typedef u32             compat_uptr_t;
 
 static inline void __user *compat_ptr(compat_uptr_t uptr)
 {
diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
index 2d4d755cba9e..ac74a2c98e6d 100644
--- a/arch/sparc/include/asm/elf_32.h
+++ b/arch/sparc/include/asm/elf_32.h
@@ -128,6 +128,7 @@ typedef struct {
 
 #define ELF_PLATFORM    (NULL)
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 
 #endif /* !(__ASMSPARC_ELF_H) */
diff --git a/arch/sparc/include/asm/siginfo.h b/arch/sparc/include/asm/siginfo.h
index 215900fce21b..dbc182c438b4 100644
--- a/arch/sparc/include/asm/siginfo.h
+++ b/arch/sparc/include/asm/siginfo.h
@@ -3,7 +3,6 @@
 
 #if defined(__sparc__) && defined(__arch64__)
 
-#define SI_PAD_SIZE32   ((SI_MAX_SIZE/sizeof(int)) - 3)
 #define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
 #define __ARCH_SI_BAND_T int
 
diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c
index a53e0a5fd3a3..53e48f721ce3 100644
--- a/arch/sparc/kernel/signal32.c
+++ b/arch/sparc/kernel/signal32.c
@@ -54,58 +54,6 @@ struct signal_frame32 {
         /* __siginfo_rwin_t * */u32 rwin_save;
 } __attribute__((aligned(8)));
 
-typedef struct compat_siginfo{
-        int si_signo;
-        int si_errno;
-        int si_code;
-
-        union {
-                int _pad[SI_PAD_SIZE32];
-
-                /* kill() */
-                struct {
-                        compat_pid_t _pid;              /* sender's pid */
-                        unsigned int _uid;              /* sender's uid */
-                } _kill;
-
-                /* POSIX.1b timers */
-                struct {
-                        compat_timer_t _tid;                    /* timer id */
-                        int _overrun;                   /* overrun count */
-                        compat_sigval_t _sigval;                /* same as below */
-                        int _sys_private;               /* not to be passed to user */
-                } _timer;
-
-                /* POSIX.1b signals */
-                struct {
-                        compat_pid_t _pid;              /* sender's pid */
-                        unsigned int _uid;              /* sender's uid */
-                        compat_sigval_t _sigval;
-                } _rt;
-
-                /* SIGCHLD */
-                struct {
-                        compat_pid_t _pid;              /* which child */
-                        unsigned int _uid;              /* sender's uid */
-                        int _status;                    /* exit code */
-                        compat_clock_t _utime;
-                        compat_clock_t _stime;
-                } _sigchld;
-
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGEMT */
-                struct {
-                        u32 _addr; /* faulting insn/memory ref. */
-                        int _trapno;
-                } _sigfault;
-
-                /* SIGPOLL */
-                struct {
-                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-        } _sifields;
-}compat_siginfo_t;
-
 struct rt_signal_frame32 {
         struct sparc_stackf32   ss;
         compat_siginfo_t        info;
diff --git a/arch/tile/include/asm/compat.h b/arch/tile/include/asm/compat.h
index 6e74450ff0a1..3063e6fc8daa 100644
--- a/arch/tile/include/asm/compat.h
+++ b/arch/tile/include/asm/compat.h
@@ -110,6 +110,68 @@ struct compat_flock64 {
 
 typedef u32               compat_sigset_word;
 
+typedef union compat_sigval {
+        compat_int_t    sival_int;
+        compat_uptr_t   sival_ptr;
+} compat_sigval_t;
+
+#define COMPAT_SI_PAD_SIZE      (128/sizeof(int) - 3)
+
+typedef struct compat_siginfo {
+        int si_signo;
+        int si_errno;
+        int si_code;
+
+        union {
+                int _pad[COMPAT_SI_PAD_SIZE];
+
+                /* kill() */
+                struct {
+                        unsigned int _pid;      /* sender's pid */
+                        unsigned int _uid;      /* sender's uid */
+                } _kill;
+
+                /* POSIX.1b timers */
+                struct {
+                        compat_timer_t _tid;    /* timer id */
+                        int _overrun;           /* overrun count */
+                        compat_sigval_t _sigval;        /* same as below */
+                        int _sys_private;       /* not to be passed to user */
+                        int _overrun_incr;      /* amount to add to overrun */
+                } _timer;
+
+                /* POSIX.1b signals */
+                struct {
+                        unsigned int _pid;      /* sender's pid */
+                        unsigned int _uid;      /* sender's uid */
+                        compat_sigval_t _sigval;
+                } _rt;
+
+                /* SIGCHLD */
+                struct {
+                        unsigned int _pid;      /* which child */
+                        unsigned int _uid;      /* sender's uid */
+                        int _status;            /* exit code */
+                        compat_clock_t _utime;
+                        compat_clock_t _stime;
+                } _sigchld;
+
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+                struct {
+                        unsigned int _addr;     /* faulting insn/memory ref. */
+#ifdef __ARCH_SI_TRAPNO
+                        int _trapno;    /* TRAP # which caused the signal */
+#endif
+                } _sigfault;
+
+                /* SIGPOLL */
+                struct {
+                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
+                        int _fd;
+                } _sigpoll;
+        } _sifields;
+} compat_siginfo_t;
+
 #define COMPAT_OFF_T_MAX        0x7fffffff
 #define COMPAT_LOFF_T_MAX       0x7fffffffffffffffL
 
diff --git a/arch/tile/include/asm/elf.h b/arch/tile/include/asm/elf.h
index d16d006d660e..f8ccf08f6934 100644
--- a/arch/tile/include/asm/elf.h
+++ b/arch/tile/include/asm/elf.h
@@ -156,12 +156,12 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
 #undef SET_PERSONALITY
 #define SET_PERSONALITY(ex) \
 do { \
-        current->personality = PER_LINUX; \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK))); \
         current_thread_info()->status &= ~TS_COMPAT; \
 } while (0)
 #define COMPAT_SET_PERSONALITY(ex) \
 do { \
-        current->personality = PER_LINUX_32BIT; \
+        set_personality(PER_LINUX | (current->personality & (~PER_MASK))); \
         current_thread_info()->status |= TS_COMPAT; \
 } while (0)
 
diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c
index 474571b84085..7bc0859a9f5e 100644
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
@@ -55,63 +55,6 @@ struct compat_ucontext {
         sigset_t          uc_sigmask;   /* mask last for extensibility */
 };
 
-#define COMPAT_SI_PAD_SIZE      ((SI_MAX_SIZE - 3 * sizeof(int)) / sizeof(int))
-
-struct compat_siginfo {
-        int si_signo;
-        int si_errno;
-        int si_code;
-
-        union {
-                int _pad[COMPAT_SI_PAD_SIZE];
-
-                /* kill() */
-                struct {
-                        unsigned int _pid;      /* sender's pid */
-                        unsigned int _uid;      /* sender's uid */
-                } _kill;
-
-                /* POSIX.1b timers */
-                struct {
-                        compat_timer_t _tid;    /* timer id */
-                        int _overrun;           /* overrun count */
-                        compat_sigval_t _sigval;        /* same as below */
-                        int _sys_private;       /* not to be passed to user */
-                        int _overrun_incr;      /* amount to add to overrun */
-                } _timer;
-
-                /* POSIX.1b signals */
-                struct {
-                        unsigned int _pid;      /* sender's pid */
-                        unsigned int _uid;      /* sender's uid */
-                        compat_sigval_t _sigval;
-                } _rt;
-
-                /* SIGCHLD */
-                struct {
-                        unsigned int _pid;      /* which child */
-                        unsigned int _uid;      /* sender's uid */
-                        int _status;            /* exit code */
-                        compat_clock_t _utime;
-                        compat_clock_t _stime;
-                } _sigchld;
-
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        unsigned int _addr;     /* faulting insn/memory ref. */
-#ifdef __ARCH_SI_TRAPNO
-                        int _trapno;    /* TRAP # which caused the signal */
-#endif
-                } _sigfault;
-
-                /* SIGPOLL */
-                struct {
-                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-        } _sifields;
-};
-
 struct compat_rt_sigframe {
         unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; /* caller save area */
         struct compat_siginfo info;
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index b0a47433341e..1e638e75a6b7 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -6,6 +6,7 @@ config UNICORE32
         select HAVE_DMA_ATTRS
         select HAVE_KERNEL_GZIP
         select HAVE_KERNEL_BZIP2
+        select GENERIC_ATOMIC64
         select HAVE_KERNEL_LZO
         select HAVE_KERNEL_LZMA
         select ARCH_HAVE_CUSTOM_GPIO_H
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index f34261296ffb..338803422239 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -409,7 +409,7 @@ extern struct apic *apic;
  * to enforce the order with in them.
  */
 #define apic_driver(sym)                                        \
-        static struct apic *__apicdrivers_##sym __used          \
+        static const struct apic *__apicdrivers_##sym __used            \
         __aligned(sizeof(struct apic *))                        \
         __section(.apicdrivers) = { &sym }
 
diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
index fedf32b73e65..59c6c401f79f 100644
--- a/arch/x86/include/asm/compat.h
+++ b/arch/x86/include/asm/compat.h
@@ -41,6 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
 typedef u32             compat_uint_t;
 typedef u32             compat_ulong_t;
 typedef u64 __attribute__((aligned(4))) compat_u64;
+typedef u32             compat_uptr_t;
 
 struct compat_timespec {
         compat_time_t   tv_sec;
@@ -124,6 +125,78 @@ typedef u32		compat_old_sigset_t;	/* at least 32 bits */
 
 typedef u32               compat_sigset_word;
 
+typedef union compat_sigval {
+        compat_int_t    sival_int;
+        compat_uptr_t   sival_ptr;
+} compat_sigval_t;
+
+typedef struct compat_siginfo {
+        int si_signo;
+        int si_errno;
+        int si_code;
+
+        union {
+                int _pad[128/sizeof(int) - 3];
+
+                /* kill() */
+                struct {
+                        unsigned int _pid;      /* sender's pid */
+                        unsigned int _uid;      /* sender's uid */
+                } _kill;
+
+                /* POSIX.1b timers */
+                struct {
+                        compat_timer_t _tid;    /* timer id */
+                        int _overrun;           /* overrun count */
+                        compat_sigval_t _sigval;        /* same as below */
+                        int _sys_private;       /* not to be passed to user */
+                        int _overrun_incr;      /* amount to add to overrun */
+                } _timer;
+
+                /* POSIX.1b signals */
+                struct {
+                        unsigned int _pid;      /* sender's pid */
+                        unsigned int _uid;      /* sender's uid */
+                        compat_sigval_t _sigval;
+                } _rt;
+
+                /* SIGCHLD */
+                struct {
+                        unsigned int _pid;      /* which child */
+                        unsigned int _uid;      /* sender's uid */
+                        int _status;            /* exit code */
+                        compat_clock_t _utime;
+                        compat_clock_t _stime;
+                } _sigchld;
+
+                /* SIGCHLD (x32 version) */
+                struct {
+                        unsigned int _pid;      /* which child */
+                        unsigned int _uid;      /* sender's uid */
+                        int _status;            /* exit code */
+                        compat_s64 _utime;
+                        compat_s64 _stime;
+                } _sigchld_x32;
+
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+                struct {
+                        unsigned int _addr;     /* faulting insn/memory ref. */
+                } _sigfault;
+
+                /* SIGPOLL */
+                struct {
+                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
+                        int _fd;
+                } _sigpoll;
+
+                struct {
+                        unsigned int _call_addr; /* calling insn */
+                        int _syscall;   /* triggering system call number */
+                        unsigned int _arch;     /* AUDIT_ARCH_* of syscall */
+                } _sigsys;
+        } _sifields;
+} compat_siginfo_t;
+
 #define COMPAT_OFF_T_MAX        0x7fffffff
 #define COMPAT_LOFF_T_MAX       0x7fffffffffffffffL
 
@@ -209,7 +282,6 @@ typedef struct user_regs_struct32 compat_elf_gregset_t;
  * as pointers because the syscall entry code will have
  * appropriately converted them already.
  */
-typedef u32             compat_uptr_t;
 
 static inline void __user *compat_ptr(compat_uptr_t uptr)
 {
diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
index b04cbdb138cd..e6232773ce49 100644
--- a/arch/x86/include/asm/ia32.h
+++ b/arch/x86/include/asm/ia32.h
@@ -86,73 +86,6 @@ struct stat64 {
         unsigned long long      st_ino;
 } __attribute__((packed));
 
-typedef struct compat_siginfo {
-        int si_signo;
-        int si_errno;
-        int si_code;
-
-        union {
-                int _pad[((128 / sizeof(int)) - 3)];
-
-                /* kill() */
-                struct {
-                        unsigned int _pid;      /* sender's pid */
-                        unsigned int _uid;      /* sender's uid */
-                } _kill;
-
-                /* POSIX.1b timers */
-                struct {
-                        compat_timer_t _tid;    /* timer id */
-                        int _overrun;           /* overrun count */
-                        compat_sigval_t _sigval;        /* same as below */
-                        int _sys_private;       /* not to be passed to user */
-                        int _overrun_incr;      /* amount to add to overrun */
-                } _timer;
-
-                /* POSIX.1b signals */
-                struct {
-                        unsigned int _pid;      /* sender's pid */
-                        unsigned int _uid;      /* sender's uid */
-                        compat_sigval_t _sigval;
-                } _rt;
-
-                /* SIGCHLD */
-                struct {
-                        unsigned int _pid;      /* which child */
-                        unsigned int _uid;      /* sender's uid */
-                        int _status;            /* exit code */
-                        compat_clock_t _utime;
-                        compat_clock_t _stime;
-                } _sigchld;
-
-                /* SIGCHLD (x32 version) */
-                struct {
-                        unsigned int _pid;      /* which child */
-                        unsigned int _uid;      /* sender's uid */
-                        int _status;            /* exit code */
-                        compat_s64 _utime;
-                        compat_s64 _stime;
-                } _sigchld_x32;
-
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        unsigned int _addr;     /* faulting insn/memory ref. */
-                } _sigfault;
-
-                /* SIGPOLL */
-                struct {
-                        int _band;      /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-
-                struct {
-                        unsigned int _call_addr; /* calling insn */
-                        int _syscall;   /* triggering system call number */
-                        unsigned int _arch;     /* AUDIT_ARCH_* of syscall */
-                } _sigsys;
-        } _sifields;
-} compat_siginfo_t;
-
 #define IA32_STACK_TOP IA32_PAGE_OFFSET
 
 #ifdef __KERNEL__
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index bc552cff2578..a65829ac2b9a 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -30,7 +30,7 @@
 
 static int numachip_system __read_mostly;
 
-static struct apic apic_numachip __read_mostly;
+static const struct apic apic_numachip __read_mostly;
 
 static unsigned int get_apic_id(unsigned long x)
 {
@@ -199,7 +199,7 @@ static int numachip_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
         return 0;
 }
 
-static struct apic apic_numachip __refconst = {
+static const struct apic apic_numachip __refconst = {
 
         .name                           = "NumaConnect system",
         .probe                          = numachip_probe,
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index af6db6ec5b2a..4929c1be0ac0 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -225,7 +225,7 @@ static struct platform_device rtc_device = {
 static __init int add_rtc_cmos(void)
 {
 #ifdef CONFIG_PNP
-        static const char *ids[] __initconst =
+        static const char * const  const ids[] __initconst =
             { "PNP0b00", "PNP0b01", "PNP0b02", };
         struct pnp_dev *dev;
         struct pnp_id *id;
diff --git a/arch/xtensa/include/asm/elf.h b/arch/xtensa/include/asm/elf.h
index 6e65eadaae14..5293312bc6a4 100644
--- a/arch/xtensa/include/asm/elf.h
+++ b/arch/xtensa/include/asm/elf.h
@@ -189,7 +189,8 @@ typedef struct {
 #endif
 } elf_xtregs_t;
 
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)
+#define SET_PERSONALITY(ex) \
+        set_personality(PER_LINUX_32BIT | (current->personality & (~PER_MASK)))
 
 struct task_struct;
 
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 2059ee460b0c..81e44f7b0ab6 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1567,7 +1567,7 @@ tx_complete++;
 /*--------------------------------- entries ---------------------------------*/
 
 
-static const char *media_name[] __devinitdata = {
+static char * const media_name[] __devinitconst = {
     "MMF", "SMF", "MMF", "03?", /*  0- 3 */
     "UTP", "05?", "06?", "07?", /*  4- 7 */
     "TAXI","09?", "10?", "11?", /*  8-11 */
diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index db195abad698..d2ed7f18d1ac 100644
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
-#define VERSION "47"
+/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
+#define VERSION "50"
 #define AOE_MAJOR 152
 #define DEVICE_NAME "aoe"
 
@@ -10,9 +10,6 @@
 #define AOE_PARTITIONS (16)
 #endif
 
-#define SYSMINOR(aoemajor, aoeminor) ((aoemajor) * NPERSHELF + (aoeminor))
-#define AOEMAJOR(sysminor) ((sysminor) / NPERSHELF)
-#define AOEMINOR(sysminor) ((sysminor) % NPERSHELF)
 #define WHITESPACE " \t\v\f\n"
 
 enum {
@@ -75,72 +72,67 @@ enum {
         DEVFL_UP = 1,   /* device is installed in system and ready for AoE->ATA commands */
         DEVFL_TKILL = (1<<1),   /* flag for timer to know when to kill self */
         DEVFL_EXT = (1<<2),     /* device accepts lba48 commands */
-        DEVFL_CLOSEWAIT = (1<<3), /* device is waiting for all closes to revalidate */
-        DEVFL_GDALLOC = (1<<4), /* need to alloc gendisk */
-        DEVFL_KICKME = (1<<5),  /* slow polling network card catch */
-        DEVFL_NEWSIZE = (1<<6), /* need to update dev size in block layer */
-
-        BUFFL_FAIL = 1,
+        DEVFL_GDALLOC = (1<<3), /* need to alloc gendisk */
+        DEVFL_KICKME = (1<<4),  /* slow polling network card catch */
+        DEVFL_NEWSIZE = (1<<5), /* need to update dev size in block layer */
 };
 
 enum {
         DEFAULTBCNT = 2 * 512,  /* 2 sectors */
-        NPERSHELF = 16,         /* number of slots per shelf address */
-        FREETAG = -1,
         MIN_BUFS = 16,
         NTARGETS = 8,
         NAOEIFS = 8,
-        NSKBPOOLMAX = 128,
+        NSKBPOOLMAX = 256,
+        NFACTIVE = 61,
 
         TIMERTICK = HZ / 10,
         MINTIMER = HZ >> 2,
         MAXTIMER = HZ << 1,
-        HELPWAIT = 20,
 };
 
 struct buf {
-        struct list_head bufs;
-        ulong stime;    /* for disk stats */
-        ulong flags;
         ulong nframesout;
         ulong resid;
         ulong bv_resid;
-        ulong bv_off;
         sector_t sector;
         struct bio *bio;
         struct bio_vec *bv;
+        struct request *rq;
 };
 
 struct frame {
-        int tag;
+        struct list_head head;
+        u32 tag;
         ulong waited;
+        struct aoetgt *t;               /* parent target I belong to */
+        sector_t lba;
+        struct sk_buff *skb;            /* command skb freed on module exit */
+        struct sk_buff *r_skb;          /* response skb for async processing */
         struct buf *buf;
-        char *bufaddr;
+        struct bio_vec *bv;
         ulong bcnt;
-        sector_t lba;
-        struct sk_buff *skb;
+        ulong bv_off;
 };
 
 struct aoeif {
         struct net_device *nd;
-        unsigned char lost;
-        unsigned char lostjumbo;
-        ushort maxbcnt;
+        ulong lost;
+        int bcnt;
 };
 
 struct aoetgt {
         unsigned char addr[6];
         ushort nframes;
-        struct frame *frames;
+        struct aoedev *d;                       /* parent device I belong to */
+        struct list_head ffree;                 /* list of free frames */
         struct aoeif ifs[NAOEIFS];
         struct aoeif *ifp;      /* current aoeif in use */
         ushort nout;
         ushort maxout;
-        u16 lasttag;            /* last tag sent */
-        u16 useme;
+        ulong falloc;
         ulong lastwadj;         /* last window adjustment */
+        int minbcnt;
         int wpkts, rpkts;
-        int dataref;
 };
 
 struct aoedev {
@@ -153,6 +145,9 @@ struct aoedev {
         u16 rttavg;             /* round trip average of requests/responses */
         u16 mintimer;
         u16 fw_ver;             /* version of blade's firmware */
+        u16 lasttag;            /* last tag sent */
+        u16 useme;
+        ulong ref;
         struct work_struct work;/* disk create work struct */
         struct gendisk *gd;
         struct request_queue *blkq;
@@ -160,16 +155,31 @@ struct aoedev {
         sector_t ssize;
         struct timer_list timer;
         spinlock_t lock;
-        struct sk_buff_head sendq;
         struct sk_buff_head skbpool;
         mempool_t *bufpool;     /* for deadlock-free Buf allocation */
-        struct list_head bufq;  /* queue of bios to work on */
-        struct buf *inprocess;  /* the one we're currently working on */
+        struct {                /* pointers to work in progress */
+                struct buf *buf;
+                struct bio *nxbio;
+                struct request *rq;
+        } ip;
+        ulong maxbcnt;
+        struct list_head factive[NFACTIVE];     /* hash of active frames */
         struct aoetgt *targets[NTARGETS];
         struct aoetgt **tgt;    /* target in use when working */
-        struct aoetgt **htgt;   /* target needing rexmit assistance */
+        struct aoetgt *htgt;    /* target needing rexmit assistance */
+        ulong ntargets;
+        ulong kicked;
 };
 
+/* kthread tracking */
+struct ktstate {
+        struct completion rendez;
+        struct task_struct *task;
+        wait_queue_head_t *waitq;
+        int (*fn) (void);
+        char *name;
+        spinlock_t *lock;
+};
 
 int aoeblk_init(void);
 void aoeblk_exit(void);
@@ -182,22 +192,29 @@ void aoechr_error(char *);
 
 void aoecmd_work(struct aoedev *d);
 void aoecmd_cfg(ushort aoemajor, unsigned char aoeminor);
-void aoecmd_ata_rsp(struct sk_buff *);
+struct sk_buff *aoecmd_ata_rsp(struct sk_buff *);
 void aoecmd_cfg_rsp(struct sk_buff *);
 void aoecmd_sleepwork(struct work_struct *);
 void aoecmd_cleanslate(struct aoedev *);
+void aoecmd_exit(void);
+int aoecmd_init(void);
 struct sk_buff *aoecmd_ata_id(struct aoedev *);
+void aoe_freetframe(struct frame *);
+void aoe_flush_iocq(void);
+void aoe_end_request(struct aoedev *, struct request *, int);
+int aoe_ktstart(struct ktstate *k);
+void aoe_ktstop(struct ktstate *k);
 
 int aoedev_init(void);
 void aoedev_exit(void);
-struct aoedev *aoedev_by_aoeaddr(int maj, int min);
-struct aoedev *aoedev_by_sysminor_m(ulong sysminor);
+struct aoedev *aoedev_by_aoeaddr(ulong maj, int min, int do_alloc);
 void aoedev_downdev(struct aoedev *d);
 int aoedev_flush(const char __user *str, size_t size);
+void aoe_failbuf(struct aoedev *, struct buf *);
+void aoedev_put(struct aoedev *);
 
 int aoenet_init(void);
 void aoenet_exit(void);
 void aoenet_xmit(struct sk_buff_head *);
 int is_aoe_netif(struct net_device *ifp);
 int set_aoe_iflist(const char __user *str, size_t size);
-
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 321de7b6c442..00dfc5008ad4 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoeblk.c
  * block device routines
@@ -161,68 +161,22 @@ aoeblk_release(struct gendisk *disk, fmode_t mode)
 }
 
 static void
-aoeblk_make_request(struct request_queue *q, struct bio *bio)
+aoeblk_request(struct request_queue *q)
 {
-        struct sk_buff_head queue;
         struct aoedev *d;
-        struct buf *buf;
-        ulong flags;
-
-        blk_queue_bounce(q, &bio);
-
-        if (bio == NULL) {
-                printk(KERN_ERR "aoe: bio is NULL\n");
-                BUG();
-                return;
-        }
-        d = bio->bi_bdev->bd_disk->private_data;
-        if (d == NULL) {
-                printk(KERN_ERR "aoe: bd_disk->private_data is NULL\n");
-                BUG();
-                bio_endio(bio, -ENXIO);
-                return;
-        } else if (bio->bi_io_vec == NULL) {
-                printk(KERN_ERR "aoe: bi_io_vec is NULL\n");
-                BUG();
-                bio_endio(bio, -ENXIO);
-                return;
-        }
-        buf = mempool_alloc(d->bufpool, GFP_NOIO);
-        if (buf == NULL) {
-                printk(KERN_INFO "aoe: buf allocation failure\n");
-                bio_endio(bio, -ENOMEM);
-                return;
-        }
-        memset(buf, 0, sizeof(*buf));
-        INIT_LIST_HEAD(&buf->bufs);
-        buf->stime = jiffies;
-        buf->bio = bio;
-        buf->resid = bio->bi_size;
-        buf->sector = bio->bi_sector;
-        buf->bv = &bio->bi_io_vec[bio->bi_idx];
-        buf->bv_resid = buf->bv->bv_len;
-        WARN_ON(buf->bv_resid == 0);
-        buf->bv_off = buf->bv->bv_offset;
-
-        spin_lock_irqsave(&d->lock, flags);
+        struct request *rq;
 
+        d = q->queuedata;
         if ((d->flags & DEVFL_UP) == 0) {
                 pr_info_ratelimited("aoe: device %ld.%d is not up\n",
                         d->aoemajor, d->aoeminor);
-                spin_unlock_irqrestore(&d->lock, flags);
-                mempool_free(buf, d->bufpool);
-                bio_endio(bio, -ENXIO);
+                while ((rq = blk_peek_request(q))) {
+                        blk_start_request(rq);
+                        aoe_end_request(d, rq, 1);
+                }
                 return;
         }
-
-        list_add_tail(&buf->bufs, &d->bufq);
-
         aoecmd_work(d);
-        __skb_queue_head_init(&queue);
-        skb_queue_splice_init(&d->sendq, &queue);
-
-        spin_unlock_irqrestore(&d->lock, flags);
-        aoenet_xmit(&queue);
 }
 
 static int
@@ -254,41 +208,54 @@ aoeblk_gdalloc(void *vp)
 {
         struct aoedev *d = vp;
         struct gendisk *gd;
+        mempool_t *mp;
+        struct request_queue *q;
+        enum { KB = 1024, MB = KB * KB, READ_AHEAD = 2 * MB, };
         ulong flags;
 
         gd = alloc_disk(AOE_PARTITIONS);
         if (gd == NULL) {
-                printk(KERN_ERR
-                        "aoe: cannot allocate disk structure for %ld.%d\n",
+                pr_err("aoe: cannot allocate disk structure for %ld.%d\n",
                         d->aoemajor, d->aoeminor);
                 goto err;
         }
 
-        d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
-        if (d->bufpool == NULL) {
+        mp = mempool_create(MIN_BUFS, mempool_alloc_slab, mempool_free_slab,
+                buf_pool_cache);
+        if (mp == NULL) {
                 printk(KERN_ERR "aoe: cannot allocate bufpool for %ld.%d\n",
                         d->aoemajor, d->aoeminor);
                 goto err_disk;
         }
+        q = blk_init_queue(aoeblk_request, &d->lock);
+        if (q == NULL) {
+                pr_err("aoe: cannot allocate block queue for %ld.%d\n",
+                        d->aoemajor, d->aoeminor);
+                mempool_destroy(mp);
+                goto err_disk;
+        }
 
         d->blkq = blk_alloc_queue(GFP_KERNEL);
         if (!d->blkq)
                 goto err_mempool;
-        blk_queue_make_request(d->blkq, aoeblk_make_request);
         d->blkq->backing_dev_info.name = "aoe";
         if (bdi_init(&d->blkq->backing_dev_info))
                 goto err_blkq;
         spin_lock_irqsave(&d->lock, flags);
+        blk_queue_max_hw_sectors(d->blkq, BLK_DEF_MAX_SECTORS);
+        q->backing_dev_info.ra_pages = READ_AHEAD / PAGE_CACHE_SIZE;
+        d->bufpool = mp;
+        d->blkq = gd->queue = q;
+        q->queuedata = d;
+        d->gd = gd;
         gd->major = AOE_MAJOR;
-        gd->first_minor = d->sysminor * AOE_PARTITIONS;
+        gd->first_minor = d->sysminor;
         gd->fops = &aoe_bdops;
         gd->private_data = d;
         set_capacity(gd, d->ssize);
         snprintf(gd->disk_name, sizeof gd->disk_name, "etherd/e%ld.%d",
                 d->aoemajor, d->aoeminor);
 
-        gd->queue = d->blkq;
-        d->gd = gd;
         d->flags &= ~DEVFL_GDALLOC;
         d->flags |= DEVFL_UP;
 
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index e86d2062a164..ed57a890c643 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoechr.c
  * AoE character device driver
@@ -86,34 +86,34 @@ revalidate(const char __user *str, size_t size)
         if (copy_from_user(buf, str, size))
                 return -EFAULT;
 
-        /* should be e%d.%d format */
         n = sscanf(buf, "e%d.%d", &major, &minor);
         if (n != 2) {
-                printk(KERN_ERR "aoe: invalid device specification\n");
+                pr_err("aoe: invalid device specification %s\n", buf);
                 return -EINVAL;
         }
-        d = aoedev_by_aoeaddr(major, minor);
+        d = aoedev_by_aoeaddr(major, minor, 0);
         if (!d)
                 return -EINVAL;
         spin_lock_irqsave(&d->lock, flags);
         aoecmd_cleanslate(d);
+        aoecmd_cfg(major, minor);
 loop:
         skb = aoecmd_ata_id(d);
         spin_unlock_irqrestore(&d->lock, flags);
         /* try again if we are able to sleep a bit,
          * otherwise give up this revalidation
          */
-        if (!skb && !msleep_interruptible(200)) {
+        if (!skb && !msleep_interruptible(250)) {
                 spin_lock_irqsave(&d->lock, flags);
                 goto loop;
         }
+        aoedev_put(d);
         if (skb) {
                 struct sk_buff_head queue;
                 __skb_queue_head_init(&queue);
                 __skb_queue_tail(&queue, skb);
                 aoenet_xmit(&queue);
         }
-        aoecmd_cfg(major, minor);
         return 0;
 }
 
@@ -174,6 +174,7 @@ aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp
                 break;
         case MINOR_FLUSH:
                 ret = aoedev_flush(buf, cnt);
+                break;
         }
         if (ret == 0)
                 ret = cnt;
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 887f68f6d79a..3804a0af3ef1 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoecmd.c
  * Filesystem request handling methods
@@ -12,10 +12,19 @@
 #include <linux/netdevice.h>
 #include <linux/genhd.h>
 #include <linux/moduleparam.h>
+#include <linux/workqueue.h>
+#include <linux/kthread.h>
 #include <net/net_namespace.h>
 #include <asm/unaligned.h>
+#include <linux/uio.h>
 #include "aoe.h"
 
+#define MAXIOC (8192)   /* default meant to avoid most soft lockups */
+
+static void ktcomplete(struct frame *, struct sk_buff *);
+
+static struct buf *nextbuf(struct aoedev *);
+
 static int aoe_deadsecs = 60 * 3;
 module_param(aoe_deadsecs, int, 0644);
 MODULE_PARM_DESC(aoe_deadsecs, "After aoe_deadsecs seconds, give up and fail dev.");
@@ -25,6 +34,15 @@ module_param(aoe_maxout, int, 0644);
 MODULE_PARM_DESC(aoe_maxout,
         "Only aoe_maxout outstanding packets for every MAC on eX.Y.");
 
+static wait_queue_head_t ktiowq;
+static struct ktstate kts;
+
+/* io completion queue */
+static struct {
+        struct list_head head;
+        spinlock_t lock;
+} iocq;
+
 static struct sk_buff *
 new_skb(ulong len)
 {
@@ -41,15 +59,21 @@ new_skb(ulong len)
 }
 
 static struct frame *
-getframe(struct aoetgt *t, int tag)
+getframe(struct aoedev *d, u32 tag)
 {
-        struct frame *f, *e;
+        struct frame *f;
+        struct list_head *head, *pos, *nx;
+        u32 n;
 
-        f = t->frames;
-        e = f + t->nframes;
-        for (; f<e; f++)
-                if (f->tag == tag)
+        n = tag % NFACTIVE;
+        head = &d->factive[n];
+        list_for_each_safe(pos, nx, head) {
+                f = list_entry(pos, struct frame, head);
+                if (f->tag == tag) {
+                        list_del(pos);
                         return f;
+                }
+        }
         return NULL;
 }
 
@@ -59,18 +83,18 @@ getframe(struct aoetgt *t, int tag)
  * This driver reserves tag -1 to mean "unused frame."
  */
 static int
-newtag(struct aoetgt *t)
+newtag(struct aoedev *d)
 {
         register ulong n;
 
         n = jiffies & 0xffff;
-        return n |= (++t->lasttag & 0x7fff) << 16;
+        return n |= (++d->lasttag & 0x7fff) << 16;
 }
 
-static int
+static u32
 aoehdr_atainit(struct aoedev *d, struct aoetgt *t, struct aoe_hdr *h)
 {
-        u32 host_tag = newtag(t);
+        u32 host_tag = newtag(d);
 
         memcpy(h->src, t->ifp->nd->dev_addr, sizeof h->src);
         memcpy(h->dst, t->addr, sizeof h->dst);
@@ -95,16 +119,18 @@ put_lba(struct aoe_atahdr *ah, sector_t lba)
         ah->lba5 = lba >>= 8;
 }
 
-static void
+static struct aoeif *
 ifrotate(struct aoetgt *t)
 {
-        t->ifp++;
-        if (t->ifp >= &t->ifs[NAOEIFS] || t->ifp->nd == NULL)
-                t->ifp = t->ifs;
-        if (t->ifp->nd == NULL) {
-                printk(KERN_INFO "aoe: no interface to rotate to\n");
-                BUG();
-        }
+        struct aoeif *ifp;
+
+        ifp = t->ifp;
+        ifp++;
+        if (ifp >= &t->ifs[NAOEIFS] || ifp->nd == NULL)
+                ifp = t->ifs;
+        if (ifp->nd == NULL)
+                return NULL;
+        return t->ifp = ifp;
 }
 
 static void
@@ -129,78 +155,128 @@ skb_pool_get(struct aoedev *d)
         return NULL;
 }
 
-/* freeframe is where we do our load balancing so it's a little hairy. */
+void
+aoe_freetframe(struct frame *f)
+{
+        struct aoetgt *t;
+
+        t = f->t;
+        f->buf = NULL;
+        f->bv = NULL;
+        f->r_skb = NULL;
+        list_add(&f->head, &t->ffree);
+}
+
 static struct frame *
-freeframe(struct aoedev *d)
+newtframe(struct aoedev *d, struct aoetgt *t)
 {
-        struct frame *f, *e, *rf;
-        struct aoetgt **t;
+        struct frame *f;
         struct sk_buff *skb;
+        struct list_head *pos;
+
+        if (list_empty(&t->ffree)) {
+                if (t->falloc >= NSKBPOOLMAX*2)
+                        return NULL;
+                f = kcalloc(1, sizeof(*f), GFP_ATOMIC);
+                if (f == NULL)
+                        return NULL;
+                t->falloc++;
+                f->t = t;
+        } else {
+                pos = t->ffree.next;
+                list_del(pos);
+                f = list_entry(pos, struct frame, head);
+        }
+
+        skb = f->skb;
+        if (skb == NULL) {
+                f->skb = skb = new_skb(ETH_ZLEN);
+                if (!skb) {
+bail:                   aoe_freetframe(f);
+                        return NULL;
+                }
+        }
+
+        if (atomic_read(&skb_shinfo(skb)->dataref) != 1) {
+                skb = skb_pool_get(d);
+                if (skb == NULL)
+                        goto bail;
+                skb_pool_put(d, f->skb);
+                f->skb = skb;
+        }
+
+        skb->truesize -= skb->data_len;
+        skb_shinfo(skb)->nr_frags = skb->data_len = 0;
+        skb_trim(skb, 0);
+        return f;
+}
+
+static struct frame *
+newframe(struct aoedev *d)
+{
+        struct frame *f;
+        struct aoetgt *t, **tt;
+        int totout = 0;
 
         if (d->targets[0] == NULL) {    /* shouldn't happen, but I'm paranoid */
                 printk(KERN_ERR "aoe: NULL TARGETS!\n");
                 return NULL;
         }
-        t = d->tgt;
-        t++;
-        if (t >= &d->targets[NTARGETS] || !*t)
-                t = d->targets;
+        tt = d->tgt;    /* last used target */
         for (;;) {
-                if ((*t)->nout < (*t)->maxout
+                tt++;
+                if (tt >= &d->targets[NTARGETS] || !*tt)
+                        tt = d->targets;
+                t = *tt;
+                totout += t->nout;
+                if (t->nout < t->maxout
                 && t != d->htgt
-                && (*t)->ifp->nd) {
-                        rf = NULL;
-                        f = (*t)->frames;
-                        e = f + (*t)->nframes;
-                        for (; f < e; f++) {
-                                if (f->tag != FREETAG)
-                                        continue;
-                                skb = f->skb;
-                                if (!skb
-                                && !(f->skb = skb = new_skb(ETH_ZLEN)))
-                                        continue;
-                                if (atomic_read(&skb_shinfo(skb)->dataref)
-                                        != 1) {
-                                        if (!rf)
-                                                rf = f;
-                                        continue;
-                                }
-gotone:                         skb_shinfo(skb)->nr_frags = skb->data_len = 0;
-                                skb_trim(skb, 0);
-                                d->tgt = t;
-                                ifrotate(*t);
+                && t->ifp->nd) {
+                        f = newtframe(d, t);
+                        if (f) {
+                                ifrotate(t);
+                                d->tgt = tt;
                                 return f;
                         }
-                        /* Work can be done, but the network layer is
-                           holding our precious packets.  Try to grab
-                           one from the pool. */
-                        f = rf;
-                        if (f == NULL) {        /* more paranoia */
-                                printk(KERN_ERR
-                                        "aoe: freeframe: %s.\n",
-                                        "unexpected null rf");
-                                d->flags |= DEVFL_KICKME;
-                                return NULL;
-                        }
-                        skb = skb_pool_get(d);
-                        if (skb) {
-                                skb_pool_put(d, f->skb);
-                                f->skb = skb;
-                                goto gotone;
-                        }
-                        (*t)->dataref++;
-                        if ((*t)->nout == 0)
-                                d->flags |= DEVFL_KICKME;
                 }
-                if (t == d->tgt)        /* we've looped and found nada */
+                if (tt == d->tgt)       /* we've looped and found nada */
                         break;
-                t++;
-                if (t >= &d->targets[NTARGETS] || !*t)
-                        t = d->targets;
+        }
+        if (totout == 0) {
+                d->kicked++;
+                d->flags |= DEVFL_KICKME;
         }
         return NULL;
 }
 
+static void
+skb_fillup(struct sk_buff *skb, struct bio_vec *bv, ulong off, ulong cnt)
+{
+        int frag = 0;
+        ulong fcnt;
+loop:
+        fcnt = bv->bv_len - (off - bv->bv_offset);
+        if (fcnt > cnt)
+                fcnt = cnt;
+        skb_fill_page_desc(skb, frag++, bv->bv_page, off, fcnt);
+        cnt -= fcnt;
+        if (cnt <= 0)
+                return;
+        bv++;
+        off = bv->bv_offset;
+        goto loop;
+}
+
+static void
+fhash(struct frame *f)
+{
+        struct aoedev *d = f->t->d;
+        u32 n;
+
+        n = f->tag % NFACTIVE;
+        list_add_tail(&f->head, &d->factive[n]);
+}
+
 static int
 aoecmd_ata_rw(struct aoedev *d)
 {
@@ -208,26 +284,47 @@ aoecmd_ata_rw(struct aoedev *d)
         struct aoe_hdr *h;
         struct aoe_atahdr *ah;
         struct buf *buf;
-        struct bio_vec *bv;
         struct aoetgt *t;
         struct sk_buff *skb;
-        ulong bcnt;
+        struct sk_buff_head queue;
+        ulong bcnt, fbcnt;
         char writebit, extbit;
 
         writebit = 0x10;
         extbit = 0x4;
 
-        f = freeframe(d);
+        buf = nextbuf(d);
+        if (buf == NULL)
+                return 0;
+        f = newframe(d);
         if (f == NULL)
                 return 0;
         t = *d->tgt;
-        buf = d->inprocess;
-        bv = buf->bv;
-        bcnt = t->ifp->maxbcnt;
+        bcnt = d->maxbcnt;
         if (bcnt == 0)
                 bcnt = DEFAULTBCNT;
-        if (bcnt > buf->bv_resid)
-                bcnt = buf->bv_resid;
+        if (bcnt > buf->resid)
+                bcnt = buf->resid;
+        fbcnt = bcnt;
+        f->bv = buf->bv;
+        f->bv_off = f->bv->bv_offset + (f->bv->bv_len - buf->bv_resid);
+        do {
+                if (fbcnt < buf->bv_resid) {
+                        buf->bv_resid -= fbcnt;
+                        buf->resid -= fbcnt;
+                        break;
+                }
+                fbcnt -= buf->bv_resid;
+                buf->resid -= buf->bv_resid;
+                if (buf->resid == 0) {
+                        d->ip.buf = NULL;
+                        break;
+                }
+                buf->bv++;
+                buf->bv_resid = buf->bv->bv_len;
+                WARN_ON(buf->bv_resid == 0);
+        } while (fbcnt);
+
         /* initialize the headers & frame */
         skb = f->skb;
         h = (struct aoe_hdr *) skb_mac_header(skb);
@@ -235,10 +332,10 @@ aoecmd_ata_rw(struct aoedev *d)
         skb_put(skb, sizeof *h + sizeof *ah);
         memset(h, 0, skb->len);
         f->tag = aoehdr_atainit(d, t, h);
+        fhash(f);
         t->nout++;
         f->waited = 0;
         f->buf = buf;
-        f->bufaddr = page_address(bv->bv_page) + buf->bv_off;
         f->bcnt = bcnt;
         f->lba = buf->sector;
 
@@ -253,10 +350,11 @@ aoecmd_ata_rw(struct aoedev *d)
                 ah->lba3 |= 0xe0;       /* LBA bit + obsolete 0xa0 */
         }
         if (bio_data_dir(buf->bio) == WRITE) {
-                skb_fill_page_desc(skb, 0, bv->bv_page, buf->bv_off, bcnt);
+                skb_fillup(skb, f->bv, f->bv_off, bcnt);
                 ah->aflags |= AOEAFL_WRITE;
                 skb->len += bcnt;
                 skb->data_len = bcnt;
+                skb->truesize += bcnt;
                 t->wpkts++;
         } else {
                 t->rpkts++;
@@ -267,23 +365,15 @@ aoecmd_ata_rw(struct aoedev *d)
 
         /* mark all tracking fields and load out */
         buf->nframesout += 1;
-        buf->bv_off += bcnt;
-        buf->bv_resid -= bcnt;
-        buf->resid -= bcnt;
         buf->sector += bcnt >> 9;
-        if (buf->resid == 0) {
-                d->inprocess = NULL;
-        } else if (buf->bv_resid == 0) {
-                buf->bv = ++bv;
-                buf->bv_resid = bv->bv_len;
-                WARN_ON(buf->bv_resid == 0);
-                buf->bv_off = bv->bv_offset;
-        }
 
         skb->dev = t->ifp->nd;
         skb = skb_clone(skb, GFP_ATOMIC);
-        if (skb)
-                __skb_queue_tail(&d->sendq, skb);
+        if (skb) {
+                __skb_queue_head_init(&queue);
+                __skb_queue_tail(&queue, skb);
+                aoenet_xmit(&queue);
+        }
         return 1;
 }
 
@@ -330,17 +420,25 @@ cont:
 }
 
 static void
-resend(struct aoedev *d, struct aoetgt *t, struct frame *f)
+resend(struct aoedev *d, struct frame *f)
 {
         struct sk_buff *skb;
+        struct sk_buff_head queue;
         struct aoe_hdr *h;
         struct aoe_atahdr *ah;
+        struct aoetgt *t;
         char buf[128];
         u32 n;
 
-        ifrotate(t);
-        n = newtag(t);
+        t = f->t;
+        n = newtag(d);
         skb = f->skb;
+        if (ifrotate(t) == NULL) {
+                /* probably can't happen, but set it up to fail anyway */
+                pr_info("aoe: resend: no interfaces to rotate to.\n");
+                ktcomplete(f, NULL);
+                return;
+        }
         h = (struct aoe_hdr *) skb_mac_header(skb);
         ah = (struct aoe_atahdr *) (h+1);
 
@@ -351,39 +449,22 @@ resend(struct aoedev *d, struct aoetgt *t, struct frame *f)
         aoechr_error(buf);
 
         f->tag = n;
+        fhash(f);
         h->tag = cpu_to_be32(n);
         memcpy(h->dst, t->addr, sizeof h->dst);
         memcpy(h->src, t->ifp->nd->dev_addr, sizeof h->src);
 
-        switch (ah->cmdstat) {
-        default:
-                break;
-        case ATA_CMD_PIO_READ:
-        case ATA_CMD_PIO_READ_EXT:
-        case ATA_CMD_PIO_WRITE:
-        case ATA_CMD_PIO_WRITE_EXT:
-                put_lba(ah, f->lba);
-
-                n = f->bcnt;
-                if (n > DEFAULTBCNT)
-                        n = DEFAULTBCNT;
-                ah->scnt = n >> 9;
-                if (ah->aflags & AOEAFL_WRITE) {
-                        skb_fill_page_desc(skb, 0, virt_to_page(f->bufaddr),
-                                offset_in_page(f->bufaddr), n);
-                        skb->len = sizeof *h + sizeof *ah + n;
-                        skb->data_len = n;
-                }
-        }
         skb->dev = t->ifp->nd;
         skb = skb_clone(skb, GFP_ATOMIC);
         if (skb == NULL)
                 return;
-        __skb_queue_tail(&d->sendq, skb);
+        __skb_queue_head_init(&queue);
+        __skb_queue_tail(&queue, skb);
+        aoenet_xmit(&queue);
 }
 
 static int
-tsince(int tag)
+tsince(u32 tag)
 {
         int n;
 
@@ -407,58 +488,65 @@ getif(struct aoetgt *t, struct net_device *nd)
         return NULL;
 }
 
-static struct aoeif *
-addif(struct aoetgt *t, struct net_device *nd)
-{
-        struct aoeif *p;
-
-        p = getif(t, NULL);
-        if (!p)
-                return NULL;
-        p->nd = nd;
-        p->maxbcnt = DEFAULTBCNT;
-        p->lost = 0;
-        p->lostjumbo = 0;
-        return p;
-}
-
 static void
 ejectif(struct aoetgt *t, struct aoeif *ifp)
 {
         struct aoeif *e;
+        struct net_device *nd;
         ulong n;
 
+        nd = ifp->nd;
         e = t->ifs + NAOEIFS - 1;
         n = (e - ifp) * sizeof *ifp;
         memmove(ifp, ifp+1, n);
         e->nd = NULL;
+        dev_put(nd);
 }
 
 static int
 sthtith(struct aoedev *d)
 {
-        struct frame *f, *e, *nf;
+        struct frame *f, *nf;
+        struct list_head *nx, *pos, *head;
         struct sk_buff *skb;
-        struct aoetgt *ht = *d->htgt;
-
-        f = ht->frames;
-        e = f + ht->nframes;
-        for (; f < e; f++) {
-                if (f->tag == FREETAG)
-                        continue;
-                nf = freeframe(d);
-                if (!nf)
-                        return 0;
-                skb = nf->skb;
-                *nf = *f;
-                f->skb = skb;
-                f->tag = FREETAG;
-                nf->waited = 0;
-                ht->nout--;
-                (*d->tgt)->nout++;
-                resend(d, *d->tgt, nf);
+        struct aoetgt *ht = d->htgt;
+        int i;
+
+        for (i = 0; i < NFACTIVE; i++) {
+                head = &d->factive[i];
+                list_for_each_safe(pos, nx, head) {
+                        f = list_entry(pos, struct frame, head);
+                        if (f->t != ht)
+                                continue;
+
+                        nf = newframe(d);
+                        if (!nf)
+                                return 0;
+
+                        /* remove frame from active list */
+                        list_del(pos);
+
+                        /* reassign all pertinent bits to new outbound frame */
+                        skb = nf->skb;
+                        nf->skb = f->skb;
+                        nf->buf = f->buf;
+                        nf->bcnt = f->bcnt;
+                        nf->lba = f->lba;
+                        nf->bv = f->bv;
+                        nf->bv_off = f->bv_off;
+                        nf->waited = 0;
+                        f->skb = skb;
+                        aoe_freetframe(f);
+                        ht->nout--;
+                        nf->t->nout++;
+                        resend(d, nf);
+                }
         }
-        /* he's clean, he's useless.  take away his interfaces */
+        /* We've cleaned up the outstanding so take away his
+         * interfaces so he won't be used.  We should remove him from
+         * the target array here, but cleaning up a target is
+         * involved.  PUNT!
+         */
         memset(ht->ifs, 0, sizeof ht->ifs);
         d->htgt = NULL;
         return 1;
@@ -477,13 +565,15 @@ ata_scnt(unsigned char *packet) {
 static void
 rexmit_timer(ulong vp)
 {
-        struct sk_buff_head queue;
         struct aoedev *d;
         struct aoetgt *t, **tt, **te;
         struct aoeif *ifp;
-        struct frame *f, *e;
+        struct frame *f;
+        struct list_head *head, *pos, *nx;
+        LIST_HEAD(flist);
         register long timeout;
         ulong flags, n;
+        int i;
 
         d = (struct aoedev *) vp;
 
@@ -497,58 +587,22 @@ rexmit_timer(ulong vp)
                 spin_unlock_irqrestore(&d->lock, flags);
                 return;
         }
-        tt = d->targets;
-        te = tt + NTARGETS;
-        for (; tt < te && *tt; tt++) {
-                t = *tt;
-                f = t->frames;
-                e = f + t->nframes;
-                for (; f < e; f++) {
-                        if (f->tag == FREETAG
-                        || tsince(f->tag) < timeout)
-                                continue;
-                        n = f->waited += timeout;
-                        n /= HZ;
-                        if (n > aoe_deadsecs) {
-                                /* waited too long.  device failure. */
-                                aoedev_downdev(d);
-                                break;
-                        }
-
-                        if (n > HELPWAIT /* see if another target can help */
-                        && (tt != d->targets || d->targets[1]))
-                                d->htgt = tt;
-
-                        if (t->nout == t->maxout) {
-                                if (t->maxout > 1)
-                                        t->maxout--;
-                                t->lastwadj = jiffies;
-                        }
-
-                        ifp = getif(t, f->skb->dev);
-                        if (ifp && ++ifp->lost > (t->nframes << 1)
-                        && (ifp != t->ifs || t->ifs[1].nd)) {
-                                ejectif(t, ifp);
-                                ifp = NULL;
-                        }
 
-                        if (ata_scnt(skb_mac_header(f->skb)) > DEFAULTBCNT / 512
-                        && ifp && ++ifp->lostjumbo > (t->nframes << 1)
-                        && ifp->maxbcnt != DEFAULTBCNT) {
-                                printk(KERN_INFO
-                                        "aoe: e%ld.%d: "
-                                        "too many lost jumbo on "
-                                        "%s:%pm - "
-                                        "falling back to %d frames.\n",
-                                        d->aoemajor, d->aoeminor,
-                                        ifp->nd->name, t->addr,
-                                        DEFAULTBCNT);
-                                ifp->maxbcnt = 0;
-                        }
-                        resend(d, t, f);
+        /* collect all frames to rexmit into flist */
+        for (i = 0; i < NFACTIVE; i++) {
+                head = &d->factive[i];
+                list_for_each_safe(pos, nx, head) {
+                        f = list_entry(pos, struct frame, head);
+                        if (tsince(f->tag) < timeout)
+                                break;  /* end of expired frames */
+                        /* move to flist for later processing */
+                        list_move_tail(pos, &flist);
                 }
-
-                /* window check */
+        }
+        /* window check */
+        tt = d->targets;
+        te = tt + d->ntargets;
+        for (; tt < te && (t = *tt); tt++) {
                 if (t->nout == t->maxout
                 && t->maxout < t->nframes
                 && (jiffies - t->lastwadj)/HZ > 10) {
@@ -557,45 +611,173 @@ rexmit_timer(ulong vp)
                 }
         }
 
-        if (!skb_queue_empty(&d->sendq)) {
+        if (!list_empty(&flist)) {      /* retransmissions necessary */
                 n = d->rttavg <<= 1;
                 if (n > MAXTIMER)
                         d->rttavg = MAXTIMER;
         }
 
-        if (d->flags & DEVFL_KICKME || d->htgt) {
-                d->flags &= ~DEVFL_KICKME;
-                aoecmd_work(d);
+        /* process expired frames */
+        while (!list_empty(&flist)) {
+                pos = flist.next;
+                f = list_entry(pos, struct frame, head);
+                n = f->waited += timeout;
+                n /= HZ;
+                if (n > aoe_deadsecs) {
+                        /* Waited too long.  Device failure.
+                         * Hang all frames on first hash bucket for downdev
+                         * to clean up.
+                         */
+                        list_splice(&flist, &d->factive[0]);
+                        aoedev_downdev(d);
+                        break;
+                }
+                list_del(pos);
+
+                t = f->t;
+                if (n > aoe_deadsecs/2)
+                        d->htgt = t; /* see if another target can help */
+
+                if (t->nout == t->maxout) {
+                        if (t->maxout > 1)
+                                t->maxout--;
+                        t->lastwadj = jiffies;
+                }
+
+                ifp = getif(t, f->skb->dev);
+                if (ifp && ++ifp->lost > (t->nframes << 1)
+                && (ifp != t->ifs || t->ifs[1].nd)) {
+                        ejectif(t, ifp);
+                        ifp = NULL;
+                }
+                resend(d, f);
         }
 
-        __skb_queue_head_init(&queue);
-        skb_queue_splice_init(&d->sendq, &queue);
+        if ((d->flags & DEVFL_KICKME || d->htgt) && d->blkq) {
+                d->flags &= ~DEVFL_KICKME;
+                d->blkq->request_fn(d->blkq);
+        }
 
         d->timer.expires = jiffies + TIMERTICK;
         add_timer(&d->timer);
 
         spin_unlock_irqrestore(&d->lock, flags);
+}
 
-        aoenet_xmit(&queue);
+static unsigned long
+rqbiocnt(struct request *r)
+{
+        struct bio *bio;
+        unsigned long n = 0;
+
+        __rq_for_each_bio(bio, r)
+                n++;
+        return n;
+}
+
+/* This can be removed if we are certain that no users of the block
+ * layer will ever use zero-count pages in bios.  Otherwise we have to
+ * protect against the put_page sometimes done by the network layer.
+ *
+ * See http://oss.sgi.com/archives/xfs/2007-01/msg00594.html for
+ * discussion.
+ *
+ * We cannot use get_page in the workaround, because it insists on a
+ * positive page count as a precondition.  So we use _count directly.
+ */
+static void
+bio_pageinc(struct bio *bio)
+{
+        struct bio_vec *bv;
+        struct page *page;
+        int i;
+
+        bio_for_each_segment(bv, bio, i) {
+                page = bv->bv_page;
+                /* Non-zero page count for non-head members of
+                 * compound pages is no longer allowed by the kernel,
+                 * but this has never been seen here.
+                 */
+                if (unlikely(PageCompound(page)))
+                        if (compound_trans_head(page) != page) {
+                                pr_crit("page tail used for block I/O\n");
+                                BUG();
+                        }
+                atomic_inc(&page->_count);
+        }
+}
+
+static void
+bio_pagedec(struct bio *bio)
+{
+        struct bio_vec *bv;
+        int i;
+
+        bio_for_each_segment(bv, bio, i)
+                atomic_dec(&bv->bv_page->_count);
+}
+
+static void
+bufinit(struct buf *buf, struct request *rq, struct bio *bio)
+{
+        struct bio_vec *bv;
+
+        memset(buf, 0, sizeof(*buf));
+        buf->rq = rq;
+        buf->bio = bio;
+        buf->resid = bio->bi_size;
+        buf->sector = bio->bi_sector;
+        bio_pageinc(bio);
+        buf->bv = bv = &bio->bi_io_vec[bio->bi_idx];
+        buf->bv_resid = bv->bv_len;
+        WARN_ON(buf->bv_resid == 0);
+}
+
+static struct buf *
+nextbuf(struct aoedev *d)
+{
+        struct request *rq;
+        struct request_queue *q;
+        struct buf *buf;
+        struct bio *bio;
+
+        q = d->blkq;
+        if (q == NULL)
+                return NULL;    /* initializing */
+        if (d->ip.buf)
+                return d->ip.buf;
+        rq = d->ip.rq;
+        if (rq == NULL) {
+                rq = blk_peek_request(q);
+                if (rq == NULL)
+                        return NULL;
+                blk_start_request(rq);
+                d->ip.rq = rq;
+                d->ip.nxbio = rq->bio;
+                rq->special = (void *) rqbiocnt(rq);
+        }
+        buf = mempool_alloc(d->bufpool, GFP_ATOMIC);
+        if (buf == NULL) {
+                pr_err("aoe: nextbuf: unable to mempool_alloc!\n");
+                return NULL;
+        }
+        bio = d->ip.nxbio;
+        bufinit(buf, rq, bio);
+        bio = bio->bi_next;
+        d->ip.nxbio = bio;
+        if (bio == NULL)
+                d->ip.rq = NULL;
+        return d->ip.buf = buf;
 }
 
 /* enters with d->lock held */
 void
 aoecmd_work(struct aoedev *d)
 {
-        struct buf *buf;
-loop:
         if (d->htgt && !sthtith(d))
                 return;
-        if (d->inprocess == NULL) {
-                if (list_empty(&d->bufq))
-                        return;
-                buf = container_of(d->bufq.next, struct buf, bufs);
-                list_del(d->bufq.next);
-                d->inprocess = buf;
-        }
-        if (aoecmd_ata_rw(d))
-                goto loop;
+        while (aoecmd_ata_rw(d))
+                ;
 }
 
 /* this function performs work that has been deferred until sleeping is OK
@@ -604,28 +786,25 @@ void
 aoecmd_sleepwork(struct work_struct *work)
 {
         struct aoedev *d = container_of(work, struct aoedev, work);
+        struct block_device *bd;
+        u64 ssize;
 
         if (d->flags & DEVFL_GDALLOC)
                 aoeblk_gdalloc(d);
 
         if (d->flags & DEVFL_NEWSIZE) {
-                struct block_device *bd;
-                unsigned long flags;
-                u64 ssize;
-
                 ssize = get_capacity(d->gd);
                 bd = bdget_disk(d->gd, 0);
-
                 if (bd) {
                         mutex_lock(&bd->bd_inode->i_mutex);
                         i_size_write(bd->bd_inode, (loff_t)ssize<<9);
                         mutex_unlock(&bd->bd_inode->i_mutex);
                         bdput(bd);
                 }
-                spin_lock_irqsave(&d->lock, flags);
+                spin_lock_irq(&d->lock);
                 d->flags |= DEVFL_UP;
                 d->flags &= ~DEVFL_NEWSIZE;
-                spin_unlock_irqrestore(&d->lock, flags);
+                spin_unlock_irq(&d->lock);
         }
 }
 
@@ -718,163 +897,299 @@ gettgt(struct aoedev *d, char *addr)
         return NULL;
 }
 
-static inline void
-diskstats(struct gendisk *disk, struct bio *bio, ulong duration, sector_t sector)
+static void
+bvcpy(struct bio_vec *bv, ulong off, struct sk_buff *skb, long cnt)
+{
+        ulong fcnt;
+        char *p;
+        int soff = 0;
+loop:
+        fcnt = bv->bv_len - (off - bv->bv_offset);
+        if (fcnt > cnt)
+                fcnt = cnt;
+        p = page_address(bv->bv_page) + off;
+        skb_copy_bits(skb, soff, p, fcnt);
+        soff += fcnt;
+        cnt -= fcnt;
+        if (cnt <= 0)
+                return;
+        bv++;
+        off = bv->bv_offset;
+        goto loop;
+}
+
+void
+aoe_end_request(struct aoedev *d, struct request *rq, int fastfail)
+{
+        struct bio *bio;
+        int bok;
+        struct request_queue *q;
+
+        q = d->blkq;
+        if (rq == d->ip.rq)
+                d->ip.rq = NULL;
+        do {
+                bio = rq->bio;
+                bok = !fastfail && test_bit(BIO_UPTODATE, &bio->bi_flags);
+        } while (__blk_end_request(rq, bok ? 0 : -EIO, bio->bi_size));
+
+        /* cf. http://lkml.org/lkml/2006/10/31/28 */
+        if (!fastfail)
+                q->request_fn(q);
+}
+
+static void
+aoe_end_buf(struct aoedev *d, struct buf *buf)
+{
+        struct request *rq;
+        unsigned long n;
+
+        if (buf == d->ip.buf)
+                d->ip.buf = NULL;
+        rq = buf->rq;
+        bio_pagedec(buf->bio);
+        mempool_free(buf, d->bufpool);
+        n = (unsigned long) rq->special;
+        rq->special = (void *) --n;
+        if (n == 0)
+                aoe_end_request(d, rq, 0);
+}
+
+static void
+ktiocomplete(struct frame *f)
 {
-        unsigned long n_sect = bio->bi_size >> 9;
-        const int rw = bio_data_dir(bio);
-        struct hd_struct *part;
-        int cpu;
+        struct aoe_hdr *hin, *hout;
+        struct aoe_atahdr *ahin, *ahout;
+        struct buf *buf;
+        struct sk_buff *skb;
+        struct aoetgt *t;
+        struct aoeif *ifp;
+        struct aoedev *d;
+        long n;
+
+        if (f == NULL)
+                return;
+
+        t = f->t;
+        d = t->d;
+
+        hout = (struct aoe_hdr *) skb_mac_header(f->skb);
+        ahout = (struct aoe_atahdr *) (hout+1);
+        buf = f->buf;
+        skb = f->r_skb;
+        if (skb == NULL)
+                goto noskb;     /* just fail the buf. */
+
+        hin = (struct aoe_hdr *) skb->data;
+        skb_pull(skb, sizeof(*hin));
+        ahin = (struct aoe_atahdr *) skb->data;
+        skb_pull(skb, sizeof(*ahin));
+        if (ahin->cmdstat & 0xa9) {     /* these bits cleared on success */
+                pr_err("aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%d\n",
+                        ahout->cmdstat, ahin->cmdstat,
+                        d->aoemajor, d->aoeminor);
+noskb:  if (buf)
+                        clear_bit(BIO_UPTODATE, &buf->bio->bi_flags);
+                goto badrsp;
+        }
 
-        cpu = part_stat_lock();
-        part = disk_map_sector_rcu(disk, sector);
+        n = ahout->scnt << 9;
+        switch (ahout->cmdstat) {
+        case ATA_CMD_PIO_READ:
+        case ATA_CMD_PIO_READ_EXT:
+                if (skb->len < n) {
+                        pr_err("aoe: runt data size in read.  skb->len=%d need=%ld\n",
+                                skb->len, n);
+                        clear_bit(BIO_UPTODATE, &buf->bio->bi_flags);
+                        break;
+                }
+                bvcpy(f->bv, f->bv_off, skb, n);
+        case ATA_CMD_PIO_WRITE:
+        case ATA_CMD_PIO_WRITE_EXT:
+                spin_lock_irq(&d->lock);
+                ifp = getif(t, skb->dev);
+                if (ifp)
+                        ifp->lost = 0;
+                if (d->htgt == t) /* I'll help myself, thank you. */
+                        d->htgt = NULL;
+                spin_unlock_irq(&d->lock);
+                break;
+        case ATA_CMD_ID_ATA:
+                if (skb->len < 512) {
+                        pr_info("aoe: runt data size in ataid.  skb->len=%d\n",
+                                skb->len);
+                        break;
+                }
+                if (skb_linearize(skb))
+                        break;
+                spin_lock_irq(&d->lock);
+                ataid_complete(d, t, skb->data);
+                spin_unlock_irq(&d->lock);
+                break;
+        default:
+                pr_info("aoe: unrecognized ata command %2.2Xh for %d.%d\n",
+                        ahout->cmdstat,
+                        be16_to_cpu(get_unaligned(&hin->major)),
+                        hin->minor);
+        }
+badrsp:
+        spin_lock_irq(&d->lock);
+
+        aoe_freetframe(f);
+
+        if (buf && --buf->nframesout == 0 && buf->resid == 0)
+                aoe_end_buf(d, buf);
+
+        aoecmd_work(d);
+
+        spin_unlock_irq(&d->lock);
+        aoedev_put(d);
+        dev_kfree_skb(skb);
+}
+
+/* Enters with iocq.lock held.
+ * Returns true iff responses needing processing remain.
+ */
+static int
+ktio(void)
+{
+        struct frame *f;
+        struct list_head *pos;
+        int i;
 
-        part_stat_inc(cpu, part, ios[rw]);
-        part_stat_add(cpu, part, ticks[rw], duration);
-        part_stat_add(cpu, part, sectors[rw], n_sect);
-        part_stat_add(cpu, part, io_ticks, duration);
+        for (i = 0; ; ++i) {
+                if (i == MAXIOC)
+                        return 1;
+                if (list_empty(&iocq.head))
+                        return 0;
+                pos = iocq.head.next;
+                list_del(pos);
+                spin_unlock_irq(&iocq.lock);
+                f = list_entry(pos, struct frame, head);
+                ktiocomplete(f);
+                spin_lock_irq(&iocq.lock);
+        }
+}
 
-        part_stat_unlock();
+static int
+kthread(void *vp)
+{
+        struct ktstate *k;
+        DECLARE_WAITQUEUE(wait, current);
+        int more;
+
+        k = vp;
+        current->flags |= PF_NOFREEZE;
+        set_user_nice(current, -10);
+        complete(&k->rendez);   /* tell spawner we're running */
+        do {
+                spin_lock_irq(k->lock);
+                more = k->fn();
+                if (!more) {
+                        add_wait_queue(k->waitq, &wait);
+                        __set_current_state(TASK_INTERRUPTIBLE);
+                }
+                spin_unlock_irq(k->lock);
+                if (!more) {
+                        schedule();
+                        remove_wait_queue(k->waitq, &wait);
+                } else
+                        cond_resched();
+        } while (!kthread_should_stop());
+        complete(&k->rendez);   /* tell spawner we're stopping */
+        return 0;
 }
 
 void
+aoe_ktstop(struct ktstate *k)
+{
+        kthread_stop(k->task);
+        wait_for_completion(&k->rendez);
+}
+
+int
+aoe_ktstart(struct ktstate *k)
+{
+        struct task_struct *task;
+
+        init_completion(&k->rendez);
+        task = kthread_run(kthread, k, k->name);
+        if (task == NULL || IS_ERR(task))
+                return -ENOMEM;
+        k->task = task;
+        wait_for_completion(&k->rendez); /* allow kthread to start */
+        init_completion(&k->rendez);    /* for waiting for exit later */
+        return 0;
+}
+
+/* pass it off to kthreads for processing */
+static void
+ktcomplete(struct frame *f, struct sk_buff *skb)
+{
+        ulong flags;
+
+        f->r_skb = skb;
+        spin_lock_irqsave(&iocq.lock, flags);
+        list_add_tail(&f->head, &iocq.head);
+        spin_unlock_irqrestore(&iocq.lock, flags);
+        wake_up(&ktiowq);
+}
+
+struct sk_buff *
 aoecmd_ata_rsp(struct sk_buff *skb)
 {
-        struct sk_buff_head queue;
         struct aoedev *d;
-        struct aoe_hdr *hin, *hout;
-        struct aoe_atahdr *ahin, *ahout;
+        struct aoe_hdr *h;
         struct frame *f;
-        struct buf *buf;
         struct aoetgt *t;
-        struct aoeif *ifp;
-        register long n;
+        u32 n;
         ulong flags;
         char ebuf[128];
         u16 aoemajor;
 
-        hin = (struct aoe_hdr *) skb_mac_header(skb);
-        aoemajor = get_unaligned_be16(&hin->major);
-        d = aoedev_by_aoeaddr(aoemajor, hin->minor);
+        h = (struct aoe_hdr *) skb->data;
+        aoemajor = be16_to_cpu(get_unaligned(&h->major));
+        d = aoedev_by_aoeaddr(aoemajor, h->minor, 0);
         if (d == NULL) {
                 snprintf(ebuf, sizeof ebuf, "aoecmd_ata_rsp: ata response "
                         "for unknown device %d.%d\n",
-                         aoemajor, hin->minor);
+                        aoemajor, h->minor);
                 aoechr_error(ebuf);
-                return;
+                return skb;
         }
 
         spin_lock_irqsave(&d->lock, flags);
 
-        n = get_unaligned_be32(&hin->tag);
-        t = gettgt(d, hin->src);
-        if (t == NULL) {
-                printk(KERN_INFO "aoe: can't find target e%ld.%d:%pm\n",
-                        d->aoemajor, d->aoeminor, hin->src);
-                spin_unlock_irqrestore(&d->lock, flags);
-                return;
-        }
-        f = getframe(t, n);
+        n = be32_to_cpu(get_unaligned(&h->tag));
+        f = getframe(d, n);
         if (f == NULL) {
                 calc_rttavg(d, -tsince(n));
                 spin_unlock_irqrestore(&d->lock, flags);
+                aoedev_put(d);
                 snprintf(ebuf, sizeof ebuf,
                         "%15s e%d.%d    tag=%08x@%08lx\n",
                         "unexpected rsp",
-                        get_unaligned_be16(&hin->major),
-                        hin->minor,
-                        get_unaligned_be32(&hin->tag),
+                        get_unaligned_be16(&h->major),
+                        h->minor,
+                        get_unaligned_be32(&h->tag),
                         jiffies);
                 aoechr_error(ebuf);
-                return;
+                return skb;
         }
-
+        t = f->t;
         calc_rttavg(d, tsince(f->tag));
-
-        ahin = (struct aoe_atahdr *) (hin+1);
-        hout = (struct aoe_hdr *) skb_mac_header(f->skb);
-        ahout = (struct aoe_atahdr *) (hout+1);
-        buf = f->buf;
-
-        if (ahin->cmdstat & 0xa9) {     /* these bits cleared on success */
-                printk(KERN_ERR
-                        "aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%d\n",
-                        ahout->cmdstat, ahin->cmdstat,
-                        d->aoemajor, d->aoeminor);
-                if (buf)
-                        buf->flags |= BUFFL_FAIL;
-        } else {
-                if (d->htgt && t == *d->htgt) /* I'll help myself, thank you. */
-                        d->htgt = NULL;
-                n = ahout->scnt << 9;
-                switch (ahout->cmdstat) {
-                case ATA_CMD_PIO_READ:
-                case ATA_CMD_PIO_READ_EXT:
-                        if (skb->len - sizeof *hin - sizeof *ahin < n) {
-                                printk(KERN_ERR
-                                        "aoe: %s.  skb->len=%d need=%ld\n",
-                                        "runt data size in read", skb->len, n);
-                                /* fail frame f?  just returning will rexmit. */
-                                spin_unlock_irqrestore(&d->lock, flags);
-                                return;
-                        }
-                        memcpy(f->bufaddr, ahin+1, n);
-                case ATA_CMD_PIO_WRITE:
-                case ATA_CMD_PIO_WRITE_EXT:
-                        ifp = getif(t, skb->dev);
-                        if (ifp) {
-                                ifp->lost = 0;
-                                if (n > DEFAULTBCNT)
-                                        ifp->lostjumbo = 0;
-                        }
-                        if (f->bcnt -= n) {
-                                f->lba += n >> 9;
-                                f->bufaddr += n;
-                                resend(d, t, f);
-                                goto xmit;
-                        }
-                        break;
-                case ATA_CMD_ID_ATA:
-                        if (skb->len - sizeof *hin - sizeof *ahin < 512) {
-                                printk(KERN_INFO
-                                        "aoe: runt data size in ataid.  skb->len=%d\n",
-                                        skb->len);
-                                spin_unlock_irqrestore(&d->lock, flags);
-                                return;
-                        }
-                        ataid_complete(d, t, (char *) (ahin+1));
-                        break;
-                default:
-                        printk(KERN_INFO
-                                "aoe: unrecognized ata command %2.2Xh for %d.%d\n",
-                                ahout->cmdstat,
-                                get_unaligned_be16(&hin->major),
-                                hin->minor);
-                }
-        }
-
-        if (buf && --buf->nframesout == 0 && buf->resid == 0) {
-                diskstats(d->gd, buf->bio, jiffies - buf->stime, buf->sector);
-                if (buf->flags & BUFFL_FAIL)
-                        bio_endio(buf->bio, -EIO);
-                else {
-                        bio_flush_dcache_pages(buf->bio);
-                        bio_endio(buf->bio, 0);
-                }
-                mempool_free(buf, d->bufpool);
-        }
-
-        f->buf = NULL;
-        f->tag = FREETAG;
         t->nout--;
-
         aoecmd_work(d);
-xmit:
-        __skb_queue_head_init(&queue);
-        skb_queue_splice_init(&d->sendq, &queue);
 
         spin_unlock_irqrestore(&d->lock, flags);
-        aoenet_xmit(&queue);
+
+        ktcomplete(f, skb);
+
+        /*
+         * Note here that we do not perform an aoedev_put, as we are
+         * leaving this reference for the ktio to release.
+         */
+        return NULL;
 }
 
 void
@@ -896,7 +1211,7 @@ aoecmd_ata_id(struct aoedev *d)
         struct sk_buff *skb;
         struct aoetgt *t;
 
-        f = freeframe(d);
+        f = newframe(d);
         if (f == NULL)
                 return NULL;
 
@@ -909,6 +1224,7 @@ aoecmd_ata_id(struct aoedev *d)
         skb_put(skb, sizeof *h + sizeof *ah);
         memset(h, 0, skb->len);
         f->tag = aoehdr_atainit(d, t, h);
+        fhash(f);
         t->nout++;
         f->waited = 0;
 
@@ -929,7 +1245,6 @@ static struct aoetgt *
 addtgt(struct aoedev *d, char *addr, ulong nframes)
 {
         struct aoetgt *t, **tt, **te;
-        struct frame *f, *e;
 
         tt = d->targets;
         te = tt + NTARGETS;
@@ -941,26 +1256,73 @@ addtgt(struct aoedev *d, char *addr, ulong nframes)
                         "aoe: device addtgt failure; too many targets\n");
                 return NULL;
         }
-        t = kcalloc(1, sizeof *t, GFP_ATOMIC);
-        f = kcalloc(nframes, sizeof *f, GFP_ATOMIC);
-        if (!t || !f) {
-                kfree(f);
-                kfree(t);
+        t = kzalloc(sizeof(*t), GFP_ATOMIC);
+        if (!t) {
                 printk(KERN_INFO "aoe: cannot allocate memory to add target\n");
                 return NULL;
         }
 
+        d->ntargets++;
         t->nframes = nframes;
-        t->frames = f;
-        e = f + nframes;
-        for (; f < e; f++)
-                f->tag = FREETAG;
+        t->d = d;
         memcpy(t->addr, addr, sizeof t->addr);
         t->ifp = t->ifs;
         t->maxout = t->nframes;
+        INIT_LIST_HEAD(&t->ffree);
         return *tt = t;
 }
 
+static void
+setdbcnt(struct aoedev *d)
+{
+        struct aoetgt **t, **e;
+        int bcnt = 0;
+
+        t = d->targets;
+        e = t + NTARGETS;
+        for (; t < e && *t; t++)
+                if (bcnt == 0 || bcnt > (*t)->minbcnt)
+                        bcnt = (*t)->minbcnt;
+        if (bcnt != d->maxbcnt) {
+                d->maxbcnt = bcnt;
+                pr_info("aoe: e%ld.%d: setting %d byte data frames\n",
+                        d->aoemajor, d->aoeminor, bcnt);
+        }
+}
+
+static void
+setifbcnt(struct aoetgt *t, struct net_device *nd, int bcnt)
+{
+        struct aoedev *d;
+        struct aoeif *p, *e;
+        int minbcnt;
+
+        d = t->d;
+        minbcnt = bcnt;
+        p = t->ifs;
+        e = p + NAOEIFS;
+        for (; p < e; p++) {
+                if (p->nd == NULL)
+                        break;          /* end of the valid interfaces */
+                if (p->nd == nd) {
+                        p->bcnt = bcnt; /* we're updating */
+                        nd = NULL;
+                } else if (minbcnt > p->bcnt)
+                        minbcnt = p->bcnt; /* find the min interface */
+        }
+        if (nd) {
+                if (p == e) {
+                        pr_err("aoe: device setifbcnt failure; too many interfaces.\n");
+                        return;
+                }
+                dev_hold(nd);
+                p->nd = nd;
+                p->bcnt = bcnt;
+        }
+        t->minbcnt = minbcnt;
+        setdbcnt(d);
+}
+
 void
 aoecmd_cfg_rsp(struct sk_buff *skb)
 {
@@ -968,11 +1330,12 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
         struct aoe_hdr *h;
         struct aoe_cfghdr *ch;
         struct aoetgt *t;
-        struct aoeif *ifp;
-        ulong flags, sysminor, aoemajor;
+        ulong flags, aoemajor;
         struct sk_buff *sl;
+        struct sk_buff_head queue;
         u16 n;
 
+        sl = NULL;
         h = (struct aoe_hdr *) skb_mac_header(skb);
         ch = (struct aoe_cfghdr *) (h+1);
 
@@ -986,10 +1349,13 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
                         "Check shelf dip switches.\n");
                 return;
         }
-
-        sysminor = SYSMINOR(aoemajor, h->minor);
-        if (sysminor * AOE_PARTITIONS + AOE_PARTITIONS > MINORMASK) {
-                printk(KERN_INFO "aoe: e%ld.%d: minor number too large\n",
+        if (aoemajor == 0xffff) {
+                pr_info("aoe: e%ld.%d: broadcast shelf number invalid\n",
+                        aoemajor, (int) h->minor);
+                return;
+        }
+        if (h->minor == 0xff) {
+                pr_info("aoe: e%ld.%d: broadcast slot number invalid\n",
                         aoemajor, (int) h->minor);
                 return;
         }
@@ -998,9 +1364,9 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
         if (n > aoe_maxout)     /* keep it reasonable */
                 n = aoe_maxout;
 
-        d = aoedev_by_sysminor_m(sysminor);
+        d = aoedev_by_aoeaddr(aoemajor, h->minor, 1);
         if (d == NULL) {
-                printk(KERN_INFO "aoe: device sysminor_m failure\n");
+                pr_info("aoe: device allocation failure\n");
                 return;
         }
 
@@ -1009,52 +1375,26 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
         t = gettgt(d, h->src);
         if (!t) {
                 t = addtgt(d, h->src, n);
-                if (!t) {
-                        spin_unlock_irqrestore(&d->lock, flags);
-                        return;
-                }
-        }
-        ifp = getif(t, skb->dev);
-        if (!ifp) {
-                ifp = addif(t, skb->dev);
-                if (!ifp) {
-                        printk(KERN_INFO
-                                "aoe: device addif failure; "
-                                "too many interfaces?\n");
-                        spin_unlock_irqrestore(&d->lock, flags);
-                        return;
-                }
-        }
-        if (ifp->maxbcnt) {
-                n = ifp->nd->mtu;
-                n -= sizeof (struct aoe_hdr) + sizeof (struct aoe_atahdr);
-                n /= 512;
-                if (n > ch->scnt)
-                        n = ch->scnt;
-                n = n ? n * 512 : DEFAULTBCNT;
-                if (n != ifp->maxbcnt) {
-                        printk(KERN_INFO
-                                "aoe: e%ld.%d: setting %d%s%s:%pm\n",
-                                d->aoemajor, d->aoeminor, n,
-                                " byte data frames on ", ifp->nd->name,
-                                t->addr);
-                        ifp->maxbcnt = n;
-                }
+                if (!t)
+                        goto bail;
         }
+        n = skb->dev->mtu;
+        n -= sizeof(struct aoe_hdr) + sizeof(struct aoe_atahdr);
+        n /= 512;
+        if (n > ch->scnt)
+                n = ch->scnt;
+        n = n ? n * 512 : DEFAULTBCNT;
+        setifbcnt(t, skb->dev, n);
 
         /* don't change users' perspective */
-        if (d->nopen) {
-                spin_unlock_irqrestore(&d->lock, flags);
-                return;
+        if (d->nopen == 0) {
+                d->fw_ver = be16_to_cpu(ch->fwver);
+                sl = aoecmd_ata_id(d);
         }
-        d->fw_ver = be16_to_cpu(ch->fwver);
-
-        sl = aoecmd_ata_id(d);
-
+bail:
         spin_unlock_irqrestore(&d->lock, flags);
-
+        aoedev_put(d);
         if (sl) {
-                struct sk_buff_head queue;
                 __skb_queue_head_init(&queue);
                 __skb_queue_tail(&queue, sl);
                 aoenet_xmit(&queue);
@@ -1065,20 +1405,74 @@ void
 aoecmd_cleanslate(struct aoedev *d)
 {
         struct aoetgt **t, **te;
-        struct aoeif *p, *e;
 
         d->mintimer = MINTIMER;
+        d->maxbcnt = 0;
 
         t = d->targets;
         te = t + NTARGETS;
-        for (; t < te && *t; t++) {
+        for (; t < te && *t; t++)
                 (*t)->maxout = (*t)->nframes;
-                p = (*t)->ifs;
-                e = p + NAOEIFS;
-                for (; p < e; p++) {
-                        p->lostjumbo = 0;
-                        p->lost = 0;
-                        p->maxbcnt = DEFAULTBCNT;
+}
+
+void
+aoe_failbuf(struct aoedev *d, struct buf *buf)
+{
+        if (buf == NULL)
+                return;
+        buf->resid = 0;
+        clear_bit(BIO_UPTODATE, &buf->bio->bi_flags);
+        if (buf->nframesout == 0)
+                aoe_end_buf(d, buf);
+}
+
+void
+aoe_flush_iocq(void)
+{
+        struct frame *f;
+        struct aoedev *d;
+        LIST_HEAD(flist);
+        struct list_head *pos;
+        struct sk_buff *skb;
+        ulong flags;
+
+        spin_lock_irqsave(&iocq.lock, flags);
+        list_splice_init(&iocq.head, &flist);
+        spin_unlock_irqrestore(&iocq.lock, flags);
+        while (!list_empty(&flist)) {
+                pos = flist.next;
+                list_del(pos);
+                f = list_entry(pos, struct frame, head);
+                d = f->t->d;
+                skb = f->r_skb;
+                spin_lock_irqsave(&d->lock, flags);
+                if (f->buf) {
+                        f->buf->nframesout--;
+                        aoe_failbuf(d, f->buf);
                 }
+                aoe_freetframe(f);
+                spin_unlock_irqrestore(&d->lock, flags);
+                dev_kfree_skb(skb);
+                aoedev_put(d);
         }
 }
+
+int __init
+aoecmd_init(void)
+{
+        INIT_LIST_HEAD(&iocq.head);
+        spin_lock_init(&iocq.lock);
+        init_waitqueue_head(&ktiowq);
+        kts.name = "aoe_ktio";
+        kts.fn = ktio;
+        kts.waitq = &ktiowq;
+        kts.lock = &iocq.lock;
+        return aoe_ktstart(&kts);
+}
+
+void
+aoecmd_exit(void)
+{
+        aoe_ktstop(&kts);
+        aoe_flush_iocq();
+}
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index 6b5110a47458..90e5b537f94b 100644
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoedev.c
  * AoE device utility functions; maintains device list.
@@ -9,6 +9,9 @@
 #include <linux/netdevice.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/bitmap.h>
+#include <linux/kdev_t.h>
+#include <linux/moduleparam.h>
 #include "aoe.h"
 
 static void dummy_timer(ulong);
@@ -16,23 +19,121 @@ static void aoedev_freedev(struct aoedev *);
 static void freetgt(struct aoedev *d, struct aoetgt *t);
 static void skbpoolfree(struct aoedev *d);
 
+static int aoe_dyndevs = 1;
+module_param(aoe_dyndevs, int, 0644);
+MODULE_PARM_DESC(aoe_dyndevs, "Use dynamic minor numbers for devices.");
+
 static struct aoedev *devlist;
 static DEFINE_SPINLOCK(devlist_lock);
 
-struct aoedev *
-aoedev_by_aoeaddr(int maj, int min)
+/* Because some systems will have one, many, or no
+ *   - partitions,
+ *   - slots per shelf,
+ *   - or shelves,
+ * we need some flexibility in the way the minor numbers
+ * are allocated.  So they are dynamic.
+ */
+#define N_DEVS ((1U<<MINORBITS)/AOE_PARTITIONS)
+
+static DEFINE_SPINLOCK(used_minors_lock);
+static DECLARE_BITMAP(used_minors, N_DEVS);
+
+static int
+minor_get_dyn(ulong *sysminor)
 {
-        struct aoedev *d;
         ulong flags;
+        ulong n;
+        int error = 0;
+
+        spin_lock_irqsave(&used_minors_lock, flags);
+        n = find_first_zero_bit(used_minors, N_DEVS);
+        if (n < N_DEVS)
+                set_bit(n, used_minors);
+        else
+                error = -1;
+        spin_unlock_irqrestore(&used_minors_lock, flags);
+
+        *sysminor = n * AOE_PARTITIONS;
+        return error;
+}
 
-        spin_lock_irqsave(&devlist_lock, flags);
+static int
+minor_get_static(ulong *sysminor, ulong aoemaj, int aoemin)
+{
+        ulong flags;
+        ulong n;
+        int error = 0;
+        enum {
+                /* for backwards compatibility when !aoe_dyndevs,
+                 * a static number of supported slots per shelf */
+                NPERSHELF = 16,
+        };
+
+        n = aoemaj * NPERSHELF + aoemin;
+        if (aoemin >= NPERSHELF || n >= N_DEVS) {
+                pr_err("aoe: %s with e%ld.%d\n",
+                        "cannot use static minor device numbers",
+                        aoemaj, aoemin);
+                error = -1;
+        } else {
+                spin_lock_irqsave(&used_minors_lock, flags);
+                if (test_bit(n, used_minors)) {
+                        pr_err("aoe: %s %lu\n",
+                                "existing device already has static minor number",
+                                n);
+                        error = -1;
+                } else
+                        set_bit(n, used_minors);
+                spin_unlock_irqrestore(&used_minors_lock, flags);
+        }
 
-        for (d=devlist; d; d=d->next)
-                if (d->aoemajor == maj && d->aoeminor == min)
-                        break;
+        *sysminor = n;
+        return error;
+}
+
+static int
+minor_get(ulong *sysminor, ulong aoemaj, int aoemin)
+{
+        if (aoe_dyndevs)
+                return minor_get_dyn(sysminor);
+        else
+                return minor_get_static(sysminor, aoemaj, aoemin);
+}
+
+static void
+minor_free(ulong minor)
+{
+        ulong flags;
+
+        minor /= AOE_PARTITIONS;
+        BUG_ON(minor >= N_DEVS);
+
+        spin_lock_irqsave(&used_minors_lock, flags);
+        BUG_ON(!test_bit(minor, used_minors));
+        clear_bit(minor, used_minors);
+        spin_unlock_irqrestore(&used_minors_lock, flags);
+}
+
+/*
+ * Users who grab a pointer to the device with aoedev_by_aoeaddr
+ * automatically get a reference count and must be responsible
+ * for performing a aoedev_put.  With the addition of async
+ * kthread processing I'm no longer confident that we can
+ * guarantee consistency in the face of device flushes.
+ *
+ * For the time being, we only bother to add extra references for
+ * frames sitting on the iocq.  When the kthreads finish processing
+ * these frames, they will aoedev_put the device.
+ */
+
+void
+aoedev_put(struct aoedev *d)
+{
+        ulong flags;
 
+        spin_lock_irqsave(&devlist_lock, flags);
+        d->ref--;
         spin_unlock_irqrestore(&devlist_lock, flags);
-        return d;
 }
 
 static void
@@ -47,54 +148,74 @@ dummy_timer(ulong vp)
         add_timer(&d->timer);
 }
 
+static void
+aoe_failip(struct aoedev *d)
+{
+        struct request *rq;
+        struct bio *bio;
+        unsigned long n;
+
+        aoe_failbuf(d, d->ip.buf);
+
+        rq = d->ip.rq;
+        if (rq == NULL)
+                return;
+        while ((bio = d->ip.nxbio)) {
+                clear_bit(BIO_UPTODATE, &bio->bi_flags);
+                d->ip.nxbio = bio->bi_next;
+                n = (unsigned long) rq->special;
+                rq->special = (void *) --n;
+        }
+        if ((unsigned long) rq->special == 0)
+                aoe_end_request(d, rq, 0);
+}
+
 void
 aoedev_downdev(struct aoedev *d)
 {
-        struct aoetgt **t, **te;
-        struct frame *f, *e;
-        struct buf *buf;
-        struct bio *bio;
+        struct aoetgt *t, **tt, **te;
+        struct frame *f;
+        struct list_head *head, *pos, *nx;
+        struct request *rq;
+        int i;
 
-        t = d->targets;
-        te = t + NTARGETS;
-        for (; t < te && *t; t++) {
-                f = (*t)->frames;
-                e = f + (*t)->nframes;
-                for (; f < e; f->tag = FREETAG, f->buf = NULL, f++) {
-                        if (f->tag == FREETAG || f->buf == NULL)
-                                continue;
-                        buf = f->buf;
-                        bio = buf->bio;
-                        if (--buf->nframesout == 0
-                        && buf != d->inprocess) {
-                                mempool_free(buf, d->bufpool);
-                                bio_endio(bio, -EIO);
+        d->flags &= ~DEVFL_UP;
+
+        /* clean out active buffers */
+        for (i = 0; i < NFACTIVE; i++) {
+                head = &d->factive[i];
+                list_for_each_safe(pos, nx, head) {
+                        f = list_entry(pos, struct frame, head);
+                        list_del(pos);
+                        if (f->buf) {
+                                f->buf->nframesout--;
+                                aoe_failbuf(d, f->buf);
                         }
+                        aoe_freetframe(f);
                 }
-                (*t)->maxout = (*t)->nframes;
-                (*t)->nout = 0;
         }
-        buf = d->inprocess;
-        if (buf) {
-                bio = buf->bio;
-                mempool_free(buf, d->bufpool);
-                bio_endio(bio, -EIO);
+        /* reset window dressings */
+        tt = d->targets;
+        te = tt + NTARGETS;
+        for (; tt < te && (t = *tt); tt++) {
+                t->maxout = t->nframes;
+                t->nout = 0;
         }
-        d->inprocess = NULL;
+
+        /* clean out the in-process request (if any) */
+        aoe_failip(d);
         d->htgt = NULL;
 
-        while (!list_empty(&d->bufq)) {
-                buf = container_of(d->bufq.next, struct buf, bufs);
-                list_del(d->bufq.next);
-                bio = buf->bio;
-                mempool_free(buf, d->bufpool);
-                bio_endio(bio, -EIO);
+        /* fast fail all pending I/O */
+        if (d->blkq) {
+                while ((rq = blk_peek_request(d->blkq))) {
+                        blk_start_request(rq);
+                        aoe_end_request(d, rq, 1);
+                }
         }
 
         if (d->gd)
                 set_capacity(d->gd, 0);
-
-        d->flags &= ~DEVFL_UP;
 }
 
 static void
@@ -107,6 +228,7 @@ aoedev_freedev(struct aoedev *d)
                 aoedisk_rm_sysfs(d);
                 del_gendisk(d->gd);
                 put_disk(d->gd);
+                blk_cleanup_queue(d->blkq);
         }
         t = d->targets;
         e = t + NTARGETS;
@@ -115,7 +237,7 @@ aoedev_freedev(struct aoedev *d)
         if (d->bufpool)
                 mempool_destroy(d->bufpool);
         skbpoolfree(d);
-        blk_cleanup_queue(d->blkq);
+        minor_free(d->sysminor);
         kfree(d);
 }
 
@@ -142,7 +264,8 @@ aoedev_flush(const char __user *str, size_t cnt)
                 spin_lock(&d->lock);
                 if ((!all && (d->flags & DEVFL_UP))
                 || (d->flags & (DEVFL_GDALLOC|DEVFL_NEWSIZE))
-                || d->nopen) {
+                || d->nopen
+                || d->ref) {
                         spin_unlock(&d->lock);
                         dd = &d->next;
                         continue;
@@ -163,12 +286,15 @@ aoedev_flush(const char __user *str, size_t cnt)
         return 0;
 }
 
-/* I'm not really sure that this is a realistic problem, but if the
-network driver goes gonzo let's just leak memory after complaining. */
+/* This has been confirmed to occur once with Tms=3*1000 due to the
+ * driver changing link and not processing its transmit ring.  The
+ * problem is hard enough to solve by returning an error that I'm
+ * still punting on "solving" this.
+ */
 static void
 skbfree(struct sk_buff *skb)
 {
-        enum { Sms = 100, Tms = 3*1000};
+        enum { Sms = 250, Tms = 30 * 1000};
         int i = Tms / Sms;
 
         if (skb == NULL)
@@ -182,6 +308,7 @@ skbfree(struct sk_buff *skb)
                         "cannot free skb -- memory leaked.");
                 return;
         }
+        skb->truesize -= skb->data_len;
         skb_shinfo(skb)->nr_frags = skb->data_len = 0;
         skb_trim(skb, 0);
         dev_kfree_skb(skb);
@@ -198,26 +325,29 @@ skbpoolfree(struct aoedev *d)
         __skb_queue_head_init(&d->skbpool);
 }
 
-/* find it or malloc it */
+/* find it or allocate it */
 struct aoedev *
-aoedev_by_sysminor_m(ulong sysminor)
+aoedev_by_aoeaddr(ulong maj, int min, int do_alloc)
 {
         struct aoedev *d;
+        int i;
         ulong flags;
+        ulong sysminor;
 
         spin_lock_irqsave(&devlist_lock, flags);
 
         for (d=devlist; d; d=d->next)
-                if (d->sysminor == sysminor)
+                if (d->aoemajor == maj && d->aoeminor == min) {
+                        d->ref++;
                         break;
-        if (d)
+                }
+        if (d || !do_alloc || minor_get(&sysminor, maj, min) < 0)
                 goto out;
         d = kcalloc(1, sizeof *d, GFP_ATOMIC);
         if (!d)
                 goto out;
         INIT_WORK(&d->work, aoecmd_sleepwork);
         spin_lock_init(&d->lock);
-        skb_queue_head_init(&d->sendq);
         skb_queue_head_init(&d->skbpool);
         init_timer(&d->timer);
         d->timer.data = (ulong) d;
@@ -226,10 +356,12 @@ aoedev_by_sysminor_m(ulong sysminor)
         add_timer(&d->timer);
         d->bufpool = NULL;      /* defer to aoeblk_gdalloc */
         d->tgt = d->targets;
-        INIT_LIST_HEAD(&d->bufq);
+        d->ref = 1;
+        for (i = 0; i < NFACTIVE; i++)
+                INIT_LIST_HEAD(&d->factive[i]);
         d->sysminor = sysminor;
-        d->aoemajor = AOEMAJOR(sysminor);
-        d->aoeminor = AOEMINOR(sysminor);
+        d->aoemajor = maj;
+        d->aoeminor = min;
         d->mintimer = MINTIMER;
         d->next = devlist;
         devlist = d;
@@ -241,13 +373,23 @@ aoedev_by_sysminor_m(ulong sysminor)
 static void
 freetgt(struct aoedev *d, struct aoetgt *t)
 {
-        struct frame *f, *e;
+        struct frame *f;
+        struct list_head *pos, *nx, *head;
+        struct aoeif *ifp;
 
-        f = t->frames;
-        e = f + t->nframes;
-        for (; f < e; f++)
+        for (ifp = t->ifs; ifp < &t->ifs[NAOEIFS]; ++ifp) {
+                if (!ifp->nd)
+                        break;
+                dev_put(ifp->nd);
+        }
+
+        head = &t->ffree;
+        list_for_each_safe(pos, nx, head) {
+                list_del(pos);
+                f = list_entry(pos, struct frame, head);
                 skbfree(f->skb);
-        kfree(t->frames);
+                kfree(f);
+        }
         kfree(t);
 }
 
@@ -257,6 +399,7 @@ aoedev_exit(void)
         struct aoedev *d;
         ulong flags;
 
+        aoe_flush_iocq();
         while ((d = devlist)) {
                 devlist = d->next;
 
diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c
index 7f83ad90e76f..04793c2c701b 100644
--- a/drivers/block/aoe/aoemain.c
+++ b/drivers/block/aoe/aoemain.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoemain.c
  * Module initialization routines, discover timer
@@ -61,6 +61,7 @@ aoe_exit(void)
 
         aoenet_exit();
         unregister_blkdev(AOE_MAJOR, DEVICE_NAME);
+        aoecmd_exit();
         aoechr_exit();
         aoedev_exit();
         aoeblk_exit();          /* free cache after de-allocating bufs */
@@ -83,17 +84,20 @@ aoe_init(void)
         ret = aoenet_init();
         if (ret)
                 goto net_fail;
+        ret = aoecmd_init();
+        if (ret)
+                goto cmd_fail;
         ret = register_blkdev(AOE_MAJOR, DEVICE_NAME);
         if (ret < 0) {
                 printk(KERN_ERR "aoe: can't register major\n");
                 goto blkreg_fail;
         }
-
         printk(KERN_INFO "aoe: AoE v%s initialised.\n", VERSION);
         discover_timer(TINIT);
         return 0;
-
  blkreg_fail:
+        aoecmd_exit();
+ cmd_fail:
         aoenet_exit();
  net_fail:
         aoeblk_exit();
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 4d3bc0d49df5..162c6471275c 100644
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2012 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoenet.c
  * Ethernet portion of AoE driver
@@ -33,6 +33,9 @@ static char aoe_iflist[IFLISTSZ];
 module_param_string(aoe_iflist, aoe_iflist, IFLISTSZ, 0600);
 MODULE_PARM_DESC(aoe_iflist, "aoe_iflist=\"dev1 [dev2 ...]\"");
 
+static wait_queue_head_t txwq;
+static struct ktstate kts;
+
 #ifndef MODULE
 static int __init aoe_iflist_setup(char *str)
 {
@@ -44,6 +47,23 @@ static int __init aoe_iflist_setup(char *str)
 __setup("aoe_iflist=", aoe_iflist_setup);
 #endif
 
+static spinlock_t txlock;
+static struct sk_buff_head skbtxq;
+
+/* enters with txlock held */
+static int
+tx(void)
+{
+        struct sk_buff *skb;
+
+        while ((skb = skb_dequeue(&skbtxq))) {
+                spin_unlock_irq(&txlock);
+                dev_queue_xmit(skb);
+                spin_lock_irq(&txlock);
+        }
+        return 0;
+}
+
 int
 is_aoe_netif(struct net_device *ifp)
 {
@@ -88,10 +108,14 @@ void
 aoenet_xmit(struct sk_buff_head *queue)
 {
         struct sk_buff *skb, *tmp;
+        ulong flags;
 
         skb_queue_walk_safe(queue, skb, tmp) {
                 __skb_unlink(skb, queue);
-                dev_queue_xmit(skb);
+                spin_lock_irqsave(&txlock, flags);
+                skb_queue_tail(&skbtxq, skb);
+                spin_unlock_irqrestore(&txlock, flags);
+                wake_up(&txwq);
         }
 }
 
@@ -102,7 +126,9 @@ static int
 aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, struct net_device *orig_dev)
 {
         struct aoe_hdr *h;
+        struct aoe_atahdr *ah;
         u32 n;
+        int sn;
 
         if (dev_net(ifp) != &init_net)
                 goto exit;
@@ -110,13 +136,16 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
         skb = skb_share_check(skb, GFP_ATOMIC);
         if (skb == NULL)
                 return 0;
-        if (skb_linearize(skb))
-                goto exit;
         if (!is_aoe_netif(ifp))
                 goto exit;
         skb_push(skb, ETH_HLEN);        /* (1) */
-
-        h = (struct aoe_hdr *) skb_mac_header(skb);
+        sn = sizeof(*h) + sizeof(*ah);
+        if (skb->len >= sn) {
+                sn -= skb_headlen(skb);
+                if (sn > 0 && !__pskb_pull_tail(skb, sn))
+                        goto exit;
+        }
+        h = (struct aoe_hdr *) skb->data;
         n = get_unaligned_be32(&h->tag);
         if ((h->verfl & AOEFL_RSP) == 0 || (n & 1<<31))
                 goto exit;
@@ -137,7 +166,8 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
 
         switch (h->cmd) {
         case AOECMD_ATA:
-                aoecmd_ata_rsp(skb);
+                /* ata_rsp may keep skb for later processing or give it back */
+                skb = aoecmd_ata_rsp(skb);
                 break;
         case AOECMD_CFG:
                 aoecmd_cfg_rsp(skb);
@@ -145,8 +175,12 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
         default:
                 if (h->cmd >= AOECMD_VEND_MIN)
                         break;  /* don't complain about vendor commands */
-                printk(KERN_INFO "aoe: unknown cmd %d\n", h->cmd);
+                pr_info("aoe: unknown AoE command type 0x%02x\n", h->cmd);
+                break;
         }
+
+        if (!skb)
+                return 0;
 exit:
         dev_kfree_skb(skb);
         return 0;
@@ -160,6 +194,15 @@ static struct packet_type aoe_pt __read_mostly = {
 int __init
 aoenet_init(void)
 {
+        skb_queue_head_init(&skbtxq);
+        init_waitqueue_head(&txwq);
+        spin_lock_init(&txlock);
+        kts.lock = &txlock;
+        kts.fn = tx;
+        kts.waitq = &txwq;
+        kts.name = "aoe_tx";
+        if (aoe_ktstart(&kts))
+                return -EAGAIN;
         dev_add_pack(&aoe_pt);
         return 0;
 }
@@ -167,6 +210,8 @@ aoenet_init(void)
 void
 aoenet_exit(void)
 {
+        aoe_ktstop(&kts);
+        skb_queue_purge(&skbtxq);
         dev_remove_pack(&aoe_pt);
 }
 
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 0c03411c59eb..043ddcca4abf 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -78,6 +78,8 @@ static const char *ioctl_cmd_to_ascii(int cmd)
         case NBD_SET_SOCK: return "set-sock";
         case NBD_SET_BLKSIZE: return "set-blksize";
         case NBD_SET_SIZE: return "set-size";
+        case NBD_SET_TIMEOUT: return "set-timeout";
+        case NBD_SET_FLAGS: return "set-flags";
         case NBD_DO_IT: return "do-it";
         case NBD_CLEAR_SOCK: return "clear-sock";
         case NBD_CLEAR_QUE: return "clear-que";
@@ -96,6 +98,7 @@ static const char *nbdcmd_to_ascii(int cmd)
         case  NBD_CMD_READ: return "read";
         case NBD_CMD_WRITE: return "write";
         case  NBD_CMD_DISC: return "disconnect";
+        case  NBD_CMD_TRIM: return "trim/discard";
         }
         return "invalid";
 }
@@ -467,8 +470,12 @@ static void nbd_handle_req(struct nbd_device *nbd, struct request *req)
 
         nbd_cmd(req) = NBD_CMD_READ;
         if (rq_data_dir(req) == WRITE) {
-                nbd_cmd(req) = NBD_CMD_WRITE;
-                if (nbd->flags & NBD_READ_ONLY) {
+                if ((req->cmd_flags & REQ_DISCARD)) {
+                        WARN_ON(!(nbd->flags & NBD_FLAG_SEND_TRIM));
+                        nbd_cmd(req) = NBD_CMD_TRIM;
+                } else
+                        nbd_cmd(req) = NBD_CMD_WRITE;
+                if (nbd->flags & NBD_FLAG_READ_ONLY) {
                         dev_err(disk_to_dev(nbd->disk),
                                 "Write on read-only\n");
                         goto error_out;
@@ -651,6 +658,10 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                 nbd->xmit_timeout = arg * HZ;
                 return 0;
 
+        case NBD_SET_FLAGS:
+                nbd->flags = arg;
+                return 0;
+
         case NBD_SET_SIZE_BLOCKS:
                 nbd->bytesize = ((u64) arg) * nbd->blksize;
                 bdev->bd_inode->i_size = nbd->bytesize;
@@ -670,6 +681,10 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
 
                 mutex_unlock(&nbd->tx_lock);
 
+                if (nbd->flags & NBD_FLAG_SEND_TRIM)
+                        queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,
+                                nbd->disk->queue);
+
                 thread = kthread_create(nbd_thread, nbd, nbd->disk->disk_name);
                 if (IS_ERR(thread)) {
                         mutex_lock(&nbd->tx_lock);
@@ -687,6 +702,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                 nbd->file = NULL;
                 nbd_clear_que(nbd);
                 dev_warn(disk_to_dev(nbd->disk), "queue cleared\n");
+                queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue);
                 if (file)
                         fput(file);
                 nbd->bytesize = 0;
@@ -805,6 +821,9 @@ static int __init nbd_init(void)
                  * Tell the block layer that we are not a rotational device
                  */
                 queue_flag_set_unlocked(QUEUE_FLAG_NONROT, disk->queue);
+                disk->queue->limits.discard_granularity = 512;
+                disk->queue->limits.max_discard_sectors = UINT_MAX;
+                disk->queue->limits.discard_zeroes_data = 0;
         }
 
         if (register_blkdev(NBD_MAJOR, "nbd")) {
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index 47ff7e470d87..0c7d340b9ab9 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -799,7 +799,7 @@ static int mbcs_remove(struct cx_dev *dev)
         return 0;
 }
 
-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
         {
          .part_num = MBCS_PART_NUM,
          .mfg_num = MBCS_MFG_NUM,
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 3491654cdf7b..a815d44c70a4 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -582,7 +582,7 @@ void dmaengine_get(void)
                                 list_del_rcu(&device->global_node);
                                 break;
                         } else if (err)
-                                pr_err("%s: failed to get %s: (%d)\n",
+                                pr_debug("%s: failed to get %s: (%d)\n",
                                        __func__, dma_chan_name(chan), err);
                 }
         }
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 2091ae8f539a..2421d95130d4 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -982,7 +982,7 @@ int i2c_add_numbered_adapter(struct i2c_adapter *adap)
 
         if (adap->nr == -1) /* -1 means dynamically assign bus id */
                 return i2c_add_adapter(adap);
-        if (adap->nr & ~MAX_ID_MASK)
+        if (adap->nr & ~MAX_IDR_MASK)
                 return -EINVAL;
 
 retry:
diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
index 57d00caefc86..01451940393b 100644
--- a/drivers/ide/aec62xx.c
+++ b/drivers/ide/aec62xx.c
@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
         .cable_detect           = atp86x_cable_detect,
 };
 
-static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
+static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
         {       /* 0: AEC6210 */
                 .name           = DRV_NAME,
                 .init_chipset   = init_chipset_aec62xx,
diff --git a/drivers/ide/ali14xx.c b/drivers/ide/ali14xx.c
index d3be99fb4154..8f3570ee64c3 100644
--- a/drivers/ide/ali14xx.c
+++ b/drivers/ide/ali14xx.c
@@ -52,13 +52,13 @@
 
 /* port addresses for auto-detection */
 #define ALI_NUM_PORTS 4
-static const int ports[ALI_NUM_PORTS] __initdata =
+static const int ports[ALI_NUM_PORTS] __initconst =
         { 0x074, 0x0f4, 0x034, 0x0e4 };
 
 /* register initialization data */
 typedef struct { u8 reg, data; } RegInitializer;
 
-static const RegInitializer initData[] __initdata = {
+static const RegInitializer initData[] __initconst = {
         {0x01, 0x0f}, {0x02, 0x00}, {0x03, 0x00}, {0x04, 0x00},
         {0x05, 0x00}, {0x06, 0x00}, {0x07, 0x2b}, {0x0a, 0x0f},
         {0x25, 0x00}, {0x26, 0x00}, {0x27, 0x00}, {0x28, 0x00},
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
index 2c8016ad0e26..911a27ca356b 100644
--- a/drivers/ide/alim15x3.c
+++ b/drivers/ide/alim15x3.c
@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = {
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
-static const struct ide_port_info ali15x3_chipset __devinitdata = {
+static const struct ide_port_info ali15x3_chipset __devinitconst = {
         .name           = DRV_NAME,
         .init_chipset   = init_chipset_ali15x3,
         .init_hwif      = init_hwif_ali15x3,
diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
index 3747b2561f09..56fc99557ba2 100644
--- a/drivers/ide/amd74xx.c
+++ b/drivers/ide/amd74xx.c
@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
                 .udma_mask      = udma,                                 \
         }
 
-static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
+static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
         /* 0: AMD7401 */        DECLARE_AMD_DEV(0x00, ATA_UDMA2),
         /* 1: AMD7409 */        DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
         /* 2: AMD7411/7441 */   DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
index 15f0ead89f5c..cb43480b1bd5 100644
--- a/drivers/ide/atiixp.c
+++ b/drivers/ide/atiixp.c
@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
         .cable_detect           = atiixp_cable_detect,
 };
 
-static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
+static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
         {       /* 0: IXP200/300/400/700 */
                 .name           = DRV_NAME,
                 .enablebits     = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c
index 14717304b388..70f0a2754c13 100644
--- a/drivers/ide/cmd640.c
+++ b/drivers/ide/cmd640.c
@@ -685,7 +685,7 @@ static int pci_conf2(void)
         return 0;
 }
 
-static const struct ide_port_info cmd640_port_info __initdata = {
+static const struct ide_port_info cmd640_port_info __initconst = {
         .chipset                = ide_cmd640,
         .host_flags             = IDE_HFLAG_SERIALIZE |
                                   IDE_HFLAG_NO_DMA |
diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
index 5f80312e636b..d1fc43802f5d 100644
--- a/drivers/ide/cmd64x.c
+++ b/drivers/ide/cmd64x.c
@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
-static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
+static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
         {       /* 0: CMD643 */
                 .name           = DRV_NAME,
                 .init_chipset   = init_chipset_cmd64x,
diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
index 2c1e5f7cd261..14447621e60b 100644
--- a/drivers/ide/cs5520.c
+++ b/drivers/ide/cs5520.c
@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
         .set_dma_mode           = cs5520_set_dma_mode,
 };
 
-static const struct ide_port_info cyrix_chipset __devinitdata = {
+static const struct ide_port_info cyrix_chipset __devinitconst = {
         .name           = DRV_NAME,
         .enablebits     = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
         .port_ops       = &cs5520_port_ops,
diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
index 4dc4eb92b076..49b40ad59d1a 100644
--- a/drivers/ide/cs5530.c
+++ b/drivers/ide/cs5530.c
@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
         .udma_filter            = cs5530_udma_filter,
 };
 
-static const struct ide_port_info cs5530_chipset __devinitdata = {
+static const struct ide_port_info cs5530_chipset __devinitconst = {
         .name           = DRV_NAME,
         .init_chipset   = init_chipset_cs5530,
         .init_hwif      = init_hwif_cs5530,
diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
index 5059fafadf29..18d4c852602b 100644
--- a/drivers/ide/cs5535.c
+++ b/drivers/ide/cs5535.c
@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
         .cable_detect           = cs5535_cable_detect,
 };
 
-static const struct ide_port_info cs5535_chipset __devinitdata = {
+static const struct ide_port_info cs5535_chipset __devinitconst = {
         .name           = DRV_NAME,
         .port_ops       = &cs5535_port_ops,
         .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
index 847553fd8b96..3ffb49dab574 100644
--- a/drivers/ide/cy82c693.c
+++ b/drivers/ide/cy82c693.c
@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
         .set_dma_mode           = cy82c693_set_dma_mode,
 };
 
-static const struct ide_port_info cy82c693_chipset __devinitdata = {
+static const struct ide_port_info cy82c693_chipset __devinitconst = {
         .name           = DRV_NAME,
         .init_iops      = init_iops_cy82c693,
         .port_ops       = &cy82c693_port_ops,
diff --git a/drivers/ide/dtc2278.c b/drivers/ide/dtc2278.c
index 46af4743b3e6..8722df329cbe 100644
--- a/drivers/ide/dtc2278.c
+++ b/drivers/ide/dtc2278.c
@@ -91,7 +91,7 @@ static const struct ide_port_ops dtc2278_port_ops = {
         .set_pio_mode           = dtc2278_set_pio_mode,
 };
 
-static const struct ide_port_info dtc2278_port_info __initdata = {
+static const struct ide_port_info dtc2278_port_info __initconst = {
         .name                   = DRV_NAME,
         .chipset                = ide_dtc2278,
         .port_ops               = &dtc2278_port_ops,
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
index 58c51cddc100..4aec3b87ff91 100644
--- a/drivers/ide/hpt366.c
+++ b/drivers/ide/hpt366.c
@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
         }
 };
 
-static const struct hpt_info hpt36x __devinitdata = {
+static const struct hpt_info hpt36x __devinitconst = {
         .chip_name      = "HPT36x",
         .chip_type      = HPT36x,
         .udma_mask      = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitdata = {
         .timings        = &hpt36x_timings
 };
 
-static const struct hpt_info hpt370 __devinitdata = {
+static const struct hpt_info hpt370 __devinitconst = {
         .chip_name      = "HPT370",
         .chip_type      = HPT370,
         .udma_mask      = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitdata = {
         .timings        = &hpt37x_timings
 };
 
-static const struct hpt_info hpt370a __devinitdata = {
+static const struct hpt_info hpt370a __devinitconst = {
         .chip_name      = "HPT370A",
         .chip_type      = HPT370A,
         .udma_mask      = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitdata = {
         .timings        = &hpt37x_timings
 };
 
-static const struct hpt_info hpt374 __devinitdata = {
+static const struct hpt_info hpt374 __devinitconst = {
         .chip_name      = "HPT374",
         .chip_type      = HPT374,
         .udma_mask      = ATA_UDMA5,
@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitdata = {
         .timings        = &hpt37x_timings
 };
 
-static const struct hpt_info hpt372 __devinitdata = {
+static const struct hpt_info hpt372 __devinitconst = {
         .chip_name      = "HPT372",
         .chip_type      = HPT372,
         .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitdata = {
         .timings        = &hpt37x_timings
 };
 
-static const struct hpt_info hpt372a __devinitdata = {
+static const struct hpt_info hpt372a __devinitconst = {
         .chip_name      = "HPT372A",
         .chip_type      = HPT372A,
         .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitdata = {
         .timings        = &hpt37x_timings
 };
 
-static const struct hpt_info hpt302 __devinitdata = {
+static const struct hpt_info hpt302 __devinitconst = {
         .chip_name      = "HPT302",
         .chip_type      = HPT302,
         .udma_mask      = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitdata = {
         .timings        = &hpt37x_timings
 };
 
-static const struct hpt_info hpt371 __devinitdata = {
+static const struct hpt_info hpt371 __devinitconst = {
         .chip_name      = "HPT371",
         .chip_type      = HPT371,
         .udma_mask      = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitdata = {
         .timings        = &hpt37x_timings
 };
 
-static const struct hpt_info hpt372n __devinitdata = {
+static const struct hpt_info hpt372n __devinitconst = {
         .chip_name      = "HPT372N",
         .chip_type      = HPT372N,
         .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitdata = {
         .timings        = &hpt37x_timings
 };
 
-static const struct hpt_info hpt302n __devinitdata = {
+static const struct hpt_info hpt302n __devinitconst = {
         .chip_name      = "HPT302N",
         .chip_type      = HPT302N,
         .udma_mask      = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitdata = {
         .timings        = &hpt37x_timings
 };
 
-static const struct hpt_info hpt371n __devinitdata = {
+static const struct hpt_info hpt371n __devinitconst = {
         .chip_name      = "HPT371N",
         .chip_type      = HPT371N,
         .udma_mask      = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
-static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
+static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
         {       /* 0: HPT36x */
                 .name           = DRV_NAME,
                 .init_chipset   = init_chipset_hpt366,
diff --git a/drivers/ide/ht6560b.c b/drivers/ide/ht6560b.c
index 986f2513eab4..1e0fd3aa962d 100644
--- a/drivers/ide/ht6560b.c
+++ b/drivers/ide/ht6560b.c
@@ -341,7 +341,7 @@ static const struct ide_port_ops ht6560b_port_ops = {
         .set_pio_mode           = ht6560b_set_pio_mode,
 };
 
-static const struct ide_port_info ht6560b_port_info __initdata = {
+static const struct ide_port_info ht6560b_port_info __initconst = {
         .name                   = DRV_NAME,
         .chipset                = ide_ht6560b,
         .tp_ops                 = &ht6560b_tp_ops,
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index bcb507b0cfd4..e640d0ac3af6 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -451,7 +451,7 @@ err_free:
         return ret;
 }
 
-static const struct ide_port_info icside_v6_port_info __initdata = {
+static const struct ide_port_info icside_v6_port_info __initconst = {
         .init_dma               = icside_dma_off_init,
         .port_ops               = &icside_v6_no_dma_port_ops,
         .host_flags             = IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO,
diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
index 7f56b738d762..dab5b670bfbf 100644
--- a/drivers/ide/ide-pci-generic.c
+++ b/drivers/ide/ide-pci-generic.c
@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
                 .udma_mask      = ATA_UDMA6, \
         }
 
-static const struct ide_port_info generic_chipsets[] __devinitdata = {
+static const struct ide_port_info generic_chipsets[] __devinitconst = {
         /*  0: Unknown */
         DECLARE_GENERIC_PCI_DEV(0),
 
diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
index 560e66d07659..d5dd180c4b85 100644
--- a/drivers/ide/it8172.c
+++ b/drivers/ide/it8172.c
@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
         .set_dma_mode   = it8172_set_dma_mode,
 };
 
-static const struct ide_port_info it8172_port_info __devinitdata = {
+static const struct ide_port_info it8172_port_info __devinitconst = {
         .name           = DRV_NAME,
         .port_ops       = &it8172_port_ops,
         .enablebits     = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
index 46816ba26416..1847aeb5450a 100644
--- a/drivers/ide/it8213.c
+++ b/drivers/ide/it8213.c
@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
         .cable_detect           = it8213_cable_detect,
 };
 
-static const struct ide_port_info it8213_chipset __devinitdata = {
+static const struct ide_port_info it8213_chipset __devinitconst = {
         .name           = DRV_NAME,
         .enablebits     = { {0x41, 0x80, 0x80} },
         .port_ops       = &it8213_port_ops,
diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
index 2e3169f2acda..c5611dbca342 100644
--- a/drivers/ide/it821x.c
+++ b/drivers/ide/it821x.c
@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
         .cable_detect           = it821x_cable_detect,
 };
 
-static const struct ide_port_info it821x_chipset __devinitdata = {
+static const struct ide_port_info it821x_chipset __devinitconst = {
         .name           = DRV_NAME,
         .init_chipset   = init_chipset_it821x,
         .init_hwif      = init_hwif_it821x,
diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
index 74c2c4a6d909..efddd7d9f92d 100644
--- a/drivers/ide/jmicron.c
+++ b/drivers/ide/jmicron.c
@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
         .cable_detect           = jmicron_cable_detect,
 };
 
-static const struct ide_port_info jmicron_chipset __devinitdata = {
+static const struct ide_port_info jmicron_chipset __devinitconst = {
         .name           = DRV_NAME,
         .enablebits     = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
         .port_ops       = &jmicron_port_ops,
diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
index 95327a2c2422..73f78d872d55 100644
--- a/drivers/ide/ns87415.c
+++ b/drivers/ide/ns87415.c
@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
         .dma_sff_read_status    = superio_dma_sff_read_status,
 };
 
-static const struct ide_port_info ns87415_chipset __devinitdata = {
+static const struct ide_port_info ns87415_chipset __devinitconst = {
         .name           = DRV_NAME,
         .init_hwif      = init_hwif_ns87415,
         .tp_ops         = &ns87415_tp_ops,
diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
index 1a53a4c375ed..39edc66cb96c 100644
--- a/drivers/ide/opti621.c
+++ b/drivers/ide/opti621.c
@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
         .set_pio_mode           = opti621_set_pio_mode,
 };
 
-static const struct ide_port_info opti621_chipset __devinitdata = {
+static const struct ide_port_info opti621_chipset __devinitconst = {
         .name           = DRV_NAME,
         .enablebits     = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
         .port_ops       = &opti621_port_ops,
diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
index 9546fe2a93f7..2e5ceb62fb3b 100644
--- a/drivers/ide/pdc202xx_new.c
+++ b/drivers/ide/pdc202xx_new.c
@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
                 .udma_mask      = udma, \
         }
 
-static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
+static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
         /* 0: PDC202{68,70} */          DECLARE_PDCNEW_DEV(ATA_UDMA5),
         /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
 };
diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
index 3a35ec6193d2..563451096812 100644
--- a/drivers/ide/pdc202xx_old.c
+++ b/drivers/ide/pdc202xx_old.c
@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
                 .max_sectors    = sectors, \
         }
 
-static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
+static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
         {       /* 0: PDC20246 */
                 .name           = DRV_NAME,
                 .init_chipset   = init_chipset_pdc202xx,
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
index 1892e81fb00f..fe0fd60cfc09 100644
--- a/drivers/ide/piix.c
+++ b/drivers/ide/piix.c
@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
                 .udma_mask      = udma, \
         }
 
-static const struct ide_port_info piix_pci_info[] __devinitdata = {
+static const struct ide_port_info piix_pci_info[] __devinitconst = {
         /* 0: MPIIX */
         {       /*
                  * MPIIX actually has only a single IDE channel mapped to
diff --git a/drivers/ide/qd65xx.c b/drivers/ide/qd65xx.c
index e03f4f19c1d6..a6fb6a894c7b 100644
--- a/drivers/ide/qd65xx.c
+++ b/drivers/ide/qd65xx.c
@@ -335,7 +335,7 @@ static const struct ide_port_ops qd6580_port_ops = {
         .set_pio_mode           = qd6580_set_pio_mode,
 };
 
-static const struct ide_port_info qd65xx_port_info __initdata = {
+static const struct ide_port_info qd65xx_port_info __initconst = {
         .name                   = DRV_NAME,
         .tp_ops                 = &qd65xx_tp_ops,
         .chipset                = ide_qd65xx,
diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
index a6414a884eb1..c04173e9fc38 100644
--- a/drivers/ide/rz1000.c
+++ b/drivers/ide/rz1000.c
@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
         }
 }
 
-static const struct ide_port_info rz1000_chipset __devinitdata = {
+static const struct ide_port_info rz1000_chipset __devinitconst = {
         .name           = DRV_NAME,
         .host_flags     = IDE_HFLAG_NO_DMA,
 };
diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
index 356b9b504ffd..d4758ebe77da 100644
--- a/drivers/ide/sc1200.c
+++ b/drivers/ide/sc1200.c
@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
-static const struct ide_port_info sc1200_chipset __devinitdata = {
+static const struct ide_port_info sc1200_chipset __devinitconst = {
         .name           = DRV_NAME,
         .port_ops       = &sc1200_port_ops,
         .dma_ops        = &sc1200_dma_ops,
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index b7f5b0c4310c..970103810021 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
         .dma_sff_read_status    = scc_dma_sff_read_status,
 };
 
-static const struct ide_port_info scc_chipset __devinitdata = {
+static const struct ide_port_info scc_chipset __devinitconst = {
         .name           = "sccIDE",
         .init_iops      = init_iops_scc,
         .init_dma       = scc_init_dma,
diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
index 35fb8dabb55d..24d72ef23df7 100644
--- a/drivers/ide/serverworks.c
+++ b/drivers/ide/serverworks.c
@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
         .cable_detect           = svwks_cable_detect,
 };
 
-static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
+static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
         {       /* 0: OSB4 */
                 .name           = DRV_NAME,
                 .init_chipset   = init_chipset_svwks,
diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
index ddeda444a27a..46f7e30d3790 100644
--- a/drivers/ide/siimage.c
+++ b/drivers/ide/siimage.c
@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
                 .udma_mask      = ATA_UDMA6,            \
         }
 
-static const struct ide_port_info siimage_chipsets[] __devinitdata = {
+static const struct ide_port_info siimage_chipsets[] __devinitconst = {
         /* 0: SiI680 */  DECLARE_SII_DEV(&sil_pata_port_ops),
         /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
 };
diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
index 4a0022567758..09e61b4c5e94 100644
--- a/drivers/ide/sis5513.c
+++ b/drivers/ide/sis5513.c
@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
         .cable_detect           = sis_cable_detect,
 };
 
-static const struct ide_port_info sis5513_chipset __devinitdata = {
+static const struct ide_port_info sis5513_chipset __devinitconst = {
         .name           = DRV_NAME,
         .init_chipset   = init_chipset_sis5513,
         .enablebits     = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
index f21dc2ad7682..d051cd224bdb 100644
--- a/drivers/ide/sl82c105.c
+++ b/drivers/ide/sl82c105.c
@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
-static const struct ide_port_info sl82c105_chipset __devinitdata = {
+static const struct ide_port_info sl82c105_chipset __devinitconst = {
         .name           = DRV_NAME,
         .init_chipset   = init_chipset_sl82c105,
         .enablebits     = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
index 864ffe0e26d9..863a5e9283ca 100644
--- a/drivers/ide/slc90e66.c
+++ b/drivers/ide/slc90e66.c
@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
         .cable_detect           = slc90e66_cable_detect,
 };
 
-static const struct ide_port_info slc90e66_chipset __devinitdata = {
+static const struct ide_port_info slc90e66_chipset __devinitconst = {
         .name           = DRV_NAME,
         .enablebits     = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
         .port_ops       = &slc90e66_port_ops,
diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
index 4799d5c384e7..17946785ebf6 100644
--- a/drivers/ide/tc86c001.c
+++ b/drivers/ide/tc86c001.c
@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
         .dma_sff_read_status    = ide_dma_sff_read_status,
 };
 
-static const struct ide_port_info tc86c001_chipset __devinitdata = {
+static const struct ide_port_info tc86c001_chipset __devinitconst = {
         .name           = DRV_NAME,
         .init_hwif      = init_hwif_tc86c001,
         .port_ops       = &tc86c001_port_ops,
diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
index 281c91426345..55ce1b80efcb 100644
--- a/drivers/ide/triflex.c
+++ b/drivers/ide/triflex.c
@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
         .set_dma_mode           = triflex_set_mode,
 };
 
-static const struct ide_port_info triflex_device __devinitdata = {
+static const struct ide_port_info triflex_device __devinitconst = {
         .name           = DRV_NAME,
         .enablebits     = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
         .port_ops       = &triflex_port_ops,
diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
index 4b42ca091534..e494a98a43a9 100644
--- a/drivers/ide/trm290.c
+++ b/drivers/ide/trm290.c
@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
         .dma_check              = trm290_dma_check,
 };
 
-static const struct ide_port_info trm290_chipset __devinitdata = {
+static const struct ide_port_info trm290_chipset __devinitconst = {
         .name           = DRV_NAME,
         .init_hwif      = init_hwif_trm290,
         .tp_ops         = &trm290_tp_ops,
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index 7002765b593c..91d49dd957ef 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -117,7 +117,7 @@ static const struct ide_port_ops tx4938ide_port_ops = {
         .set_pio_mode           = tx4938ide_set_pio_mode,
 };
 
-static const struct ide_port_info tx4938ide_port_info __initdata = {
+static const struct ide_port_info tx4938ide_port_info __initconst = {
         .port_ops               = &tx4938ide_port_ops,
 #ifdef __BIG_ENDIAN
         .tp_ops                 = &tx4938ide_tp_ops,
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index 71c231954972..c0ab800b7bb3 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -522,7 +522,7 @@ static const struct ide_dma_ops tx4939ide_dma_ops = {
         .dma_sff_read_status    = tx4939ide_dma_sff_read_status,
 };
 
-static const struct ide_port_info tx4939ide_port_info __initdata = {
+static const struct ide_port_info tx4939ide_port_info __initconst = {
         .init_hwif              = tx4939ide_init_hwif,
         .init_dma               = tx4939ide_init_dma,
         .port_ops               = &tx4939ide_port_ops,
diff --git a/drivers/ide/umc8672.c b/drivers/ide/umc8672.c
index 5cfb78120669..3aa0fea0f3d9 100644
--- a/drivers/ide/umc8672.c
+++ b/drivers/ide/umc8672.c
@@ -128,7 +128,7 @@ static const struct ide_port_ops umc8672_port_ops = {
         .set_pio_mode           = umc_set_pio_mode,
 };
 
-static const struct ide_port_info umc8672_port_info __initdata = {
+static const struct ide_port_info umc8672_port_info __initconst = {
         .name                   = DRV_NAME,
         .chipset                = ide_umc8672,
         .port_ops               = &umc8672_port_ops,
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
index f46f49cfcc28..eb7767864d10 100644
--- a/drivers/ide/via82cxxx.c
+++ b/drivers/ide/via82cxxx.c
@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
         .cable_detect           = via82cxxx_cable_detect,
 };
 
-static const struct ide_port_info via82cxxx_chipset __devinitdata = {
+static const struct ide_port_info via82cxxx_chipset __devinitconst = {
         .name           = DRV_NAME,
         .init_chipset   = init_chipset_via82cxxx,
         .enablebits     = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index d67999f6e34a..394fea2ba1bc 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -390,7 +390,7 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv)
                 ret = idr_get_new_above(&cm.local_id_table, cm_id_priv,
                                         next_id, &id);
                 if (!ret)
-                        next_id = ((unsigned) id + 1) & MAX_ID_MASK;
+                        next_id = ((unsigned) id + 1) & MAX_IDR_MASK;
                 spin_unlock_irqrestore(&cm.lock, flags);
         } while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) );
 
diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c
index e25e4dafb8a8..80079e5a2e30 100644
--- a/drivers/infiniband/hw/mlx4/cm.c
+++ b/drivers/infiniband/hw/mlx4/cm.c
@@ -225,7 +225,7 @@ id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id)
                 ret = idr_get_new_above(&sriov->pv_id_table, ent,
                                         next_id, &id);
                 if (!ret) {
-                        next_id = ((unsigned) id + 1) & MAX_ID_MASK;
+                        next_id = ((unsigned) id + 1) & MAX_IDR_MASK;
                         ent->pv_cm_id = (u32)id;
                         sl_id_map_add(ibdev, ent);
                 }
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 20e5c2cda430..ef87310b7662 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
  * MacIO is matched against any Apple ID, it's probe() function
  * will then decide wether it applies or not
  */
-static const struct pci_device_id __devinitdata pci_ids [] = { {
+static const struct pci_device_id __devinitconst pci_ids[] = { {
         .vendor         = PCI_VENDOR_ID_APPLE,
         .device         = PCI_ANY_ID,
         .subvendor      = PCI_ANY_ID,
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 3d6d9beb18d4..8fefc961ec06 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -374,21 +374,21 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo)
 }
 #endif
 
-static const __devinitdata struct reg_default wm8994_revc_patch[] = {
+static const __devinitconst struct reg_default wm8994_revc_patch[] = {
         { 0x102, 0x3 },
         { 0x56, 0x3 },
         { 0x817, 0x0 },
         { 0x102, 0x0 },
 };
 
-static const __devinitdata struct reg_default wm8958_reva_patch[] = {
+static const __devinitconst struct reg_default wm8958_reva_patch[] = {
         { 0x102, 0x3 },
         { 0xcb, 0x81 },
         { 0x817, 0x0 },
         { 0x102, 0x0 },
 };
 
-static const __devinitdata struct reg_default wm1811_reva_patch[] = {
+static const __devinitconst struct reg_default wm1811_reva_patch[] = {
         { 0x102, 0x3 },
         { 0x56, 0xc07 },
         { 0x5d, 0x7e },
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 504da715a41a..9722d43d6140 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -653,7 +653,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
         .probe          = via_probe,
 };
 
-static const struct pci_device_id pci_ids[] __devinitdata = {
+static const struct pci_device_id pci_ids[] __devinitconst = {
         {
                 .vendor         = PCI_VENDOR_ID_RICOH,
                 .device         = PCI_DEVICE_ID_RICOH_R5C822,
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 034c16b60e96..adc3708d8829 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -56,7 +56,7 @@
 #include <linux/kernel.h>
 #include <linux/can.h>
 
-static __initdata const char banner[] =
+static __initconst const char banner[] =
         KERN_INFO "slcan: serial line CAN interface driver\n";
 
 MODULE_ALIAS_LDISC(N_SLCAN);
diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
index 4f93c0be0053..0a2a5ee79a17 100644
--- a/drivers/net/can/vcan.c
+++ b/drivers/net/can/vcan.c
@@ -49,7 +49,7 @@
 #include <linux/slab.h>
 #include <net/rtnetlink.h>
 
-static __initdata const char banner[] =
+static __initconst const char banner[] =
         KERN_INFO "vcan: Virtual CAN interface driver\n";
 
 MODULE_DESCRIPTION("virtual CAN interface");
diff --git a/drivers/net/ethernet/8390/ne3210.c b/drivers/net/ethernet/8390/ne3210.c
index a2f8b2b8e27c..e3f57427d5c5 100644
--- a/drivers/net/ethernet/8390/ne3210.c
+++ b/drivers/net/ethernet/8390/ne3210.c
@@ -81,7 +81,7 @@ static void ne3210_block_output(struct net_device *dev, int count, const unsigne
 
 static unsigned char irq_map[] __initdata = {15, 12, 11, 10, 9, 7, 5, 3};
 static unsigned int shmem_map[] __initdata = {0xff0, 0xfe0, 0xfff0, 0xd8, 0xffe0, 0xffc0, 0xd0, 0x0};
-static const char *ifmap[] __initdata = {"UTP", "?", "BNC", "AUI"};
+static const char * const ifmap[] __initconst = {"UTP", "?", "BNC", "AUI"};
 static int ifmap_val[] __initdata = {
                 IF_PORT_10BASET,
                 IF_PORT_UNKNOWN,
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index d920a529ba22..5b65992c2a0a 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -295,7 +295,7 @@ MODULE_DEVICE_TABLE(pci, starfire_pci_tbl);
 static const struct chip_info {
         const char *name;
         int drv_flags;
-} netdrv_tbl[] __devinitdata = {
+} netdrv_tbl[] __devinitconst = {
         { "Adaptec Starfire 6915", CanHaveMII },
 };
 
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 55a2e3795055..d19f82f7597a 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -702,7 +702,7 @@ struct atl1c_platform_patch {
         u32 patch_flag;
 #define ATL1C_LINK_PATCH        0x1
 };
-static const struct atl1c_platform_patch plats[] __devinitdata = {
+static const struct atl1c_platform_patch plats[] __devinitconst = {
 {0x2060, 0xC1, 0x1019, 0x8152, 0x1},
 {0x2060, 0xC1, 0x1019, 0x2060, 0x1},
 {0x2060, 0xC1, 0x1019, 0xE000, 0x1},
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 57d64b80fd72..623dd8635c46 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -2845,7 +2845,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
  */
 
 #define ATL2_PARAM(X, desc) \
-    static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
+    static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
     MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
     MODULE_PARM_DESC(X, desc);
 #else
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index 61cc09342865..77335853ac36 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -661,9 +661,6 @@ static netdev_tx_t de_start_xmit (struct sk_buff *skb,
    new frame, not around filling de->setup_frame.  This is non-deterministic
    when re-entered but still correct. */
 
-#undef set_bit_le
-#define set_bit_le(i,p) do { ((char *)(p))[(i)/8] |= (1<<((i)%8)); } while(0)
-
 static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 {
         struct de_private *de = netdev_priv(dev);
@@ -673,12 +670,12 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
         u16 *eaddrs;
 
         memset(hash_table, 0, sizeof(hash_table));
-        set_bit_le(255, hash_table);                    /* Broadcast entry */
+        __set_bit_le(255, hash_table);                  /* Broadcast entry */
         /* This should work on big-endian machines as well. */
         netdev_for_each_mc_addr(ha, dev) {
                 int index = ether_crc_le(ETH_ALEN, ha->addr) & 0x1ff;
 
-                set_bit_le(index, hash_table);
+                __set_bit_le(index, hash_table);
         }
 
         for (i = 0; i < 32; i++) {
diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
index ed7d1dcd9566..44f7e8e82d85 100644
--- a/drivers/net/ethernet/dec/tulip/eeprom.c
+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
   {NULL}};
 
 
-static const char *block_name[] __devinitdata = {
+static const char *const block_name[] __devinitconst = {
         "21140 non-MII",
         "21140 MII PHY",
         "21142 Serial PHY",
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index c4f37aca2269..885700a19978 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -1010,9 +1010,6 @@ static int private_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
    new frame, not around filling tp->setup_frame.  This is non-deterministic
    when re-entered but still correct. */
 
-#undef set_bit_le
-#define set_bit_le(i,p) do { ((char *)(p))[(i)/8] |= (1<<((i)%8)); } while(0)
-
 static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
 {
         struct tulip_private *tp = netdev_priv(dev);
@@ -1022,12 +1019,12 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
         u16 *eaddrs;
 
         memset(hash_table, 0, sizeof(hash_table));
-        set_bit_le(255, hash_table);                    /* Broadcast entry */
+        __set_bit_le(255, hash_table);                  /* Broadcast entry */
         /* This should work on big-endian machines as well. */
         netdev_for_each_mc_addr(ha, dev) {
                 int index = ether_crc_le(ETH_ALEN, ha->addr) & 0x1ff;
 
-                set_bit_le(index, hash_table);
+                __set_bit_le(index, hash_table);
         }
         for (i = 0; i < 32; i++) {
                 *setup_frm++ = hash_table[i];
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index 4d1ffca83c82..7c1ec4d7920b 100644
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -236,7 +236,7 @@ struct pci_id_info {
         int drv_flags;          /* Driver use, intended as capability flags. */
 };
 
-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
         {                               /* Sometime a Level-One switch card. */
           "Winbond W89c840",    CanHaveMII | HasBrokenTx | FDXOnNoMII},
         { "Winbond W89c840",    CanHaveMII | HasBrokenTx},
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index d7bb52a7bda1..3b83588e51f6 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -218,7 +218,7 @@ enum {
 struct pci_id_info {
         const char *name;
 };
-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
         {"D-Link DFE-550TX FAST Ethernet Adapter"},
         {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
         {"D-Link DFE-580TX 4 port Server Adapter"},
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index 9d71c9cc300b..0e4a0ac86aa8 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -150,7 +150,7 @@ struct chip_info {
         int flags;
 };
 
-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
+static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
         { "100/10M Ethernet PCI Adapter",       HAS_MII_XCVR },
         { "100/10M Ethernet PCI Adapter",       HAS_CHIP_XCVR },
         { "1000/100/10M Ethernet PCI Adapter",  HAS_MII_XCVR },
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
index b528e52a8ee1..2a0c9dc48eb3 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
@@ -38,7 +38,7 @@ static inline void writeq(u64 val, void __iomem *addr)
 }
 #endif
 
-static const struct crb_128M_2M_block_map
+static struct crb_128M_2M_block_map
 crb_128M_2M_map[64] __cacheline_aligned_in_smp = {
     {{{0, 0,         0,         0} } },         /* 0: PCI */
     {{{1, 0x0100000, 0x0102000, 0x120000},      /* 1: PCIE */
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index 1d83565cc6af..3ed7add23c12 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -228,7 +228,7 @@ typedef enum {
 static const struct {
         const char *name;
         u32 hw_flags;
-} board_info[] __devinitdata = {
+} board_info[] __devinitconst = {
         { "RealTek RTL8139", RTL8139_CAPS },
         { "RealTek RTL8129", RTL8129_CAPS },
 };
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 96bd980e828d..4f86d0cd516a 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2019,14 +2019,14 @@ static void efx_set_rx_mode(struct net_device *net_dev)
                 netdev_for_each_mc_addr(ha, net_dev) {
                         crc = ether_crc_le(ETH_ALEN, ha->addr);
                         bit = crc & (EFX_MCAST_HASH_ENTRIES - 1);
-                        set_bit_le(bit, mc_hash->byte);
+                        __set_bit_le(bit, mc_hash);
                 }
 
                 /* Broadcast packets go through the multicast hash filter.
                  * ether_crc_le() of the broadcast address is 0xbe2612ff
                  * so we always add bit 0xff to the mask.
                  */
-                set_bit_le(0xff, mc_hash->byte);
+                __set_bit_le(0xff, mc_hash);
         }
 
         if (efx->port_enabled)
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index c1a010cda89b..576a31091165 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -1101,18 +1101,6 @@ static inline struct efx_rx_buffer *efx_rx_buffer(struct efx_rx_queue *rx_queue,
         return &rx_queue->buffer[index];
 }
 
-/* Set bit in a little-endian bitfield */
-static inline void set_bit_le(unsigned nr, unsigned char *addr)
-{
-        addr[nr / 8] |= (1 << (nr % 8));
-}
-
-/* Clear bit in a little-endian bitfield */
-static inline void clear_bit_le(unsigned nr, unsigned char *addr)
-{
-        addr[nr / 8] &= ~(1 << (nr % 8));
-}
-
 
 /**
  * EFX_MAX_FRAME_LEN - calculate maximum frame length
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
index cdff40b65729..aab7cacb2e34 100644
--- a/drivers/net/ethernet/sfc/nic.c
+++ b/drivers/net/ethernet/sfc/nic.c
@@ -472,9 +472,9 @@ void efx_nic_init_tx(struct efx_tx_queue *tx_queue)
 
                 efx_reado(efx, &reg, FR_AA_TX_CHKSM_CFG);
                 if (tx_queue->queue & EFX_TXQ_TYPE_OFFLOAD)
-                        clear_bit_le(tx_queue->queue, (void *)&reg);
+                        __clear_bit_le(tx_queue->queue, &reg);
                 else
-                        set_bit_le(tx_queue->queue, (void *)&reg);
+                        __set_bit_le(tx_queue->queue, &reg);
                 efx_writeo(efx, &reg, FR_AA_TX_CHKSM_CFG);
         }
 
diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
index 4613591b43e7..d8166012b7d4 100644
--- a/drivers/net/ethernet/sis/sis190.c
+++ b/drivers/net/ethernet/sis/sis190.c
@@ -1618,7 +1618,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
                                                   struct net_device *dev)
 {
-        static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
+        static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
         struct sis190_private *tp = netdev_priv(dev);
         struct pci_dev *isa_bridge;
         u8 reg, tmp8;
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 64783a0d545a..1450e33fc250 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -811,9 +811,9 @@ static struct tty_ldisc_ops sp_ldisc = {
 
 /* Initialize 6pack control device -- register 6pack line discipline */
 
-static const char msg_banner[]  __initdata = KERN_INFO \
+static const char msg_banner[]  __initconst = KERN_INFO \
         "AX.25: 6pack driver, " SIXPACK_VERSION "\n";
-static const char msg_regfail[] __initdata = KERN_ERR  \
+static const char msg_regfail[] __initconst = KERN_ERR  \
         "6pack: can't register line discipline (err = %d)\n";
 
 static int __init sixpack_init_driver(void)
@@ -829,7 +829,7 @@ static int __init sixpack_init_driver(void)
         return status;
 }
 
-static const char msg_unregfail[] __exitdata = KERN_ERR \
+static const char msg_unregfail[] = KERN_ERR \
         "6pack: can't unregister line discipline (err = %d)\n";
 
 static void __exit sixpack_exit_driver(void)
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 76d54774ba82..c2e5497397d5 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -87,7 +87,7 @@
 
 #include <linux/bpqether.h>
 
-static const char banner[] __initdata = KERN_INFO \
+static const char banner[] __initconst = KERN_INFO \
         "AX.25: bpqether driver version 004\n";
 
 static char bcast_addr[6]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 2c0894a92abd..8e01c457015b 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -997,9 +997,9 @@ static struct tty_ldisc_ops ax_ldisc = {
         .write_wakeup   = mkiss_write_wakeup
 };
 
-static const char banner[] __initdata = KERN_INFO \
+static const char banner[] __initconst = KERN_INFO \
         "mkiss: AX.25 Multikiss, Hans Albas PE1AYX\n";
-static const char msg_regfail[] __initdata = KERN_ERR \
+static const char msg_regfail[] __initconst = KERN_ERR \
         "mkiss: can't register line discipline (err = %d)\n";
 
 static int __init mkiss_init_driver(void)
@@ -1015,7 +1015,7 @@ static int __init mkiss_init_driver(void)
         return status;
 }
 
-static const char msg_unregfail[] __exitdata = KERN_ERR \
+static const char msg_unregfail[] = KERN_ERR \
         "mkiss: can't unregister line discipline (err = %d)\n";
 
 static void __exit mkiss_exit_driver(void)
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index efc6c97163a7..1b4a47bd32b7 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -182,7 +182,7 @@
 
 #include "z8530.h"
 
-static const char banner[] __initdata = KERN_INFO \
+static const char banner[] __initconst = KERN_INFO \
         "AX.25: Z8530 SCC driver version "VERSION".dl1bke\n";
 
 static void t_dwait(unsigned long);
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 5a6412ecce73..c6645f1017af 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -76,7 +76,7 @@
 /* --------------------------------------------------------------------- */
 
 static const char yam_drvname[] = "yam";
-static const char yam_drvinfo[] __initdata = KERN_INFO \
+static const char yam_drvinfo[] __initconst = KERN_INFO \
         "YAM driver version 0.8 by F1OAT/F6FBB\n";
 
 /* --------------------------------------------------------------------- */
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 91d25888a1b9..d8b9b1e8ee02 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -26,7 +26,7 @@
 #include <linux/ethtool.h>
 
 #define DRV_NAME        "rionet"
-#define DRV_VERSION     "0.2"
+#define DRV_VERSION     "0.3"
 #define DRV_AUTHOR      "Matt Porter <mporter@kernel.crashing.org>"
 #define DRV_DESC        "Ethernet over RapidIO"
 
@@ -47,8 +47,7 @@ MODULE_LICENSE("GPL");
 
 #define RIONET_TX_RING_SIZE     CONFIG_RIONET_TX_SIZE
 #define RIONET_RX_RING_SIZE     CONFIG_RIONET_RX_SIZE
-
-static LIST_HEAD(rionet_peers);
+#define RIONET_MAX_NETS         8
 
 struct rionet_private {
         struct rio_mport *mport;
@@ -69,16 +68,14 @@ struct rionet_peer {
         struct resource *res;
 };
 
-static int rionet_check = 0;
-static int rionet_capable = 1;
+struct rionet_net {
+        struct net_device *ndev;
+        struct list_head peers;
+        struct rio_dev **active;
+        int nact;       /* number of active peers */
+};
 
-/*
- * This is a fast lookup table for translating TX
- * Ethernet packets into a destination RIO device. It
- * could be made into a hash table to save memory depending
- * on system trade-offs.
- */
-static struct rio_dev **rionet_active;
+static struct rionet_net nets[RIONET_MAX_NETS];
 
 #define is_rionet_capable(src_ops, dst_ops)                     \
                         ((src_ops & RIO_SRC_OPS_DATA_MSG) &&    \
@@ -175,6 +172,7 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         struct ethhdr *eth = (struct ethhdr *)skb->data;
         u16 destid;
         unsigned long flags;
+        int add_num = 1;
 
         local_irq_save(flags);
         if (!spin_trylock(&rnet->tx_lock)) {
@@ -182,7 +180,10 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                 return NETDEV_TX_LOCKED;
         }
 
-        if ((rnet->tx_cnt + 1) > RIONET_TX_RING_SIZE) {
+        if (is_multicast_ether_addr(eth->h_dest))
+                add_num = nets[rnet->mport->id].nact;
+
+        if ((rnet->tx_cnt + add_num) > RIONET_TX_RING_SIZE) {
                 netif_stop_queue(ndev);
                 spin_unlock_irqrestore(&rnet->tx_lock, flags);
                 printk(KERN_ERR "%s: BUG! Tx Ring full when queue awake!\n",
@@ -191,15 +192,22 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         }
 
         if (is_multicast_ether_addr(eth->h_dest)) {
+                int count = 0;
+
                 for (i = 0; i < RIO_MAX_ROUTE_ENTRIES(rnet->mport->sys_size);
                                 i++)
-                        if (rionet_active[i])
+                        if (nets[rnet->mport->id].active[i]) {
                                 rionet_queue_tx_msg(skb, ndev,
-                                                    rionet_active[i]);
+                                        nets[rnet->mport->id].active[i]);
+                                if (count)
+                                        atomic_inc(&skb->users);
+                                count++;
+                        }
         } else if (RIONET_MAC_MATCH(eth->h_dest)) {
                 destid = RIONET_GET_DESTID(eth->h_dest);
-                if (rionet_active[destid])
-                        rionet_queue_tx_msg(skb, ndev, rionet_active[destid]);
+                if (nets[rnet->mport->id].active[destid])
+                        rionet_queue_tx_msg(skb, ndev,
+                                        nets[rnet->mport->id].active[destid]);
         }
 
         spin_unlock_irqrestore(&rnet->tx_lock, flags);
@@ -218,16 +226,21 @@ static void rionet_dbell_event(struct rio_mport *mport, void *dev_id, u16 sid, u
                 printk(KERN_INFO "%s: doorbell sid %4.4x tid %4.4x info %4.4x",
                        DRV_NAME, sid, tid, info);
         if (info == RIONET_DOORBELL_JOIN) {
-                if (!rionet_active[sid]) {
-                        list_for_each_entry(peer, &rionet_peers, node) {
-                                if (peer->rdev->destid == sid)
-                                        rionet_active[sid] = peer->rdev;
+                if (!nets[rnet->mport->id].active[sid]) {
+                        list_for_each_entry(peer,
+                                           &nets[rnet->mport->id].peers, node) {
+                                if (peer->rdev->destid == sid) {
+                                        nets[rnet->mport->id].active[sid] =
+                                                                peer->rdev;
+                                        nets[rnet->mport->id].nact++;
+                                }
                         }
                         rio_mport_send_doorbell(mport, sid,
                                                 RIONET_DOORBELL_JOIN);
                 }
         } else if (info == RIONET_DOORBELL_LEAVE) {
-                rionet_active[sid] = NULL;
+                nets[rnet->mport->id].active[sid] = NULL;
+                nets[rnet->mport->id].nact--;
         } else {
                 if (netif_msg_intr(rnet))
                         printk(KERN_WARNING "%s: unhandled doorbell\n",
@@ -321,7 +334,8 @@ static int rionet_open(struct net_device *ndev)
         netif_carrier_on(ndev);
         netif_start_queue(ndev);
 
-        list_for_each_entry_safe(peer, tmp, &rionet_peers, node) {
+        list_for_each_entry_safe(peer, tmp,
+                                 &nets[rnet->mport->id].peers, node) {
                 if (!(peer->res = rio_request_outb_dbell(peer->rdev,
                                                          RIONET_DOORBELL_JOIN,
                                                          RIONET_DOORBELL_LEAVE)))
@@ -346,7 +360,7 @@ static int rionet_close(struct net_device *ndev)
         int i;
 
         if (netif_msg_ifup(rnet))
-                printk(KERN_INFO "%s: close\n", DRV_NAME);
+                printk(KERN_INFO "%s: close %s\n", DRV_NAME, ndev->name);
 
         netif_stop_queue(ndev);
         netif_carrier_off(ndev);
@@ -354,10 +368,11 @@ static int rionet_close(struct net_device *ndev)
         for (i = 0; i < RIONET_RX_RING_SIZE; i++)
                 kfree_skb(rnet->rx_skb[i]);
 
-        list_for_each_entry_safe(peer, tmp, &rionet_peers, node) {
-                if (rionet_active[peer->rdev->destid]) {
+        list_for_each_entry_safe(peer, tmp,
+                                 &nets[rnet->mport->id].peers, node) {
+                if (nets[rnet->mport->id].active[peer->rdev->destid]) {
                         rio_send_doorbell(peer->rdev, RIONET_DOORBELL_LEAVE);
-                        rionet_active[peer->rdev->destid] = NULL;
+                        nets[rnet->mport->id].active[peer->rdev->destid] = NULL;
                 }
                 rio_release_outb_dbell(peer->rdev, peer->res);
         }
@@ -373,17 +388,21 @@ static int rionet_close(struct net_device *ndev)
 static void rionet_remove(struct rio_dev *rdev)
 {
         struct net_device *ndev = rio_get_drvdata(rdev);
+        unsigned char netid = rdev->net->hport->id;
         struct rionet_peer *peer, *tmp;
 
-        free_pages((unsigned long)rionet_active, get_order(sizeof(void *) *
-                        RIO_MAX_ROUTE_ENTRIES(rdev->net->hport->sys_size)));
         unregister_netdev(ndev);
-        free_netdev(ndev);
 
-        list_for_each_entry_safe(peer, tmp, &rionet_peers, node) {
+        free_pages((unsigned long)nets[netid].active, get_order(sizeof(void *) *
+                        RIO_MAX_ROUTE_ENTRIES(rdev->net->hport->sys_size)));
+        nets[netid].active = NULL;
+
+        list_for_each_entry_safe(peer, tmp, &nets[netid].peers, node) {
                 list_del(&peer->node);
                 kfree(peer);
         }
+
+        free_netdev(ndev);
 }
 
 static void rionet_get_drvinfo(struct net_device *ndev,
@@ -435,13 +454,13 @@ static int rionet_setup_netdev(struct rio_mport *mport, struct net_device *ndev)
         const size_t rionet_active_bytes = sizeof(void *) *
                                 RIO_MAX_ROUTE_ENTRIES(mport->sys_size);
 
-        rionet_active = (struct rio_dev **)__get_free_pages(GFP_KERNEL,
-                        get_order(rionet_active_bytes));
-        if (!rionet_active) {
+        nets[mport->id].active = (struct rio_dev **)__get_free_pages(GFP_KERNEL,
+                                                get_order(rionet_active_bytes));
+        if (!nets[mport->id].active) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset((void *)rionet_active, 0, rionet_active_bytes);
+        memset((void *)nets[mport->id].active, 0, rionet_active_bytes);
 
         /* Set up private area */
         rnet = netdev_priv(ndev);
@@ -470,60 +489,62 @@ static int rionet_setup_netdev(struct rio_mport *mport, struct net_device *ndev)
         if (rc != 0)
                 goto out;
 
-        printk("%s: %s %s Version %s, MAC %pM\n",
+        printk(KERN_INFO "%s: %s %s Version %s, MAC %pM, %s\n",
                ndev->name,
                DRV_NAME,
                DRV_DESC,
                DRV_VERSION,
-               ndev->dev_addr);
+               ndev->dev_addr,
+               mport->name);
 
       out:
         return rc;
 }
 
-/*
- * XXX Make multi-net safe
- */
+static unsigned long net_table[RIONET_MAX_NETS/sizeof(unsigned long) + 1];
+
 static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
 {
         int rc = -ENODEV;
         u32 lsrc_ops, ldst_ops;
         struct rionet_peer *peer;
         struct net_device *ndev = NULL;
+        unsigned char netid = rdev->net->hport->id;
+        int oldnet;
 
-        /* If local device is not rionet capable, give up quickly */
-        if (!rionet_capable)
-                goto out;
+        if (netid >= RIONET_MAX_NETS)
+                return rc;
 
-        /* Allocate our net_device structure */
-        ndev = alloc_etherdev(sizeof(struct rionet_private));
-        if (ndev == NULL) {
-                rc = -ENOMEM;
-                goto out;
-        }
+        oldnet = test_and_set_bit(netid, net_table);
 
         /*
          * First time through, make sure local device is rionet
-         * capable, setup netdev,  and set flags so this is skipped
-         * on later probes
+         * capable, setup netdev (will be skipped on later probes)
          */
-        if (!rionet_check) {
+        if (!oldnet) {
                 rio_local_read_config_32(rdev->net->hport, RIO_SRC_OPS_CAR,
                                          &lsrc_ops);
                 rio_local_read_config_32(rdev->net->hport, RIO_DST_OPS_CAR,
                                          &ldst_ops);
                 if (!is_rionet_capable(lsrc_ops, ldst_ops)) {
                         printk(KERN_ERR
-                               "%s: local device is not network capable\n",
-                               DRV_NAME);
-                        rionet_check = 1;
-                        rionet_capable = 0;
+                               "%s: local device %s is not network capable\n",
+                               DRV_NAME, rdev->net->hport->name);
                         goto out;
                 }
 
+                /* Allocate our net_device structure */
+                ndev = alloc_etherdev(sizeof(struct rionet_private));
+                if (ndev == NULL) {
+                        rc = -ENOMEM;
+                        goto out;
+                }
+                nets[netid].ndev = ndev;
                 rc = rionet_setup_netdev(rdev->net->hport, ndev);
-                rionet_check = 1;
-        }
+                INIT_LIST_HEAD(&nets[netid].peers);
+                nets[netid].nact = 0;
+        } else if (nets[netid].ndev == NULL)
+                goto out;
 
         /*
          * If the remote device has mailbox/doorbell capabilities,
@@ -535,10 +556,10 @@ static int rionet_probe(struct rio_dev *rdev, const struct rio_device_id *id)
                         goto out;
                 }
                 peer->rdev = rdev;
-                list_add_tail(&peer->node, &rionet_peers);
+                list_add_tail(&peer->node, &nets[netid].peers);
         }
 
-        rio_set_drvdata(rdev, ndev);
+        rio_set_drvdata(rdev, nets[netid].ndev);
 
       out:
         return rc;
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index 0e5769061702..feacc3b994b7 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL(z8530_queue_xmit);
 /*
  *      Module support
  */
-static const char banner[] __initdata =
+static const char banner[] __initconst =
         KERN_INFO "Generic Z85C30/Z85230 interface driver v0.02\n";
 
 static int __init z85230_init_driver(void)
diff --git a/drivers/platform/x86/amilo-rfkill.c b/drivers/platform/x86/amilo-rfkill.c
index a514bf66fdd7..1deca7f6c4ea 100644
--- a/drivers/platform/x86/amilo-rfkill.c
+++ b/drivers/platform/x86/amilo-rfkill.c
@@ -74,7 +74,7 @@ static const struct rfkill_ops amilo_m7440_rfkill_ops = {
         .set_block = amilo_m7440_rfkill_set_block
 };
 
-static const struct dmi_system_id __devinitdata amilo_rfkill_id_table[] = {
+static const struct dmi_system_id __devinitconst amilo_rfkill_id_table[] = {
         {
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
diff --git a/drivers/platform/x86/fujitsu-tablet.c b/drivers/platform/x86/fujitsu-tablet.c
index 7acae3f85f3b..f77484528b1b 100644
--- a/drivers/platform/x86/fujitsu-tablet.c
+++ b/drivers/platform/x86/fujitsu-tablet.c
@@ -52,7 +52,7 @@ struct fujitsu_config {
         unsigned int quirks;
 };
 
-static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initconst = {
+static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initdata = {
         KEY_RESERVED,
         KEY_RESERVED,
         KEY_RESERVED,
@@ -71,7 +71,7 @@ static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initconst = {
         KEY_LEFTALT
 };
 
-static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initconst = {
+static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initdata = {
         KEY_RESERVED,
         KEY_RESERVED,
         KEY_RESERVED,
@@ -90,7 +90,7 @@ static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initconst = {
         KEY_LEFTALT
 };
 
-static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initconst = {
+static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initdata = {
         KEY_RESERVED,
         KEY_RESERVED,
         KEY_RESERVED,
@@ -109,7 +109,7 @@ static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initconst = {
         KEY_LEFTALT
 };
 
-static unsigned short keymap_Stylistic_ST5xxx[KEYMAP_LEN] __initconst = {
+static unsigned short keymap_Stylistic_ST5xxx[KEYMAP_LEN] __initdata = {
         KEY_RESERVED,
         KEY_RESERVED,
         KEY_RESERVED,
@@ -299,7 +299,7 @@ static int __devinit fujitsu_dmi_stylistic(const struct dmi_system_id *dmi)
         return 1;
 }
 
-static struct dmi_system_id dmi_ids[] __initconst = {
+static const struct dmi_system_id dmi_ids[] __initconst = {
         {
                 .callback = fujitsu_dmi_lifebook,
                 .ident = "Fujitsu Siemens P/T Series",
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 9da5fe715e6a..75dd651664ae 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -522,7 +522,7 @@ static acpi_handle ec_handle;
 
 #define TPACPI_HANDLE(object, parent, paths...)                 \
         static acpi_handle  object##_handle;                    \
-        static const acpi_handle *object##_parent __initdata =  \
+        static const acpi_handle * const object##_parent __initconst =  \
                                                 &parent##_handle; \
         static char *object##_paths[] __initdata = { paths }
 
diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
index e771487132f7..2420d5af0583 100644
--- a/drivers/pps/pps.c
+++ b/drivers/pps/pps.c
@@ -306,7 +306,7 @@ int pps_register_cdev(struct pps_device *pps)
         if (err < 0)
                 return err;
 
-        pps->id &= MAX_ID_MASK;
+        pps->id &= MAX_IDR_MASK;
         if (pps->id >= PPS_MAX_SOURCES) {
                 pr_err("%s: too many PPS sources in the system\n",
                                         pps->info.name);
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index d5e1625bbac2..38ecd8f4d60e 100644
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@ -862,6 +862,90 @@ static void tsi721_init_pc2sr_mapping(struct tsi721_device *priv)
 }
 
 /**
+ * tsi721_rio_map_inb_mem -- Mapping inbound memory region.
+ * @mport: RapidIO master port
+ * @lstart: Local memory space start address.
+ * @rstart: RapidIO space start address.
+ * @size: The mapping region size.
+ * @flags: Flags for mapping. 0 for using default flags.
+ *
+ * Return: 0 -- Success.
+ *
+ * This function will create the inbound mapping
+ * from rstart to lstart.
+ */
+static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
+                u64 rstart, u32 size, u32 flags)
+{
+        struct tsi721_device *priv = mport->priv;
+        int i;
+        u32 regval;
+
+        if (!is_power_of_2(size) || size < 0x1000 ||
+            ((u64)lstart & (size - 1)) || (rstart & (size - 1)))
+                return -EINVAL;
+
+        /* Search for free inbound translation window */
+        for (i = 0; i < TSI721_IBWIN_NUM; i++) {
+                regval = ioread32(priv->regs + TSI721_IBWIN_LB(i));
+                if (!(regval & TSI721_IBWIN_LB_WEN))
+                        break;
+        }
+
+        if (i >= TSI721_IBWIN_NUM) {
+                dev_err(&priv->pdev->dev,
+                        "Unable to find free inbound window\n");
+                return -EBUSY;
+        }
+
+        iowrite32(TSI721_IBWIN_SIZE(size) << 8,
+                        priv->regs + TSI721_IBWIN_SZ(i));
+
+        iowrite32(((u64)lstart >> 32), priv->regs + TSI721_IBWIN_TUA(i));
+        iowrite32(((u64)lstart & TSI721_IBWIN_TLA_ADD),
+                  priv->regs + TSI721_IBWIN_TLA(i));
+
+        iowrite32(rstart >> 32, priv->regs + TSI721_IBWIN_UB(i));
+        iowrite32((rstart & TSI721_IBWIN_LB_BA) | TSI721_IBWIN_LB_WEN,
+                priv->regs + TSI721_IBWIN_LB(i));
+        dev_dbg(&priv->pdev->dev,
+                "Configured IBWIN%d mapping (RIO_0x%llx -> PCIe_0x%llx)\n",
+                i, rstart, (unsigned long long)lstart);
+
+        return 0;
+}
+
+/**
+ * fsl_rio_unmap_inb_mem -- Unmapping inbound memory region.
+ * @mport: RapidIO master port
+ * @lstart: Local memory space start address.
+ */
+static void tsi721_rio_unmap_inb_mem(struct rio_mport *mport,
+                                dma_addr_t lstart)
+{
+        struct tsi721_device *priv = mport->priv;
+        int i;
+        u64 addr;
+        u32 regval;
+
+        /* Search for matching active inbound translation window */
+        for (i = 0; i < TSI721_IBWIN_NUM; i++) {
+                regval = ioread32(priv->regs + TSI721_IBWIN_LB(i));
+                if (regval & TSI721_IBWIN_LB_WEN) {
+                        regval = ioread32(priv->regs + TSI721_IBWIN_TUA(i));
+                        addr = (u64)regval << 32;
+                        regval = ioread32(priv->regs + TSI721_IBWIN_TLA(i));
+                        addr |= regval & TSI721_IBWIN_TLA_ADD;
+
+                        if (addr == (u64)lstart) {
+                                iowrite32(0, priv->regs + TSI721_IBWIN_LB(i));
+                                break;
+                        }
+                }
+        }
+}
+
+/**
  * tsi721_init_sr2pc_mapping - initializes inbound (SRIO->PCIe)
  * translation regions.
  * @priv: pointer to tsi721 private data
@@ -874,7 +958,7 @@ static void tsi721_init_sr2pc_mapping(struct tsi721_device *priv)
 
         /* Disable all SR2PC inbound windows */
         for (i = 0; i < TSI721_IBWIN_NUM; i++)
-                iowrite32(0, priv->regs + TSI721_IBWINLB(i));
+                iowrite32(0, priv->regs + TSI721_IBWIN_LB(i));
 }
 
 /**
@@ -2144,6 +2228,8 @@ static int __devinit tsi721_setup_mport(struct tsi721_device *priv)
         ops->add_outb_message = tsi721_add_outb_message;
         ops->add_inb_buffer = tsi721_add_inb_buffer;
         ops->get_inb_message = tsi721_get_inb_message;
+        ops->map_inb = tsi721_rio_map_inb_mem;
+        ops->unmap_inb = tsi721_rio_unmap_inb_mem;
 
         mport = kzalloc(sizeof(struct rio_mport), GFP_KERNEL);
         if (!mport) {
@@ -2165,7 +2251,8 @@ static int __devinit tsi721_setup_mport(struct tsi721_device *priv)
         rio_init_dbell_res(&mport->riores[RIO_DOORBELL_RESOURCE], 0, 0xffff);
         rio_init_mbox_res(&mport->riores[RIO_INB_MBOX_RESOURCE], 0, 3);
         rio_init_mbox_res(&mport->riores[RIO_OUTB_MBOX_RESOURCE], 0, 3);
-        strcpy(mport->name, "Tsi721 mport");
+        snprintf(mport->name, RIO_MAX_MPORT_NAME, "%s(%s)",
+                 dev_driver_string(&pdev->dev), dev_name(&pdev->dev));
 
         /* Hook up interrupt handler */
 
@@ -2315,7 +2402,8 @@ static int __devinit tsi721_probe(struct pci_dev *pdev,
 
         /* Configure DMA attributes. */
         if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
-                if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+                if (err) {
                         dev_info(&pdev->dev, "Unable to set DMA mask\n");
                         goto err_unmap_bars;
                 }
diff --git a/drivers/rapidio/devices/tsi721.h b/drivers/rapidio/devices/tsi721.h
index 59de9d7be346..7d5b13ba8d4f 100644
--- a/drivers/rapidio/devices/tsi721.h
+++ b/drivers/rapidio/devices/tsi721.h
@@ -156,9 +156,18 @@
 
 #define TSI721_IBWIN_NUM        8
 
-#define TSI721_IBWINLB(x)       (0x29000 + (x) * 0x20)
-#define TSI721_IBWINLB_BA       0xfffff000
-#define TSI721_IBWINLB_WEN      0x00000001
+#define TSI721_IBWIN_LB(x)      (0x29000 + (x) * 0x20)
+#define TSI721_IBWIN_LB_BA      0xfffff000
+#define TSI721_IBWIN_LB_WEN     0x00000001
+
+#define TSI721_IBWIN_UB(x)      (0x29004 + (x) * 0x20)
+#define TSI721_IBWIN_SZ(x)      (0x29008 + (x) * 0x20)
+#define TSI721_IBWIN_SZ_SIZE    0x00001f00
+#define TSI721_IBWIN_SIZE(size) (__fls(size) - 12)
+
+#define TSI721_IBWIN_TLA(x)     (0x2900c + (x) * 0x20)
+#define TSI721_IBWIN_TLA_ADD    0xfffff000
+#define TSI721_IBWIN_TUA(x)     (0x29010 + (x) * 0x20)
 
 #define TSI721_SR2PC_GEN_INTE   0x29800
 #define TSI721_SR2PC_PWE        0x29804
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 2bebd791a092..48e9041dd1e2 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -31,27 +31,21 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/timer.h>
+#include <linux/sched.h>
 #include <linux/jiffies.h>
 #include <linux/slab.h>
 
 #include "rio.h"
 
 LIST_HEAD(rio_devices);
-static LIST_HEAD(rio_switches);
-
-static void rio_enum_timeout(unsigned long);
 
 static void rio_init_em(struct rio_dev *rdev);
 
 DEFINE_SPINLOCK(rio_global_list_lock);
 
 static int next_destid = 0;
-static int next_net = 0;
 static int next_comptag = 1;
 
-static struct timer_list rio_enum_timer =
-TIMER_INITIALIZER(rio_enum_timeout, 0, 0);
-
 static int rio_mport_phys_table[] = {
         RIO_EFB_PAR_EP_ID,
         RIO_EFB_PAR_EP_REC_ID,
@@ -60,6 +54,114 @@ static int rio_mport_phys_table[] = {
         -1,
 };
 
+
+/*
+ * rio_destid_alloc - Allocate next available destID for given network
+ * net: RIO network
+ *
+ * Returns next available device destination ID for the specified RIO network.
+ * Marks allocated ID as one in use.
+ * Returns RIO_INVALID_DESTID if new destID is not available.
+ */
+static u16 rio_destid_alloc(struct rio_net *net)
+{
+        int destid;
+        struct rio_id_table *idtab = &net->destid_table;
+
+        spin_lock(&idtab->lock);
+        destid = find_next_zero_bit(idtab->table, idtab->max, idtab->next);
+        if (destid >= idtab->max)
+                destid = find_first_zero_bit(idtab->table, idtab->max);
+
+        if (destid < idtab->max) {
+                idtab->next = destid + 1;
+                if (idtab->next >= idtab->max)
+                        idtab->next = 0;
+                set_bit(destid, idtab->table);
+                destid += idtab->start;
+        } else
+                destid = RIO_INVALID_DESTID;
+
+        spin_unlock(&idtab->lock);
+        return (u16)destid;
+}
+
+/*
+ * rio_destid_reserve - Reserve the specivied destID
+ * net: RIO network
+ * destid: destID to reserve
+ *
+ * Tries to reserve the specified destID.
+ * Returns 0 if successfull.
+ */
+static int rio_destid_reserve(struct rio_net *net, u16 destid)
+{
+        int oldbit;
+        struct rio_id_table *idtab = &net->destid_table;
+
+        destid -= idtab->start;
+        spin_lock(&idtab->lock);
+        oldbit = test_and_set_bit(destid, idtab->table);
+        spin_unlock(&idtab->lock);
+        return oldbit;
+}
+
+/*
+ * rio_destid_free - free a previously allocated destID
+ * net: RIO network
+ * destid: destID to free
+ *
+ * Makes the specified destID available for use.
+ */
+static void rio_destid_free(struct rio_net *net, u16 destid)
+{
+        struct rio_id_table *idtab = &net->destid_table;
+
+        destid -= idtab->start;
+        spin_lock(&idtab->lock);
+        clear_bit(destid, idtab->table);
+        spin_unlock(&idtab->lock);
+}
+
+/*
+ * rio_destid_first - return first destID in use
+ * net: RIO network
+ */
+static u16 rio_destid_first(struct rio_net *net)
+{
+        int destid;
+        struct rio_id_table *idtab = &net->destid_table;
+
+        spin_lock(&idtab->lock);
+        destid = find_first_bit(idtab->table, idtab->max);
+        if (destid >= idtab->max)
+                destid = RIO_INVALID_DESTID;
+        else
+                destid += idtab->start;
+        spin_unlock(&idtab->lock);
+        return (u16)destid;
+}
+
+/*
+ * rio_destid_next - return next destID in use
+ * net: RIO network
+ * from: destination ID from which search shall continue
+ */
+static u16 rio_destid_next(struct rio_net *net, u16 from)
+{
+        int destid;
+        struct rio_id_table *idtab = &net->destid_table;
+
+        spin_lock(&idtab->lock);
+        destid = find_next_bit(idtab->table, idtab->max, from);
+        if (destid >= idtab->max)
+                destid = RIO_INVALID_DESTID;
+        else
+                destid += idtab->start;
+        spin_unlock(&idtab->lock);
+        return (u16)destid;
+}
+
 /**
  * rio_get_device_id - Get the base/extended device id for a device
  * @port: RIO master port
@@ -108,14 +210,15 @@ static void rio_local_set_device_id(struct rio_mport *port, u16 did)
 
 /**
  * rio_clear_locks- Release all host locks and signal enumeration complete
- * @port: Master port to issue transaction
+ * @net: RIO network to run on
  *
  * Marks the component tag CSR on each device with the enumeration
  * complete flag. When complete, it then release the host locks on
  * each device. Returns 0 on success or %-EINVAL on failure.
  */
-static int rio_clear_locks(struct rio_mport *port)
+static int rio_clear_locks(struct rio_net *net)
 {
+        struct rio_mport *port = net->hport;
         struct rio_dev *rdev;
         u32 result;
         int ret = 0;
@@ -130,7 +233,7 @@ static int rio_clear_locks(struct rio_mport *port)
                        result);
                 ret = -EINVAL;
         }
-        list_for_each_entry(rdev, &rio_devices, global_list) {
+        list_for_each_entry(rdev, &net->devices, net_list) {
                 rio_write_config_32(rdev, RIO_HOST_DID_LOCK_CSR,
                                     port->host_deviceid);
                 rio_read_config_32(rdev, RIO_HOST_DID_LOCK_CSR, &result);
@@ -176,10 +279,6 @@ static int rio_enum_host(struct rio_mport *port)
 
         /* Set master port destid and init destid ctr */
         rio_local_set_device_id(port, port->host_deviceid);
-
-        if (next_destid == port->host_deviceid)
-                next_destid++;
-
         return 0;
 }
 
@@ -446,9 +545,8 @@ static struct rio_dev __devinit *rio_setup_device(struct rio_net *net,
         if (rio_device_has_destid(port, rdev->src_ops, rdev->dst_ops)) {
                 if (do_enum) {
                         rio_set_device_id(port, destid, hopcount, next_destid);
-                        rdev->destid = next_destid++;
-                        if (next_destid == port->host_deviceid)
-                                next_destid++;
+                        rdev->destid = next_destid;
+                        next_destid = rio_destid_alloc(net);
                 } else
                         rdev->destid = rio_get_device_id(port, destid, hopcount);
 
@@ -483,7 +581,7 @@ static struct rio_dev __devinit *rio_setup_device(struct rio_net *net,
                         rswitch->clr_table(port, destid, hopcount,
                                            RIO_GLOBAL_TABLE);
 
-                list_add_tail(&rswitch->node, &rio_switches);
+                list_add_tail(&rswitch->node, &net->switches);
 
         } else {
                 if (do_enum)
@@ -747,12 +845,7 @@ static u16 rio_get_host_deviceid_lock(struct rio_mport *port, u8 hopcount)
 static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
                          u8 hopcount, struct rio_dev *prev, int prev_port)
 {
-        int port_num;
-        int cur_destid;
-        int sw_destid;
-        int sw_inport;
         struct rio_dev *rdev;
-        u16 destid;
         u32 regval;
         int tmp;
 
@@ -818,19 +911,26 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
                 return -1;
 
         if (rio_is_switch(rdev)) {
+                int sw_destid;
+                int cur_destid;
+                int sw_inport;
+                u16 destid;
+                int port_num;
+
                 sw_inport = RIO_GET_PORT_NUM(rdev->swpinfo);
                 rio_route_add_entry(rdev, RIO_GLOBAL_TABLE,
                                     port->host_deviceid, sw_inport, 0);
                 rdev->rswitch->route_table[port->host_deviceid] = sw_inport;
 
-                for (destid = 0; destid < next_destid; destid++) {
-                        if (destid == port->host_deviceid)
-                                continue;
-                        rio_route_add_entry(rdev, RIO_GLOBAL_TABLE,
-                                            destid, sw_inport, 0);
-                        rdev->rswitch->route_table[destid] = sw_inport;
+                destid = rio_destid_first(net);
+                while (destid != RIO_INVALID_DESTID && destid < next_destid) {
+                        if (destid != port->host_deviceid) {
+                                rio_route_add_entry(rdev, RIO_GLOBAL_TABLE,
+                                                    destid, sw_inport, 0);
+                                rdev->rswitch->route_table[destid] = sw_inport;
+                        }
+                        destid = rio_destid_next(net, destid + 1);
                 }
-
                 pr_debug(
                     "RIO: found %s (vid %4.4x did %4.4x) with %d ports\n",
                     rio_name(rdev), rdev->vid, rdev->did,
@@ -839,12 +939,10 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
                 for (port_num = 0;
                      port_num < RIO_GET_TOTAL_PORTS(rdev->swpinfo);
                      port_num++) {
-                        /*Enable Input Output Port (transmitter reviever)*/
-                        rio_enable_rx_tx_port(port, 0,
+                        if (sw_inport == port_num) {
+                                rio_enable_rx_tx_port(port, 0,
                                               RIO_ANY_DESTID(port->sys_size),
                                               hopcount, port_num);
-
-                        if (sw_inport == port_num) {
                                 rdev->rswitch->port_ok |= (1 << port_num);
                                 continue;
                         }
@@ -857,6 +955,9 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
                                 pr_debug(
                                     "RIO: scanning device on port %d\n",
                                     port_num);
+                                rio_enable_rx_tx_port(port, 0,
+                                              RIO_ANY_DESTID(port->sys_size),
+                                              hopcount, port_num);
                                 rdev->rswitch->port_ok |= (1 << port_num);
                                 rio_route_add_entry(rdev, RIO_GLOBAL_TABLE,
                                                 RIO_ANY_DESTID(port->sys_size),
@@ -867,19 +968,22 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
                                         return -1;
 
                                 /* Update routing tables */
-                                if (next_destid > cur_destid) {
+                                destid = rio_destid_next(net, cur_destid + 1);
+                                if (destid != RIO_INVALID_DESTID) {
                                         for (destid = cur_destid;
-                                             destid < next_destid; destid++) {
-                                                if (destid == port->host_deviceid)
-                                                        continue;
-                                                rio_route_add_entry(rdev,
+                                             destid < next_destid;) {
+                                                if (destid != port->host_deviceid) {
+                                                        rio_route_add_entry(rdev,
                                                                     RIO_GLOBAL_TABLE,
                                                                     destid,
                                                                     port_num,
                                                                     0);
-                                                rdev->rswitch->
-                                                    route_table[destid] =
-                                                    port_num;
+                                                        rdev->rswitch->
+                                                                route_table[destid] =
+                                                                port_num;
+                                                }
+                                                destid = rio_destid_next(net,
+                                                                destid + 1);
                                         }
                                 }
                         } else {
@@ -905,11 +1009,8 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
                 rio_init_em(rdev);
 
                 /* Check for empty switch */
-                if (next_destid == sw_destid) {
-                        next_destid++;
-                        if (next_destid == port->host_deviceid)
-                                next_destid++;
-                }
+                if (next_destid == sw_destid)
+                        next_destid = rio_destid_alloc(net);
 
                 rdev->destid = sw_destid;
         } else
@@ -1047,48 +1148,71 @@ static int rio_mport_is_active(struct rio_mport *port)
 /**
  * rio_alloc_net- Allocate and configure a new RIO network
  * @port: Master port associated with the RIO network
+ * @do_enum: Enumeration/Discovery mode flag
+ * @start: logical minimal start id for new net
  *
  * Allocates a RIO network structure, initializes per-network
  * list heads, and adds the associated master port to the
  * network list of associated master ports. Returns a
  * RIO network pointer on success or %NULL on failure.
  */
-static struct rio_net __devinit *rio_alloc_net(struct rio_mport *port)
+static struct rio_net __devinit *rio_alloc_net(struct rio_mport *port,
+                                               int do_enum, u16 start)
 {
         struct rio_net *net;
 
         net = kzalloc(sizeof(struct rio_net), GFP_KERNEL);
+        if (net && do_enum) {
+                net->destid_table.table = kzalloc(
+                        BITS_TO_LONGS(RIO_MAX_ROUTE_ENTRIES(port->sys_size)) *
+                        sizeof(long),
+                        GFP_KERNEL);
+
+                if (net->destid_table.table == NULL) {
+                        pr_err("RIO: failed to allocate destID table\n");
+                        kfree(net);
+                        net = NULL;
+                } else {
+                        net->destid_table.start = start;
+                        net->destid_table.next = 0;
+                        net->destid_table.max =
+                                        RIO_MAX_ROUTE_ENTRIES(port->sys_size);
+                        spin_lock_init(&net->destid_table.lock);
+                }
+        }
+
         if (net) {
                 INIT_LIST_HEAD(&net->node);
                 INIT_LIST_HEAD(&net->devices);
+                INIT_LIST_HEAD(&net->switches);
                 INIT_LIST_HEAD(&net->mports);
                 list_add_tail(&port->nnode, &net->mports);
                 net->hport = port;
-                net->id = next_net++;
+                net->id = port->id;
         }
         return net;
 }
 
 /**
  * rio_update_route_tables- Updates route tables in switches
- * @port: Master port associated with the RIO network
+ * @net: RIO network to run update on
  *
  * For each enumerated device, ensure that each switch in a system
  * has correct routing entries. Add routes for devices that where
  * unknown dirung the first enumeration pass through the switch.
  */
-static void rio_update_route_tables(struct rio_mport *port)
+static void rio_update_route_tables(struct rio_net *net)
 {
         struct rio_dev *rdev, *swrdev;
         struct rio_switch *rswitch;
         u8 sport;
         u16 destid;
 
-        list_for_each_entry(rdev, &rio_devices, global_list) {
+        list_for_each_entry(rdev, &net->devices, net_list) {
 
                 destid = rdev->destid;
 
-                list_for_each_entry(rswitch, &rio_switches, node) {
+                list_for_each_entry(rswitch, &net->switches, node) {
 
                         if (rio_is_switch(rdev) && (rdev->rswitch == rswitch))
                                 continue;
@@ -1166,12 +1290,16 @@ int __devinit rio_enum_mport(struct rio_mport *mport)
 
         /* If master port has an active link, allocate net and enum peers */
         if (rio_mport_is_active(mport)) {
-                if (!(net = rio_alloc_net(mport))) {
+                net = rio_alloc_net(mport, 1, 0);
+                if (!net) {
                         printk(KERN_ERR "RIO: failed to allocate new net\n");
                         rc = -ENOMEM;
                         goto out;
                 }
 
+                /* reserve mport destID in new net */
+                rio_destid_reserve(net, mport->host_deviceid);
+
                 /* Enable Input Output Port (transmitter reviever) */
                 rio_enable_rx_tx_port(mport, 1, 0, 0, 0);
 
@@ -1179,17 +1307,21 @@ int __devinit rio_enum_mport(struct rio_mport *mport)
                 rio_local_write_config_32(mport, RIO_COMPONENT_TAG_CSR,
                                           next_comptag++);
 
+                next_destid = rio_destid_alloc(net);
+
                 if (rio_enum_peer(net, mport, 0, NULL, 0) < 0) {
                         /* A higher priority host won enumeration, bail. */
                         printk(KERN_INFO
                                "RIO: master port %d device has lost enumeration to a remote host\n",
                                mport->id);
-                        rio_clear_locks(mport);
+                        rio_clear_locks(net);
                         rc = -EBUSY;
                         goto out;
                 }
-                rio_update_route_tables(mport);
-                rio_clear_locks(mport);
+                /* free the last allocated destID (unused) */
+                rio_destid_free(net, next_destid);
+                rio_update_route_tables(net);
+                rio_clear_locks(net);
                 rio_pw_enable(mport, 1);
         } else {
                 printk(KERN_INFO "RIO: master port %d link inactive\n",
@@ -1203,47 +1335,34 @@ int __devinit rio_enum_mport(struct rio_mport *mport)
 
 /**
  * rio_build_route_tables- Generate route tables from switch route entries
+ * @net: RIO network to run route tables scan on
  *
  * For each switch device, generate a route table by copying existing
  * route entries from the switch.
  */
-static void rio_build_route_tables(void)
+static void rio_build_route_tables(struct rio_net *net)
 {
+        struct rio_switch *rswitch;
         struct rio_dev *rdev;
         int i;
         u8 sport;
 
-        list_for_each_entry(rdev, &rio_devices, global_list)
-                if (rio_is_switch(rdev)) {
-                        rio_lock_device(rdev->net->hport, rdev->destid,
-                                        rdev->hopcount, 1000);
-                        for (i = 0;
-                             i < RIO_MAX_ROUTE_ENTRIES(rdev->net->hport->sys_size);
-                             i++) {
-                                if (rio_route_get_entry(rdev,
-                                        RIO_GLOBAL_TABLE, i, &sport, 0) < 0)
-                                        continue;
-                                rdev->rswitch->route_table[i] = sport;
-                        }
+        list_for_each_entry(rswitch, &net->switches, node) {
+                rdev = sw_to_rio_dev(rswitch);
 
-                        rio_unlock_device(rdev->net->hport,
-                                          rdev->destid,
-                                          rdev->hopcount);
+                rio_lock_device(net->hport, rdev->destid,
+                                rdev->hopcount, 1000);
+                for (i = 0;
+                     i < RIO_MAX_ROUTE_ENTRIES(net->hport->sys_size);
+                     i++) {
+                        if (rio_route_get_entry(rdev, RIO_GLOBAL_TABLE,
+                                                i, &sport, 0) < 0)
+                                continue;
+                        rswitch->route_table[i] = sport;
                 }
-}
 
-/**
- * rio_enum_timeout- Signal that enumeration timed out
- * @data: Address of timeout flag.
- *
- * When the enumeration complete timer expires, set a flag that
- * signals to the discovery process that enumeration did not
- * complete in a sane amount of time.
- */
-static void rio_enum_timeout(unsigned long data)
-{
-        /* Enumeration timed out, set flag */
-        *(int *)data = 1;
+                rio_unlock_device(net->hport, rdev->destid, rdev->hopcount);
+        }
 }
 
 /**
@@ -1259,34 +1378,33 @@ static void rio_enum_timeout(unsigned long data)
 int __devinit rio_disc_mport(struct rio_mport *mport)
 {
         struct rio_net *net = NULL;
-        int enum_timeout_flag = 0;
+        unsigned long to_end;
 
         printk(KERN_INFO "RIO: discover master port %d, %s\n", mport->id,
                mport->name);
 
         /* If master port has an active link, allocate net and discover peers */
         if (rio_mport_is_active(mport)) {
-                if (!(net = rio_alloc_net(mport))) {
-                        printk(KERN_ERR "RIO: Failed to allocate new net\n");
-                        goto bail;
-                }
+                pr_debug("RIO: wait for enumeration to complete...\n");
 
-                pr_debug("RIO: wait for enumeration complete...");
-
-                rio_enum_timer.expires =
-                    jiffies + CONFIG_RAPIDIO_DISC_TIMEOUT * HZ;
-                rio_enum_timer.data = (unsigned long)&enum_timeout_flag;
-                add_timer(&rio_enum_timer);
-                while (!rio_enum_complete(mport)) {
-                        mdelay(1);
-                        if (enum_timeout_flag) {
-                                del_timer_sync(&rio_enum_timer);
-                                goto timeout;
-                        }
+                to_end = jiffies + CONFIG_RAPIDIO_DISC_TIMEOUT * HZ;
+                while (time_before(jiffies, to_end)) {
+                        if (rio_enum_complete(mport))
+                                goto enum_done;
+                        schedule_timeout_uninterruptible(msecs_to_jiffies(10));
                 }
-                del_timer_sync(&rio_enum_timer);
 
-                pr_debug("done\n");
+                pr_debug("RIO: discovery timeout on mport %d %s\n",
+                         mport->id, mport->name);
+                goto bail;
+enum_done:
+                pr_debug("RIO: ... enumeration done\n");
+
+                net = rio_alloc_net(mport, 0, 0);
+                if (!net) {
+                        printk(KERN_ERR "RIO: Failed to allocate new net\n");
+                        goto bail;
+                }
 
                 /* Read DestID assigned by enumerator */
                 rio_local_read_config_32(mport, RIO_DID_CSR,
@@ -1302,13 +1420,10 @@ int __devinit rio_disc_mport(struct rio_mport *mport)
                         goto bail;
                 }
 
-                rio_build_route_tables();
+                rio_build_route_tables(net);
         }
 
         return 0;
-
-      timeout:
-        pr_debug("timeout\n");
-      bail:
+bail:
         return -EBUSY;
 }
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index c40665a4fa33..d4bd69013c50 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -33,6 +33,7 @@
 
 static LIST_HEAD(rio_mports);
 static unsigned char next_portid;
+static DEFINE_SPINLOCK(rio_mmap_lock);
 
 /**
  * rio_local_get_device_id - Get the base/extended device id for a port
@@ -398,6 +399,49 @@ int rio_release_inb_pwrite(struct rio_dev *rdev)
 EXPORT_SYMBOL_GPL(rio_release_inb_pwrite);
 
 /**
+ * rio_map_inb_region -- Map inbound memory region.
+ * @mport: Master port.
+ * @lstart: physical address of memory region to be mapped
+ * @rbase: RIO base address assigned to this window
+ * @size: Size of the memory region
+ * @rflags: Flags for mapping.
+ *
+ * Return: 0 -- Success.
+ *
+ * This function will create the mapping from RIO space to local memory.
+ */
+int rio_map_inb_region(struct rio_mport *mport, dma_addr_t local,
+                        u64 rbase, u32 size, u32 rflags)
+{
+        int rc = 0;
+        unsigned long flags;
+
+        if (!mport->ops->map_inb)
+                return -1;
+        spin_lock_irqsave(&rio_mmap_lock, flags);
+        rc = mport->ops->map_inb(mport, local, rbase, size, rflags);
+        spin_unlock_irqrestore(&rio_mmap_lock, flags);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(rio_map_inb_region);
+
+/**
+ * rio_unmap_inb_region -- Unmap the inbound memory region
+ * @mport: Master port
+ * @lstart: physical address of memory region to be unmapped
+ */
+void rio_unmap_inb_region(struct rio_mport *mport, dma_addr_t lstart)
+{
+        unsigned long flags;
+        if (!mport->ops->unmap_inb)
+                return;
+        spin_lock_irqsave(&rio_mmap_lock, flags);
+        mport->ops->unmap_inb(mport, lstart);
+        spin_unlock_irqrestore(&rio_mmap_lock, flags);
+}
+EXPORT_SYMBOL_GPL(rio_unmap_inb_region);
+
+/**
  * rio_mport_get_physefb - Helper function that returns register offset
  *                      for Physical Layer Extended Features Block.
  * @port: Master port to issue transaction
@@ -1216,15 +1260,62 @@ static int __devinit rio_init(void)
         return 0;
 }
 
+static struct workqueue_struct *rio_wq;
+
+struct rio_disc_work {
+        struct work_struct      work;
+        struct rio_mport        *mport;
+};
+
+static void __devinit disc_work_handler(struct work_struct *_work)
+{
+        struct rio_disc_work *work;
+
+        work = container_of(_work, struct rio_disc_work, work);
+        pr_debug("RIO: discovery work for mport %d %s\n",
+                 work->mport->id, work->mport->name);
+        rio_disc_mport(work->mport);
+
+        kfree(work);
+}
+
 int __devinit rio_init_mports(void)
 {
         struct rio_mport *port;
+        struct rio_disc_work *work;
+        int no_disc = 0;
 
         list_for_each_entry(port, &rio_mports, node) {
                 if (port->host_deviceid >= 0)
                         rio_enum_mport(port);
-                else
-                        rio_disc_mport(port);
+                else if (!no_disc) {
+                        if (!rio_wq) {
+                                rio_wq = alloc_workqueue("riodisc", 0, 0);
+                                if (!rio_wq) {
+                                        pr_err("RIO: unable allocate rio_wq\n");
+                                        no_disc = 1;
+                                        continue;
+                                }
+                        }
+
+                        work = kzalloc(sizeof *work, GFP_KERNEL);
+                        if (!work) {
+                                pr_err("RIO: no memory for work struct\n");
+                                no_disc = 1;
+                                continue;
+                        }
+
+                        work->mport = port;
+                        INIT_WORK(&work->work, disc_work_handler);
+                        queue_work(rio_wq, &work->work);
+                }
+        }
+
+        if (rio_wq) {
+                pr_debug("RIO: flush discovery workqueue\n");
+                flush_workqueue(rio_wq);
+                pr_debug("RIO: flush discovery workqueue finished\n");
+                destroy_workqueue(rio_wq);
         }
 
         rio_init();
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index fabc99a75c65..e069f176a82d 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -19,7 +19,6 @@ if RTC_CLASS
 
 config RTC_HCTOSYS
         bool "Set system time from RTC on startup and resume"
-        depends on RTC_CLASS = y
         default y
         help
           If you say yes here, the system time (wall clock) will be set using
@@ -51,7 +50,6 @@ config RTC_HCTOSYS_DEVICE
 
 config RTC_DEBUG
         bool "RTC debug support"
-        depends on RTC_CLASS = y
         help
           Say yes here to enable debugging support in the RTC framework
           and individual RTC drivers.
@@ -61,7 +59,6 @@ comment "RTC interfaces"
 config RTC_INTF_SYSFS
         boolean "/sys/class/rtc/rtcN (sysfs)"
         depends on SYSFS
-        default RTC_CLASS
         help
           Say yes here if you want to use your RTCs using sysfs interfaces,
           /sys/class/rtc/rtc0 through /sys/.../rtcN.
@@ -69,19 +66,19 @@ config RTC_INTF_SYSFS
           If unsure, say Y.
 
 config RTC_INTF_PROC
-        boolean "/proc/driver/rtc (procfs for rtc0)"
+        boolean "/proc/driver/rtc (procfs for rtcN)"
         depends on PROC_FS
-        default RTC_CLASS
         help
-          Say yes here if you want to use your first RTC through the proc
-          interface, /proc/driver/rtc. Other RTCs will not be available
-          through that API.
+          Say yes here if you want to use your system clock RTC through
+          the proc interface, /proc/driver/rtc.
+          Other RTCs will not be available through that API.
+          If there is no RTC for the system clock, then the first RTC(rtc0)
+          is used by default.
 
           If unsure, say Y.
 
 config RTC_INTF_DEV
         boolean "/dev/rtcN (character devices)"
-        default RTC_CLASS
         help
           Say yes here if you want to use your RTCs using the /dev
           interfaces, which "udev" sets up as /dev/rtc0 through
@@ -127,7 +124,7 @@ if I2C
 
 config RTC_DRV_88PM860X
         tristate "Marvell 88PM860x"
-        depends on RTC_CLASS && I2C && MFD_88PM860X
+        depends on I2C && MFD_88PM860X
         help
           If you say yes here you get support for RTC function in Marvell
           88PM860x chips.
@@ -137,7 +134,7 @@ config RTC_DRV_88PM860X
 
 config RTC_DRV_88PM80X
         tristate "Marvell 88PM80x"
-        depends on RTC_CLASS && I2C && MFD_88PM800
+        depends on I2C && MFD_88PM800
         help
           If you say yes here you get support for RTC function in Marvell
           88PM80x chips.
@@ -165,7 +162,7 @@ config RTC_DRV_DS1307
 
 config RTC_DRV_DS1374
         tristate "Dallas/Maxim DS1374"
-        depends on RTC_CLASS && I2C
+        depends on I2C
         help
           If you say yes here you get support for Dallas Semiconductor
           DS1374 real-time clock chips. If an interrupt is associated
@@ -185,7 +182,7 @@ config RTC_DRV_DS1672
 
 config RTC_DRV_DS3232
         tristate "Dallas/Maxim DS3232"
-        depends on RTC_CLASS && I2C
+        depends on I2C
         help
           If you say yes here you get support for Dallas Semiconductor
           DS3232 real-time clock chips. If an interrupt is associated
@@ -203,6 +200,16 @@ config RTC_DRV_MAX6900
           This driver can also be built as a module. If so, the module
           will be called rtc-max6900.
 
+config RTC_DRV_MAX8907
+        tristate "Maxim MAX8907"
+        depends on MFD_MAX8907
+        help
+          If you say yes here you will get support for the
+          RTC of Maxim MAX8907 PMIC.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-max8907.
+
 config RTC_DRV_MAX8925
         tristate "Maxim MAX8925"
         depends on MFD_MAX8925
@@ -325,7 +332,7 @@ config RTC_DRV_TWL92330
 
 config RTC_DRV_TWL4030
         tristate "TI TWL4030/TWL5030/TWL6030/TPS659x0"
-        depends on RTC_CLASS && TWL4030_CORE
+        depends on TWL4030_CORE
         help
           If you say yes here you get support for the RTC on the
           TWL4030/TWL5030/TWL6030 family chips, used mostly with OMAP3 platforms.
@@ -333,6 +340,26 @@ config RTC_DRV_TWL4030
           This driver can also be built as a module. If so, the module
           will be called rtc-twl.
 
+config RTC_DRV_TPS65910
+        tristate "TI TPS65910 RTC driver"
+        depends on RTC_CLASS && MFD_TPS65910
+        help
+          If you say yes here you get support for the RTC on the
+          TPS65910 chips.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-tps65910.
+
+config RTC_DRV_RC5T583
+        tristate "RICOH 5T583 RTC driver"
+        depends on MFD_RC5T583
+        help
+          If you say yes here you get support for the RTC on the
+          RICOH 5T583 chips.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-rc5t583.
+
 config RTC_DRV_S35390A
         tristate "Seiko Instruments S-35390A"
         select BITREVERSE
@@ -538,7 +565,6 @@ config RTC_DRV_DS1302
 
 config RTC_DRV_DS1511
         tristate "Dallas DS1511"
-        depends on RTC_CLASS
         help
           If you say yes here you get support for the
           Dallas DS1511 timekeeping/watchdog chip.
@@ -583,7 +609,6 @@ config RTC_DRV_EFI
 
 config RTC_DRV_STK17TA8
         tristate "Simtek STK17TA8"
-        depends on RTC_CLASS
         help
           If you say yes here you get support for the
           Simtek STK17TA8 timekeeping chip.
@@ -658,6 +683,15 @@ config RTC_DRV_V3020
           This driver can also be built as a module. If so, the module
           will be called rtc-v3020.
 
+config RTC_DRV_DS2404
+        tristate "Dallas DS2404"
+        help
+          If you say yes here you get support for the
+          Dallas DS2404 RTC chip.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-ds2404.
+
 config RTC_DRV_WM831X
         tristate "Wolfson Microelectronics WM831x RTC"
         depends on MFD_WM831X
@@ -704,6 +738,7 @@ config RTC_DRV_AB3100
 config RTC_DRV_AB8500
         tristate "ST-Ericsson AB8500 RTC"
         depends on AB8500_CORE
+        select RTC_INTF_DEV
         select RTC_INTF_DEV_UIE_EMUL
         help
           Select this to enable the ST-Ericsson AB8500 power management IC RTC
@@ -711,7 +746,7 @@ config RTC_DRV_AB8500
 
 config RTC_DRV_NUC900
         tristate "NUC910/NUC920 RTC driver"
-        depends on RTC_CLASS && ARCH_W90X900
+        depends on ARCH_W90X900
         help
           If you say yes here you get support for the RTC subsystem of the
           NUC910/NUC920 used in embedded systems.
@@ -731,7 +766,6 @@ config RTC_DRV_DAVINCI
 config RTC_DRV_IMXDI
         tristate "Freescale IMX DryIce Real Time Clock"
         depends on SOC_IMX25
-        depends on RTC_CLASS
         help
            Support for Freescale IMX DryIce RTC
 
@@ -791,7 +825,7 @@ config RTC_DRV_SA1100
 
 config RTC_DRV_SH
         tristate "SuperH On-Chip RTC"
-        depends on RTC_CLASS && SUPERH && HAVE_CLK
+        depends on SUPERH && HAVE_CLK
         help
           Say Y here to enable support for the on-chip RTC found in
           most SuperH processors.
@@ -1023,7 +1057,6 @@ config RTC_DRV_MPC5121
 
 config RTC_DRV_JZ4740
         tristate "Ingenic JZ4740 SoC"
-        depends on RTC_CLASS
         depends on MACH_JZ4740
         help
           If you say yes here you get support for the Ingenic JZ4740 SoC RTC
@@ -1053,7 +1086,7 @@ config RTC_DRV_PM8XXX
 
 config RTC_DRV_TEGRA
         tristate "NVIDIA Tegra Internal RTC driver"
-        depends on RTC_CLASS && ARCH_TEGRA
+        depends on ARCH_TEGRA
         help
           If you say yes here you get support for the
           Tegra 200 series internal RTC module.
@@ -1090,7 +1123,6 @@ config RTC_DRV_LOONGSON1
 config RTC_DRV_MXC
         tristate "Freescale MXC Real Time Clock"
         depends on ARCH_MXC
-        depends on RTC_CLASS
         help
            If you say yes here you get support for the Freescale MXC
            RTC module.
@@ -1098,4 +1130,15 @@ config RTC_DRV_MXC
            This driver can also be built as a module, if so, the module
            will be called "rtc-mxc".
 
+config RTC_DRV_SNVS
+        tristate "Freescale SNVS RTC support"
+        depends on HAS_IOMEM
+        depends on OF
+        help
+           If you say yes here you get support for the Freescale SNVS
+           Low Power (LP) RTC module.
+
+           This driver can also be built as a module, if so, the module
+           will be called "rtc-snvs".
+
 endif # RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 0d5b2b66f90d..56297f0fd388 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_RTC_DRV_DS1511)	+= rtc-ds1511.o
 obj-$(CONFIG_RTC_DRV_DS1553)    += rtc-ds1553.o
 obj-$(CONFIG_RTC_DRV_DS1672)    += rtc-ds1672.o
 obj-$(CONFIG_RTC_DRV_DS1742)    += rtc-ds1742.o
+obj-$(CONFIG_RTC_DRV_DS2404)    += rtc-ds2404.o
 obj-$(CONFIG_RTC_DRV_DS3232)    += rtc-ds3232.o
 obj-$(CONFIG_RTC_DRV_DS3234)    += rtc-ds3234.o
 obj-$(CONFIG_RTC_DRV_EFI)       += rtc-efi.o
@@ -64,6 +65,7 @@ obj-$(CONFIG_RTC_DRV_M48T59)	+= rtc-m48t59.o
 obj-$(CONFIG_RTC_DRV_M48T86)    += rtc-m48t86.o
 obj-$(CONFIG_RTC_DRV_MXC)       += rtc-mxc.o
 obj-$(CONFIG_RTC_DRV_MAX6900)   += rtc-max6900.o
+obj-$(CONFIG_RTC_DRV_MAX8907)   += rtc-max8907.o
 obj-$(CONFIG_RTC_DRV_MAX8925)   += rtc-max8925.o
 obj-$(CONFIG_RTC_DRV_MAX8998)   += rtc-max8998.o
 obj-$(CONFIG_RTC_DRV_MAX6902)   += rtc-max6902.o
@@ -85,6 +87,7 @@ obj-$(CONFIG_RTC_DRV_PS3)	+= rtc-ps3.o
 obj-$(CONFIG_RTC_DRV_PUV3)      += rtc-puv3.o
 obj-$(CONFIG_RTC_DRV_PXA)       += rtc-pxa.o
 obj-$(CONFIG_RTC_DRV_R9701)     += rtc-r9701.o
+obj-$(CONFIG_RTC_DRV_RC5T583)   += rtc-rc5t583.o
 obj-$(CONFIG_RTC_DRV_RP5C01)    += rtc-rp5c01.o
 obj-$(CONFIG_RTC_DRV_RS5C313)   += rtc-rs5c313.o
 obj-$(CONFIG_RTC_DRV_RS5C348)   += rtc-rs5c348.o
@@ -96,6 +99,7 @@ obj-$(CONFIG_RTC_DRV_S35390A)	+= rtc-s35390a.o
 obj-$(CONFIG_RTC_DRV_S3C)       += rtc-s3c.o
 obj-$(CONFIG_RTC_DRV_SA1100)    += rtc-sa1100.o
 obj-$(CONFIG_RTC_DRV_SH)        += rtc-sh.o
+obj-$(CONFIG_RTC_DRV_SNVS)      += rtc-snvs.o
 obj-$(CONFIG_RTC_DRV_SPEAR)     += rtc-spear.o
 obj-$(CONFIG_RTC_DRV_STARFIRE)  += rtc-starfire.o
 obj-$(CONFIG_RTC_DRV_STK17TA8)  += rtc-stk17ta8.o
@@ -105,6 +109,7 @@ obj-$(CONFIG_RTC_DRV_TEGRA)	+= rtc-tegra.o
 obj-$(CONFIG_RTC_DRV_TEST)      += rtc-test.o
 obj-$(CONFIG_RTC_DRV_TILE)      += rtc-tile.o
 obj-$(CONFIG_RTC_DRV_TWL4030)   += rtc-twl.o
+obj-$(CONFIG_RTC_DRV_TPS65910)  += rtc-tps65910.o
 obj-$(CONFIG_RTC_DRV_TX4939)    += rtc-tx4939.o
 obj-$(CONFIG_RTC_DRV_V3020)     += rtc-v3020.o
 obj-$(CONFIG_RTC_DRV_VR41XX)    += rtc-vr41xx.o
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index dc4c2748bbc3..f8a0aab218cb 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -31,8 +31,12 @@ static void rtc_device_release(struct device *dev)
         kfree(rtc);
 }
 
-#if defined(CONFIG_PM) && defined(CONFIG_RTC_HCTOSYS_DEVICE)
+#ifdef CONFIG_RTC_HCTOSYS_DEVICE
+/* Result of the last RTC to system clock attempt. */
+int rtc_hctosys_ret = -ENODEV;
+#endif
 
+#if defined(CONFIG_PM) && defined(CONFIG_RTC_HCTOSYS_DEVICE)
 /*
  * On suspend(), measure the delta between one RTC and the
  * system's wall clock; restore it on resume().
@@ -84,6 +88,7 @@ static int rtc_resume(struct device *dev)
         struct timespec         new_system, new_rtc;
         struct timespec         sleep_time;
 
+        rtc_hctosys_ret = -ENODEV;
         if (strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE) != 0)
                 return 0;
 
@@ -117,6 +122,7 @@ static int rtc_resume(struct device *dev)
 
         if (sleep_time.tv_sec >= 0)
                 timekeeping_inject_sleeptime(&sleep_time);
+        rtc_hctosys_ret = 0;
         return 0;
 }
 
@@ -238,6 +244,7 @@ void rtc_device_unregister(struct rtc_device *rtc)
                 rtc_proc_del_device(rtc);
                 device_unregister(&rtc->dev);
                 rtc->ops = NULL;
+                ida_simple_remove(&rtc_ida, rtc->id);
                 mutex_unlock(&rtc->ops_lock);
                 put_device(&rtc->dev);
         }
diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c
index bc90b091f195..4aa60d74004e 100644
--- a/drivers/rtc/hctosys.c
+++ b/drivers/rtc/hctosys.c
@@ -22,8 +22,6 @@
  * the best guess is to add 0.5s.
  */
 
-int rtc_hctosys_ret = -ENODEV;
-
 static int __init rtc_hctosys(void)
 {
         int err = -ENODEV;
@@ -56,7 +54,7 @@ static int __init rtc_hctosys(void)
 
         rtc_tm_to_time(&tm, &tv.tv_sec);
 
-        do_settimeofday(&tv);
+        err = do_settimeofday(&tv);
 
         dev_info(rtc->dev.parent,
                 "setting system clock to "
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index 1dd61f402b04..2dfe7a2fb998 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -473,18 +473,7 @@ static struct platform_driver at91_rtc_driver = {
         },
 };
 
-static int __init at91_rtc_init(void)
-{
-        return platform_driver_register(&at91_rtc_driver);
-}
-module_init(at91_rtc_init);
-
-static void __exit at91_rtc_exit(void)
-{
-        platform_driver_unregister(&at91_rtc_driver);
-}
-module_exit(at91_rtc_exit);
-
+module_platform_driver(at91_rtc_driver);
 
 MODULE_AUTHOR("Michel Benoit");
 MODULE_DESCRIPTION("RTC driver for Atmel AT91SAM9x");
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index 76b2156d3c62..c8115b83e5ab 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -276,8 +276,7 @@ static void coh901331_shutdown(struct platform_device *pdev)
 
         clk_enable(rtap->clk);
         writel(0, rtap->virtbase + COH901331_IRQ_MASK);
-        clk_disable(rtap->clk);
-        clk_unprepare(rtap->clk);
+        clk_disable_unprepare(rtap->clk);
 }
 
 static struct platform_driver coh901331_driver = {
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index 7fa67d0df172..45d65c0b3a85 100644
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -37,8 +37,17 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
         unsigned char buf[4];
 
         struct i2c_msg msgs[] = {
-                {client->addr, 0, 1, &addr},    /* setup read ptr */
-                {client->addr, I2C_M_RD, 4, buf},       /* read date */
+                {/* setup read ptr */
+                        .addr = client->addr,
+                        .len = 1,
+                        .buf = &addr
+                },
+                {/* read date */
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = 4,
+                        .buf = buf
+                },
         };
 
         /* read date registers */
@@ -99,8 +108,17 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status)
         unsigned char addr = DS1672_REG_CONTROL;
 
         struct i2c_msg msgs[] = {
-                {client->addr, 0, 1, &addr},    /* setup read ptr */
-                {client->addr, I2C_M_RD, 1, status},    /* read control */
+                {/* setup read ptr */
+                        .addr = client->addr,
+                        .len = 1,
+                        .buf = &addr
+                },
+                {/* read control */
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = 1,
+                        .buf = status
+                },
         };
 
         /* read control register */
diff --git a/drivers/rtc/rtc-ds2404.c b/drivers/rtc/rtc-ds2404.c
new file mode 100644
index 000000000000..5ea9df7c8c31
--- /dev/null
+++ b/drivers/rtc/rtc-ds2404.c
@@ -0,0 +1,303 @@
+/*
+ * Copyright (C) 2012 Sven Schnelle <svens@stackframe.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/rtc.h>
+#include <linux/types.h>
+#include <linux/bcd.h>
+#include <linux/rtc-ds2404.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/slab.h>
+
+#include <linux/io.h>
+
+#define DS2404_STATUS_REG 0x200
+#define DS2404_CONTROL_REG 0x201
+#define DS2404_RTC_REG 0x202
+
+#define DS2404_WRITE_SCRATCHPAD_CMD 0x0f
+#define DS2404_READ_SCRATCHPAD_CMD 0xaa
+#define DS2404_COPY_SCRATCHPAD_CMD 0x55
+#define DS2404_READ_MEMORY_CMD 0xf0
+
+struct ds2404;
+
+struct ds2404_chip_ops {
+        int (*map_io)(struct ds2404 *chip, struct platform_device *pdev,
+                      struct ds2404_platform_data *pdata);
+        void (*unmap_io)(struct ds2404 *chip);
+};
+
+#define DS2404_RST      0
+#define DS2404_CLK      1
+#define DS2404_DQ       2
+
+struct ds2404_gpio {
+        const char *name;
+        unsigned int gpio;
+};
+
+struct ds2404 {
+        struct ds2404_gpio *gpio;
+        struct ds2404_chip_ops *ops;
+        struct rtc_device *rtc;
+};
+
+static struct ds2404_gpio ds2404_gpio[] = {
+        { "RTC RST", 0 },
+        { "RTC CLK", 0 },
+        { "RTC DQ", 0 },
+};
+
+static int ds2404_gpio_map(struct ds2404 *chip, struct platform_device *pdev,
+                          struct ds2404_platform_data *pdata)
+{
+        int i, err;
+
+        ds2404_gpio[DS2404_RST].gpio = pdata->gpio_rst;
+        ds2404_gpio[DS2404_CLK].gpio = pdata->gpio_clk;
+        ds2404_gpio[DS2404_DQ].gpio = pdata->gpio_dq;
+
+        for (i = 0; i < ARRAY_SIZE(ds2404_gpio); i++) {
+                err = gpio_request(ds2404_gpio[i].gpio, ds2404_gpio[i].name);
+                if (err) {
+                        printk(KERN_ERR "error mapping gpio %s: %d\n",
+                                ds2404_gpio[i].name, err);
+                        goto err_request;
+                }
+                if (i != DS2404_DQ)
+                        gpio_direction_output(ds2404_gpio[i].gpio, 1);
+        }
+
+        chip->gpio = ds2404_gpio;
+        return 0;
+
+err_request:
+        while (--i >= 0)
+                gpio_free(ds2404_gpio[i].gpio);
+        return err;
+}
+
+static void ds2404_gpio_unmap(struct ds2404 *chip)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(ds2404_gpio); i++)
+                gpio_free(ds2404_gpio[i].gpio);
+}
+
+static struct ds2404_chip_ops ds2404_gpio_ops = {
+        .map_io         = ds2404_gpio_map,
+        .unmap_io       = ds2404_gpio_unmap,
+};
+
+static void ds2404_reset(struct device *dev)
+{
+        gpio_set_value(ds2404_gpio[DS2404_RST].gpio, 0);
+        udelay(1000);
+        gpio_set_value(ds2404_gpio[DS2404_RST].gpio, 1);
+        gpio_set_value(ds2404_gpio[DS2404_CLK].gpio, 0);
+        gpio_direction_output(ds2404_gpio[DS2404_DQ].gpio, 0);
+        udelay(10);
+}
+
+static void ds2404_write_byte(struct device *dev, u8 byte)
+{
+        int i;
+
+        gpio_direction_output(ds2404_gpio[DS2404_DQ].gpio, 1);
+        for (i = 0; i < 8; i++) {
+                gpio_set_value(ds2404_gpio[DS2404_DQ].gpio, byte & (1 << i));
+                udelay(10);
+                gpio_set_value(ds2404_gpio[DS2404_CLK].gpio, 1);
+                udelay(10);
+                gpio_set_value(ds2404_gpio[DS2404_CLK].gpio, 0);
+                udelay(10);
+        }
+}
+
+static u8 ds2404_read_byte(struct device *dev)
+{
+        int i;
+        u8 ret = 0;
+
+        gpio_direction_input(ds2404_gpio[DS2404_DQ].gpio);
+
+        for (i = 0; i < 8; i++) {
+                gpio_set_value(ds2404_gpio[DS2404_CLK].gpio, 0);
+                udelay(10);
+                if (gpio_get_value(ds2404_gpio[DS2404_DQ].gpio))
+                        ret |= 1 << i;
+                gpio_set_value(ds2404_gpio[DS2404_CLK].gpio, 1);
+                udelay(10);
+        }
+        return ret;
+}
+
+static void ds2404_read_memory(struct device *dev, u16 offset,
+                               int length, u8 *out)
+{
+        ds2404_reset(dev);
+        ds2404_write_byte(dev, DS2404_READ_MEMORY_CMD);
+        ds2404_write_byte(dev, offset & 0xff);
+        ds2404_write_byte(dev, (offset >> 8) & 0xff);
+        while (length--)
+                *out++ = ds2404_read_byte(dev);
+}
+
+static void ds2404_write_memory(struct device *dev, u16 offset,
+                                int length, u8 *out)
+{
+        int i;
+        u8 ta01, ta02, es;
+
+        ds2404_reset(dev);
+        ds2404_write_byte(dev, DS2404_WRITE_SCRATCHPAD_CMD);
+        ds2404_write_byte(dev, offset & 0xff);
+        ds2404_write_byte(dev, (offset >> 8) & 0xff);
+
+        for (i = 0; i < length; i++)
+                ds2404_write_byte(dev, out[i]);
+
+        ds2404_reset(dev);
+        ds2404_write_byte(dev, DS2404_READ_SCRATCHPAD_CMD);
+
+        ta01 = ds2404_read_byte(dev);
+        ta02 = ds2404_read_byte(dev);
+        es = ds2404_read_byte(dev);
+
+        for (i = 0; i < length; i++) {
+                if (out[i] != ds2404_read_byte(dev)) {
+                        printk(KERN_ERR "read invalid data\n");
+                        return;
+                }
+        }
+
+        ds2404_reset(dev);
+        ds2404_write_byte(dev, DS2404_COPY_SCRATCHPAD_CMD);
+        ds2404_write_byte(dev, ta01);
+        ds2404_write_byte(dev, ta02);
+        ds2404_write_byte(dev, es);
+
+        gpio_direction_input(ds2404_gpio[DS2404_DQ].gpio);
+        while (gpio_get_value(ds2404_gpio[DS2404_DQ].gpio))
+                ;
+}
+
+static void ds2404_enable_osc(struct device *dev)
+{
+        u8 in[1] = { 0x10 }; /* enable oscillator */
+        ds2404_write_memory(dev, 0x201, 1, in);
+}
+
+static int ds2404_read_time(struct device *dev, struct rtc_time *dt)
+{
+        unsigned long time = 0;
+
+        ds2404_read_memory(dev, 0x203, 4, (u8 *)&time);
+        time = le32_to_cpu(time);
+
+        rtc_time_to_tm(time, dt);
+        return rtc_valid_tm(dt);
+}
+
+static int ds2404_set_mmss(struct device *dev, unsigned long secs)
+{
+        u32 time = cpu_to_le32(secs);
+        ds2404_write_memory(dev, 0x203, 4, (u8 *)&time);
+        return 0;
+}
+
+static const struct rtc_class_ops ds2404_rtc_ops = {
+        .read_time      = ds2404_read_time,
+        .set_mmss       = ds2404_set_mmss,
+};
+
+static int rtc_probe(struct platform_device *pdev)
+{
+        struct ds2404_platform_data *pdata = pdev->dev.platform_data;
+        struct ds2404 *chip;
+        int retval = -EBUSY;
+
+        chip = kzalloc(sizeof(struct ds2404), GFP_KERNEL);
+        if (!chip)
+                return -ENOMEM;
+
+        chip->ops = &ds2404_gpio_ops;
+
+        retval = chip->ops->map_io(chip, pdev, pdata);
+        if (retval)
+                goto err_chip;
+
+        dev_info(&pdev->dev, "using GPIOs RST:%d, CLK:%d, DQ:%d\n",
+                 chip->gpio[DS2404_RST].gpio, chip->gpio[DS2404_CLK].gpio,
+                 chip->gpio[DS2404_DQ].gpio);
+
+        platform_set_drvdata(pdev, chip);
+
+        chip->rtc = rtc_device_register("ds2404",
+                                &pdev->dev, &ds2404_rtc_ops, THIS_MODULE);
+        if (IS_ERR(chip->rtc)) {
+                retval = PTR_ERR(chip->rtc);
+                goto err_io;
+        }
+
+        ds2404_enable_osc(&pdev->dev);
+        return 0;
+
+err_io:
+        chip->ops->unmap_io(chip);
+err_chip:
+        kfree(chip);
+        return retval;
+}
+
+static int rtc_remove(struct platform_device *dev)
+{
+        struct ds2404 *chip = platform_get_drvdata(dev);
+        struct rtc_device *rtc = chip->rtc;
+
+        if (rtc)
+                rtc_device_unregister(rtc);
+
+        chip->ops->unmap_io(chip);
+        kfree(chip);
+
+        return 0;
+}
+
+static struct platform_driver rtc_device_driver = {
+        .probe  = rtc_probe,
+        .remove = rtc_remove,
+        .driver = {
+                .name   = "ds2404",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static __init int ds2404_init(void)
+{
+        return platform_driver_register(&rtc_device_driver);
+}
+
+static __exit void ds2404_exit(void)
+{
+        platform_driver_unregister(&rtc_device_driver);
+}
+
+module_init(ds2404_init);
+module_exit(ds2404_exit);
+
+MODULE_DESCRIPTION("DS2404 RTC");
+MODULE_AUTHOR("Sven Schnelle");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ds2404");
diff --git a/drivers/rtc/rtc-em3027.c b/drivers/rtc/rtc-em3027.c
index 0104ea7ebe50..f6c24ce35d36 100644
--- a/drivers/rtc/rtc-em3027.c
+++ b/drivers/rtc/rtc-em3027.c
@@ -49,8 +49,17 @@ static int em3027_get_time(struct device *dev, struct rtc_time *tm)
         unsigned char buf[7];
 
         struct i2c_msg msgs[] = {
-                {client->addr, 0, 1, &addr},            /* setup read addr */
-                {client->addr, I2C_M_RD, 7, buf},       /* read time/date */
+                {/* setup read addr */
+                        .addr = client->addr,
+                        .len = 1,
+                        .buf = &addr
+                },
+                {/* read time/date */
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = 7,
+                        .buf = buf
+                },
         };
 
         /* read time/date registers */
@@ -76,7 +85,9 @@ static int em3027_set_time(struct device *dev, struct rtc_time *tm)
         unsigned char buf[8];
 
         struct i2c_msg msg = {
-                client->addr, 0, 8, buf,        /* write time/date */
+                .addr = client->addr,
+                .len = 8,
+                .buf = buf,     /* write time/date */
         };
 
         buf[0] = EM3027_REG_WATCH_SEC;
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
index dd2aeee6c66a..26c81f233606 100644
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -68,9 +68,17 @@ isl1208_i2c_read_regs(struct i2c_client *client, u8 reg, u8 buf[],
 {
         u8 reg_addr[1] = { reg };
         struct i2c_msg msgs[2] = {
-                {client->addr, 0, sizeof(reg_addr), reg_addr}
-                ,
-                {client->addr, I2C_M_RD, len, buf}
+                {
+                        .addr = client->addr,
+                        .len = sizeof(reg_addr),
+                        .buf = reg_addr
+                },
+                {
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = len,
+                        .buf = buf
+                }
         };
         int ret;
 
@@ -90,7 +98,11 @@ isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],
 {
         u8 i2c_buf[ISL1208_REG_USR2 + 2];
         struct i2c_msg msgs[1] = {
-                {client->addr, 0, len + 1, i2c_buf}
+                {
+                        .addr = client->addr,
+                        .len = len + 1,
+                        .buf = i2c_buf
+                }
         };
         int ret;
 
@@ -697,6 +709,7 @@ isl1208_remove(struct i2c_client *client)
 
 static const struct i2c_device_id isl1208_id[] = {
         { "isl1208", 0 },
+        { "isl1218", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, isl1208_id);
diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c
index 05ab227eeff7..1224182d3eab 100644
--- a/drivers/rtc/rtc-jz4740.c
+++ b/drivers/rtc/rtc-jz4740.c
@@ -42,7 +42,7 @@ struct jz4740_rtc {
 
         struct rtc_device *rtc;
 
-        unsigned int irq;
+        int irq;
 
         spinlock_t lock;
 };
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 4e0f84af99a7..b885bcd08908 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -213,163 +213,14 @@ static int m41t80_rtc_set_time(struct device *dev, struct rtc_time *tm)
         return m41t80_set_datetime(to_i2c_client(dev), tm);
 }
 
-static int m41t80_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        int rc;
-
-        rc = i2c_smbus_read_byte_data(client, M41T80_REG_ALARM_MON);
-        if (rc < 0)
-                goto err;
-
-        if (enabled)
-                rc |= M41T80_ALMON_AFE;
-        else
-                rc &= ~M41T80_ALMON_AFE;
-
-        if (i2c_smbus_write_byte_data(client, M41T80_REG_ALARM_MON, rc) < 0)
-                goto err;
-
-        return 0;
-err:
-        return -EIO;
-}
-
-static int m41t80_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *t)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        u8 wbuf[1 + M41T80_ALARM_REG_SIZE];
-        u8 *buf = &wbuf[1];
-        u8 *reg = buf - M41T80_REG_ALARM_MON;
-        u8 dt_addr[1] = { M41T80_REG_ALARM_MON };
-        struct i2c_msg msgs_in[] = {
-                {
-                        .addr   = client->addr,
-                        .flags  = 0,
-                        .len    = 1,
-                        .buf    = dt_addr,
-                },
-                {
-                        .addr   = client->addr,
-                        .flags  = I2C_M_RD,
-                        .len    = M41T80_ALARM_REG_SIZE,
-                        .buf    = buf,
-                },
-        };
-        struct i2c_msg msgs[] = {
-                {
-                        .addr   = client->addr,
-                        .flags  = 0,
-                        .len    = 1 + M41T80_ALARM_REG_SIZE,
-                        .buf    = wbuf,
-                 },
-        };
-
-        if (i2c_transfer(client->adapter, msgs_in, 2) < 0) {
-                dev_err(&client->dev, "read error\n");
-                return -EIO;
-        }
-        reg[M41T80_REG_ALARM_MON] &= ~(0x1f | M41T80_ALMON_AFE);
-        reg[M41T80_REG_ALARM_DAY] = 0;
-        reg[M41T80_REG_ALARM_HOUR] &= ~(0x3f | 0x80);
-        reg[M41T80_REG_ALARM_MIN] = 0;
-        reg[M41T80_REG_ALARM_SEC] = 0;
-
-        wbuf[0] = M41T80_REG_ALARM_MON; /* offset into rtc's regs */
-        reg[M41T80_REG_ALARM_SEC] |= t->time.tm_sec >= 0 ?
-                bin2bcd(t->time.tm_sec) : 0x80;
-        reg[M41T80_REG_ALARM_MIN] |= t->time.tm_min >= 0 ?
-                bin2bcd(t->time.tm_min) : 0x80;
-        reg[M41T80_REG_ALARM_HOUR] |= t->time.tm_hour >= 0 ?
-                bin2bcd(t->time.tm_hour) : 0x80;
-        reg[M41T80_REG_ALARM_DAY] |= t->time.tm_mday >= 0 ?
-                bin2bcd(t->time.tm_mday) : 0x80;
-        if (t->time.tm_mon >= 0)
-                reg[M41T80_REG_ALARM_MON] |= bin2bcd(t->time.tm_mon + 1);
-        else
-                reg[M41T80_REG_ALARM_DAY] |= 0x40;
-
-        if (i2c_transfer(client->adapter, msgs, 1) != 1) {
-                dev_err(&client->dev, "write error\n");
-                return -EIO;
-        }
-
-        if (t->enabled) {
-                reg[M41T80_REG_ALARM_MON] |= M41T80_ALMON_AFE;
-                if (i2c_smbus_write_byte_data(client, M41T80_REG_ALARM_MON,
-                                              reg[M41T80_REG_ALARM_MON]) < 0) {
-                        dev_err(&client->dev, "write error\n");
-                        return -EIO;
-                }
-        }
-        return 0;
-}
-
-static int m41t80_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *t)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        u8 buf[M41T80_ALARM_REG_SIZE + 1]; /* all alarm regs and flags */
-        u8 dt_addr[1] = { M41T80_REG_ALARM_MON };
-        u8 *reg = buf - M41T80_REG_ALARM_MON;
-        struct i2c_msg msgs[] = {
-                {
-                        .addr   = client->addr,
-                        .flags  = 0,
-                        .len    = 1,
-                        .buf    = dt_addr,
-                },
-                {
-                        .addr   = client->addr,
-                        .flags  = I2C_M_RD,
-                        .len    = M41T80_ALARM_REG_SIZE + 1,
-                        .buf    = buf,
-                },
-        };
-
-        if (i2c_transfer(client->adapter, msgs, 2) < 0) {
-                dev_err(&client->dev, "read error\n");
-                return -EIO;
-        }
-        t->time.tm_sec = -1;
-        t->time.tm_min = -1;
-        t->time.tm_hour = -1;
-        t->time.tm_mday = -1;
-        t->time.tm_mon = -1;
-        if (!(reg[M41T80_REG_ALARM_SEC] & 0x80))
-                t->time.tm_sec = bcd2bin(reg[M41T80_REG_ALARM_SEC] & 0x7f);
-        if (!(reg[M41T80_REG_ALARM_MIN] & 0x80))
-                t->time.tm_min = bcd2bin(reg[M41T80_REG_ALARM_MIN] & 0x7f);
-        if (!(reg[M41T80_REG_ALARM_HOUR] & 0x80))
-                t->time.tm_hour = bcd2bin(reg[M41T80_REG_ALARM_HOUR] & 0x3f);
-        if (!(reg[M41T80_REG_ALARM_DAY] & 0x80))
-                t->time.tm_mday = bcd2bin(reg[M41T80_REG_ALARM_DAY] & 0x3f);
-        if (!(reg[M41T80_REG_ALARM_DAY] & 0x40))
-                t->time.tm_mon = bcd2bin(reg[M41T80_REG_ALARM_MON] & 0x1f) - 1;
-        t->time.tm_year = -1;
-        t->time.tm_wday = -1;
-        t->time.tm_yday = -1;
-        t->time.tm_isdst = -1;
-        t->enabled = !!(reg[M41T80_REG_ALARM_MON] & M41T80_ALMON_AFE);
-        t->pending = !!(reg[M41T80_REG_FLAGS] & M41T80_FLAGS_AF);
-        return 0;
-}
-
+/*
+ * XXX - m41t80 alarm functionality is reported broken.
+ * until it is fixed, don't register alarm functions.
+ */
 static struct rtc_class_ops m41t80_rtc_ops = {
         .read_time = m41t80_rtc_read_time,
         .set_time = m41t80_rtc_set_time,
-        /*
-         * XXX - m41t80 alarm functionality is reported broken.
-         * until it is fixed, don't register alarm functions.
-         *
-        .read_alarm = m41t80_rtc_read_alarm,
-        .set_alarm = m41t80_rtc_set_alarm,
-        */
         .proc = m41t80_rtc_proc,
-        /*
-         * See above comment on broken alarm
-         *
-        .alarm_irq_enable = m41t80_rtc_alarm_irq_enable,
-        */
 };
 
 #if defined(CONFIG_RTC_INTF_SYSFS) || defined(CONFIG_RTC_INTF_SYSFS_MODULE)
diff --git a/drivers/rtc/rtc-max8907.c b/drivers/rtc/rtc-max8907.c
new file mode 100644
index 000000000000..e094ffa434f8
--- /dev/null
+++ b/drivers/rtc/rtc-max8907.c
@@ -0,0 +1,244 @@
+/*
+ * RTC driver for Maxim MAX8907
+ *
+ * Copyright (c) 2011-2012, NVIDIA Corporation.
+ *
+ * Based on drivers/rtc/rtc-max8925.c,
+ * Copyright (C) 2009-2010 Marvell International Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/bcd.h>
+#include <linux/i2c.h>
+#include <linux/mfd/max8907.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/rtc.h>
+#include <linux/slab.h>
+
+enum {
+        RTC_SEC = 0,
+        RTC_MIN,
+        RTC_HOUR,
+        RTC_WEEKDAY,
+        RTC_DATE,
+        RTC_MONTH,
+        RTC_YEAR1,
+        RTC_YEAR2,
+};
+
+#define TIME_NUM                        8
+#define ALARM_1SEC                      (1 << 7)
+#define HOUR_12                         (1 << 7)
+#define HOUR_AM_PM                      (1 << 5)
+#define ALARM0_IRQ                      (1 << 3)
+#define ALARM1_IRQ                      (1 << 2)
+#define ALARM0_STATUS                   (1 << 2)
+#define ALARM1_STATUS                   (1 << 1)
+
+struct max8907_rtc {
+        struct max8907          *max8907;
+        struct regmap           *regmap;
+        struct rtc_device       *rtc_dev;
+        int                     irq;
+};
+
+static irqreturn_t max8907_irq_handler(int irq, void *data)
+{
+        struct max8907_rtc *rtc = data;
+
+        regmap_update_bits(rtc->regmap, MAX8907_REG_ALARM0_CNTL, 0x7f, 0);
+
+        rtc_update_irq(rtc->rtc_dev, 1, RTC_IRQF | RTC_AF);
+
+        return IRQ_HANDLED;
+}
+
+static void regs_to_tm(u8 *regs, struct rtc_time *tm)
+{
+        tm->tm_year = bcd2bin(regs[RTC_YEAR2]) * 100 +
+                bcd2bin(regs[RTC_YEAR1]) - 1900;
+        tm->tm_mon = bcd2bin(regs[RTC_MONTH] & 0x1f) - 1;
+        tm->tm_mday = bcd2bin(regs[RTC_DATE] & 0x3f);
+        tm->tm_wday = (regs[RTC_WEEKDAY] & 0x07) - 1;
+        if (regs[RTC_HOUR] & HOUR_12) {
+                tm->tm_hour = bcd2bin(regs[RTC_HOUR] & 0x01f);
+                if (tm->tm_hour == 12)
+                        tm->tm_hour = 0;
+                if (regs[RTC_HOUR] & HOUR_AM_PM)
+                        tm->tm_hour += 12;
+        } else {
+                tm->tm_hour = bcd2bin(regs[RTC_HOUR] & 0x03f);
+        }
+        tm->tm_min = bcd2bin(regs[RTC_MIN] & 0x7f);
+        tm->tm_sec = bcd2bin(regs[RTC_SEC] & 0x7f);
+}
+
+static void tm_to_regs(struct rtc_time *tm, u8 *regs)
+{
+        u8 high, low;
+
+        high = (tm->tm_year + 1900) / 100;
+        low = tm->tm_year % 100;
+        regs[RTC_YEAR2] = bin2bcd(high);
+        regs[RTC_YEAR1] = bin2bcd(low);
+        regs[RTC_MONTH] = bin2bcd(tm->tm_mon + 1);
+        regs[RTC_DATE] = bin2bcd(tm->tm_mday);
+        regs[RTC_WEEKDAY] = tm->tm_wday + 1;
+        regs[RTC_HOUR] = bin2bcd(tm->tm_hour);
+        regs[RTC_MIN] = bin2bcd(tm->tm_min);
+        regs[RTC_SEC] = bin2bcd(tm->tm_sec);
+}
+
+static int max8907_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct max8907_rtc *rtc = dev_get_drvdata(dev);
+        u8 regs[TIME_NUM];
+        int ret;
+
+        ret = regmap_bulk_read(rtc->regmap, MAX8907_REG_RTC_SEC, regs,
+                               TIME_NUM);
+        if (ret < 0)
+                return ret;
+
+        regs_to_tm(regs, tm);
+
+        return 0;
+}
+
+static int max8907_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct max8907_rtc *rtc = dev_get_drvdata(dev);
+        u8 regs[TIME_NUM];
+
+        tm_to_regs(tm, regs);
+
+        return regmap_bulk_write(rtc->regmap, MAX8907_REG_RTC_SEC, regs,
+                                 TIME_NUM);
+}
+
+static int max8907_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct max8907_rtc *rtc = dev_get_drvdata(dev);
+        u8 regs[TIME_NUM];
+        unsigned int val;
+        int ret;
+
+        ret = regmap_bulk_read(rtc->regmap, MAX8907_REG_ALARM0_SEC, regs,
+                               TIME_NUM);
+        if (ret < 0)
+                return ret;
+
+        regs_to_tm(regs, &alrm->time);
+
+        ret = regmap_read(rtc->regmap, MAX8907_REG_ALARM0_CNTL, &val);
+        if (ret < 0)
+                return ret;
+
+        alrm->enabled = !!(val & 0x7f);
+
+        return 0;
+}
+
+static int max8907_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct max8907_rtc *rtc = dev_get_drvdata(dev);
+        u8 regs[TIME_NUM];
+        int ret;
+
+        tm_to_regs(&alrm->time, regs);
+
+        /* Disable alarm while we update the target time */
+        ret = regmap_update_bits(rtc->regmap, MAX8907_REG_ALARM0_CNTL, 0x7f, 0);
+        if (ret < 0)
+                return ret;
+
+        ret = regmap_bulk_write(rtc->regmap, MAX8907_REG_ALARM0_SEC, regs,
+                                TIME_NUM);
+        if (ret < 0)
+                return ret;
+
+        if (alrm->enabled)
+                ret = regmap_update_bits(rtc->regmap, MAX8907_REG_ALARM0_CNTL,
+                                         0x7f, 0x7f);
+
+        return ret;
+}
+
+static const struct rtc_class_ops max8907_rtc_ops = {
+        .read_time      = max8907_rtc_read_time,
+        .set_time       = max8907_rtc_set_time,
+        .read_alarm     = max8907_rtc_read_alarm,
+        .set_alarm      = max8907_rtc_set_alarm,
+};
+
+static int __devinit max8907_rtc_probe(struct platform_device *pdev)
+{
+        struct max8907 *max8907 = dev_get_drvdata(pdev->dev.parent);
+        struct max8907_rtc *rtc;
+        int ret;
+
+        rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
+        if (!rtc)
+                return -ENOMEM;
+        platform_set_drvdata(pdev, rtc);
+
+        rtc->max8907 = max8907;
+        rtc->regmap = max8907->regmap_rtc;
+
+        rtc->rtc_dev = rtc_device_register("max8907-rtc", &pdev->dev,
+                                        &max8907_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc->rtc_dev)) {
+                ret = PTR_ERR(rtc->rtc_dev);
+                dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
+                return ret;
+        }
+
+        rtc->irq = regmap_irq_get_virq(max8907->irqc_rtc,
+                                       MAX8907_IRQ_RTC_ALARM0);
+        if (rtc->irq < 0) {
+                ret = rtc->irq;
+                goto err_unregister;
+        }
+
+        ret = request_threaded_irq(rtc->irq, NULL, max8907_irq_handler,
+                                   IRQF_ONESHOT, "max8907-alarm0", rtc);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Failed to request IRQ%d: %d\n",
+                        rtc->irq, ret);
+                goto err_unregister;
+        }
+
+        return 0;
+
+err_unregister:
+        rtc_device_unregister(rtc->rtc_dev);
+        return ret;
+}
+
+static int __devexit max8907_rtc_remove(struct platform_device *pdev)
+{
+        struct max8907_rtc *rtc = platform_get_drvdata(pdev);
+
+        free_irq(rtc->irq, rtc);
+        rtc_device_unregister(rtc->rtc_dev);
+
+        return 0;
+}
+
+static struct platform_driver max8907_rtc_driver = {
+        .driver = {
+                .name = "max8907-rtc",
+                .owner = THIS_MODULE,
+        },
+        .probe = max8907_rtc_probe,
+        .remove = __devexit_p(max8907_rtc_remove),
+};
+module_platform_driver(max8907_rtc_driver);
+
+MODULE_DESCRIPTION("Maxim MAX8907 RTC driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
index e3e50d69baf8..cd0106293a49 100644
--- a/drivers/rtc/rtc-mxc.c
+++ b/drivers/rtc/rtc-mxc.c
@@ -343,7 +343,7 @@ static struct rtc_class_ops mxc_rtc_ops = {
         .alarm_irq_enable       = mxc_rtc_alarm_irq_enable,
 };
 
-static int __init mxc_rtc_probe(struct platform_device *pdev)
+static int __devinit mxc_rtc_probe(struct platform_device *pdev)
 {
         struct resource *res;
         struct rtc_device *rtc;
@@ -367,14 +367,14 @@ static int __init mxc_rtc_probe(struct platform_device *pdev)
         pdata->ioaddr = devm_ioremap(&pdev->dev, res->start,
                                      resource_size(res));
 
-        pdata->clk = clk_get(&pdev->dev, "rtc");
+        pdata->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(pdata->clk)) {
                 dev_err(&pdev->dev, "unable to get clock!\n");
                 ret = PTR_ERR(pdata->clk);
                 goto exit_free_pdata;
         }
 
-        clk_enable(pdata->clk);
+        clk_prepare_enable(pdata->clk);
         rate = clk_get_rate(pdata->clk);
 
         if (rate == 32768)
@@ -426,22 +426,20 @@ static int __init mxc_rtc_probe(struct platform_device *pdev)
 exit_clr_drvdata:
         platform_set_drvdata(pdev, NULL);
 exit_put_clk:
-        clk_disable(pdata->clk);
-        clk_put(pdata->clk);
+        clk_disable_unprepare(pdata->clk);
 
 exit_free_pdata:
 
         return ret;
 }
 
-static int __exit mxc_rtc_remove(struct platform_device *pdev)
+static int __devexit mxc_rtc_remove(struct platform_device *pdev)
 {
         struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
         rtc_device_unregister(pdata->rtc);
 
-        clk_disable(pdata->clk);
-        clk_put(pdata->clk);
+        clk_disable_unprepare(pdata->clk);
         platform_set_drvdata(pdev, NULL);
 
         return 0;
@@ -482,21 +480,11 @@ static struct platform_driver mxc_rtc_driver = {
 #endif
                    .owner       = THIS_MODULE,
         },
-        .remove         = __exit_p(mxc_rtc_remove),
+        .probe = mxc_rtc_probe,
+        .remove = __devexit_p(mxc_rtc_remove),
 };
 
-static int __init mxc_rtc_init(void)
-{
-        return platform_driver_probe(&mxc_rtc_driver, mxc_rtc_probe);
-}
-
-static void __exit mxc_rtc_exit(void)
-{
-        platform_driver_unregister(&mxc_rtc_driver);
-}
-
-module_init(mxc_rtc_init);
-module_exit(mxc_rtc_exit);
+module_platform_driver(mxc_rtc_driver)
 
 MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
 MODULE_DESCRIPTION("RTC driver for Freescale MXC");
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index c2fe426a6ef2..98e3a2b681e6 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -78,8 +78,17 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)
         unsigned char buf[13] = { PCF8563_REG_ST1 };
 
         struct i2c_msg msgs[] = {
-                { client->addr, 0, 1, buf },    /* setup read ptr */
-                { client->addr, I2C_M_RD, 13, buf },    /* read status + date */
+                {/* setup read ptr */
+                        .addr = client->addr,
+                        .len = 1,
+                        .buf = buf
+                },
+                {/* read status + date */
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = 13,
+                        .buf = buf
+                },
         };
 
         /* read registers */
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index 0a59fda5c09d..e96236ac2e78 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -18,6 +18,26 @@
 
 #include "rtc-core.h"
 
+#define NAME_SIZE       10
+
+#if defined(CONFIG_RTC_HCTOSYS_DEVICE)
+static bool is_rtc_hctosys(struct rtc_device *rtc)
+{
+        int size;
+        char name[NAME_SIZE];
+
+        size = scnprintf(name, NAME_SIZE, "rtc%d", rtc->id);
+        if (size > NAME_SIZE)
+                return false;
+
+        return !strncmp(name, CONFIG_RTC_HCTOSYS_DEVICE, NAME_SIZE);
+}
+#else
+static bool is_rtc_hctosys(struct rtc_device *rtc)
+{
+        return (rtc->id == 0);
+}
+#endif
 
 static int rtc_proc_show(struct seq_file *seq, void *offset)
 {
@@ -117,12 +137,12 @@ static const struct file_operations rtc_proc_fops = {
 
 void rtc_proc_add_device(struct rtc_device *rtc)
 {
-        if (rtc->id == 0)
+        if (is_rtc_hctosys(rtc))
                 proc_create_data("driver/rtc", 0, NULL, &rtc_proc_fops, rtc);
 }
 
 void rtc_proc_del_device(struct rtc_device *rtc)
 {
-        if (rtc->id == 0)
+        if (is_rtc_hctosys(rtc))
                 remove_proc_entry("driver/rtc", NULL);
 }
diff --git a/drivers/rtc/rtc-rc5t583.c b/drivers/rtc/rtc-rc5t583.c
new file mode 100644
index 000000000000..cdb140c29c56
--- /dev/null
+++ b/drivers/rtc/rtc-rc5t583.c
@@ -0,0 +1,331 @@
+/*
+ * rtc-rc5t583.c -- RICOH RC5T583 Real Time Clock
+ *
+ * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+ * Author: Venu Byravarasu <vbyravarasu@nvidia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/rtc.h>
+#include <linux/bcd.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/rc5t583.h>
+
+struct rc5t583_rtc {
+        struct rtc_device       *rtc;
+        /* To store the list of enabled interrupts, during system suspend */
+        u32 irqen;
+};
+
+/* Total number of RTC registers needed to set time*/
+#define NUM_TIME_REGS   (RC5T583_RTC_YEAR - RC5T583_RTC_SEC + 1)
+
+/* Total number of RTC registers needed to set Y-Alarm*/
+#define NUM_YAL_REGS    (RC5T583_RTC_AY_YEAR - RC5T583_RTC_AY_MIN + 1)
+
+/* Set Y-Alarm interrupt */
+#define SET_YAL BIT(5)
+
+/* Get Y-Alarm interrupt status*/
+#define GET_YAL_STATUS BIT(3)
+
+static int rc5t583_rtc_alarm_irq_enable(struct device *dev, unsigned enabled)
+{
+        struct rc5t583 *rc5t583 = dev_get_drvdata(dev->parent);
+        u8 val;
+
+        /* Set Y-Alarm, based on 'enabled' */
+        val = enabled ? SET_YAL : 0;
+
+        return regmap_update_bits(rc5t583->regmap, RC5T583_RTC_CTL1, SET_YAL,
+                val);
+}
+
+/*
+ * Gets current rc5t583 RTC time and date parameters.
+ *
+ * The RTC's time/alarm representation is not what gmtime(3) requires
+ * Linux to use:
+ *
+ *  - Months are 1..12 vs Linux 0-11
+ *  - Years are 0..99 vs Linux 1900..N (we assume 21st century)
+ */
+static int rc5t583_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct rc5t583 *rc5t583 = dev_get_drvdata(dev->parent);
+        u8 rtc_data[NUM_TIME_REGS];
+        int ret;
+
+        ret = regmap_bulk_read(rc5t583->regmap, RC5T583_RTC_SEC, rtc_data,
+                NUM_TIME_REGS);
+        if (ret < 0) {
+                dev_err(dev, "RTC read time failed with err:%d\n", ret);
+                return ret;
+        }
+
+        tm->tm_sec = bcd2bin(rtc_data[0]);
+        tm->tm_min = bcd2bin(rtc_data[1]);
+        tm->tm_hour = bcd2bin(rtc_data[2]);
+        tm->tm_wday = bcd2bin(rtc_data[3]);
+        tm->tm_mday = bcd2bin(rtc_data[4]);
+        tm->tm_mon = bcd2bin(rtc_data[5]) - 1;
+        tm->tm_year = bcd2bin(rtc_data[6]) + 100;
+
+        return ret;
+}
+
+static int rc5t583_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct rc5t583 *rc5t583 = dev_get_drvdata(dev->parent);
+        unsigned char rtc_data[NUM_TIME_REGS];
+        int ret;
+
+        rtc_data[0] = bin2bcd(tm->tm_sec);
+        rtc_data[1] = bin2bcd(tm->tm_min);
+        rtc_data[2] = bin2bcd(tm->tm_hour);
+        rtc_data[3] = bin2bcd(tm->tm_wday);
+        rtc_data[4] = bin2bcd(tm->tm_mday);
+        rtc_data[5] = bin2bcd(tm->tm_mon + 1);
+        rtc_data[6] = bin2bcd(tm->tm_year - 100);
+
+        ret = regmap_bulk_write(rc5t583->regmap, RC5T583_RTC_SEC, rtc_data,
+                NUM_TIME_REGS);
+        if (ret < 0) {
+                dev_err(dev, "RTC set time failed with error %d\n", ret);
+                return ret;
+        }
+
+        return ret;
+}
+
+static int rc5t583_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        struct rc5t583 *rc5t583 = dev_get_drvdata(dev->parent);
+        unsigned char alarm_data[NUM_YAL_REGS];
+        u32 interrupt_enable;
+        int ret;
+
+        ret = regmap_bulk_read(rc5t583->regmap, RC5T583_RTC_AY_MIN, alarm_data,
+                NUM_YAL_REGS);
+        if (ret < 0) {
+                dev_err(dev, "rtc_read_alarm error %d\n", ret);
+                return ret;
+        }
+
+        alm->time.tm_min = bcd2bin(alarm_data[0]);
+        alm->time.tm_hour = bcd2bin(alarm_data[1]);
+        alm->time.tm_mday = bcd2bin(alarm_data[2]);
+        alm->time.tm_mon = bcd2bin(alarm_data[3]) - 1;
+        alm->time.tm_year = bcd2bin(alarm_data[4]) + 100;
+
+        ret = regmap_read(rc5t583->regmap, RC5T583_RTC_CTL1, &interrupt_enable);
+        if (ret < 0)
+                return ret;
+
+        /* check if YALE is set */
+        if (interrupt_enable & SET_YAL)
+                alm->enabled = 1;
+
+        return ret;
+}
+
+static int rc5t583_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        struct rc5t583 *rc5t583 = dev_get_drvdata(dev->parent);
+        unsigned char alarm_data[NUM_YAL_REGS];
+        int ret;
+
+        ret = rc5t583_rtc_alarm_irq_enable(dev, 0);
+        if (ret)
+                return ret;
+
+        alarm_data[0] = bin2bcd(alm->time.tm_min);
+        alarm_data[1] = bin2bcd(alm->time.tm_hour);
+        alarm_data[2] = bin2bcd(alm->time.tm_mday);
+        alarm_data[3] = bin2bcd(alm->time.tm_mon + 1);
+        alarm_data[4] = bin2bcd(alm->time.tm_year - 100);
+
+        ret = regmap_bulk_write(rc5t583->regmap, RC5T583_RTC_AY_MIN, alarm_data,
+                NUM_YAL_REGS);
+        if (ret) {
+                dev_err(dev, "rtc_set_alarm error %d\n", ret);
+                return ret;
+        }
+
+        if (alm->enabled)
+                ret = rc5t583_rtc_alarm_irq_enable(dev, 1);
+
+        return ret;
+}
+
+static irqreturn_t rc5t583_rtc_interrupt(int irq, void *rtc)
+{
+        struct device *dev = rtc;
+        struct rc5t583 *rc5t583 = dev_get_drvdata(dev->parent);
+        struct rc5t583_rtc *rc5t583_rtc = dev_get_drvdata(dev);
+        unsigned long events = 0;
+        int ret;
+        u32 rtc_reg;
+
+        ret = regmap_read(rc5t583->regmap, RC5T583_RTC_CTL2, &rtc_reg);
+        if (ret < 0)
+                return IRQ_NONE;
+
+        if (rtc_reg & GET_YAL_STATUS) {
+                events = RTC_IRQF | RTC_AF;
+                /* clear pending Y-alarm interrupt bit */
+                rtc_reg &= ~GET_YAL_STATUS;
+        }
+
+        ret = regmap_write(rc5t583->regmap, RC5T583_RTC_CTL2, rtc_reg);
+        if (ret)
+                return IRQ_NONE;
+
+        /* Notify RTC core on event */
+        rtc_update_irq(rc5t583_rtc->rtc, 1, events);
+
+        return IRQ_HANDLED;
+}
+
+static const struct rtc_class_ops rc5t583_rtc_ops = {
+        .read_time      = rc5t583_rtc_read_time,
+        .set_time       = rc5t583_rtc_set_time,
+        .read_alarm     = rc5t583_rtc_read_alarm,
+        .set_alarm      = rc5t583_rtc_set_alarm,
+        .alarm_irq_enable = rc5t583_rtc_alarm_irq_enable,
+};
+
+static int __devinit rc5t583_rtc_probe(struct platform_device *pdev)
+{
+        struct rc5t583 *rc5t583 = dev_get_drvdata(pdev->dev.parent);
+        struct rc5t583_rtc *ricoh_rtc;
+        struct rc5t583_platform_data *pmic_plat_data;
+        int ret;
+        int irq;
+
+        ricoh_rtc = devm_kzalloc(&pdev->dev, sizeof(struct rc5t583_rtc),
+                        GFP_KERNEL);
+        if (!ricoh_rtc)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, ricoh_rtc);
+
+        /* Clear pending interrupts */
+        ret = regmap_write(rc5t583->regmap, RC5T583_RTC_CTL2, 0);
+        if (ret < 0)
+                return ret;
+
+        /* clear RTC Adjust register */
+        ret = regmap_write(rc5t583->regmap, RC5T583_RTC_ADJ, 0);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "unable to program rtc_adjust reg\n");
+                return -EBUSY;
+        }
+
+        pmic_plat_data = dev_get_platdata(rc5t583->dev);
+        irq = pmic_plat_data->irq_base;
+        if (irq <= 0) {
+                dev_warn(&pdev->dev, "Wake up is not possible as irq = %d\n",
+                        irq);
+                return ret;
+        }
+
+        irq += RC5T583_IRQ_YALE;
+        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                rc5t583_rtc_interrupt, IRQF_TRIGGER_LOW,
+                "rtc-rc5t583", &pdev->dev);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "IRQ is not free.\n");
+                return ret;
+        }
+        device_init_wakeup(&pdev->dev, 1);
+
+        ricoh_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
+                &rc5t583_rtc_ops, THIS_MODULE);
+        if (IS_ERR(ricoh_rtc->rtc)) {
+                ret = PTR_ERR(ricoh_rtc->rtc);
+                dev_err(&pdev->dev, "RTC device register: err %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+/*
+ * Disable rc5t583 RTC interrupts.
+ * Sets status flag to free.
+ */
+static int __devexit rc5t583_rtc_remove(struct platform_device *pdev)
+{
+        struct rc5t583_rtc *rc5t583_rtc = dev_get_drvdata(&pdev->dev);
+
+        rc5t583_rtc_alarm_irq_enable(&rc5t583_rtc->rtc->dev, 0);
+
+        rtc_device_unregister(rc5t583_rtc->rtc);
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+
+static int rc5t583_rtc_suspend(struct device *dev)
+{
+        struct rc5t583 *rc5t583 = dev_get_drvdata(dev->parent);
+        struct rc5t583_rtc *rc5t583_rtc = dev_get_drvdata(dev);
+        int ret;
+
+        /* Store current list of enabled interrupts*/
+        ret = regmap_read(rc5t583->regmap, RC5T583_RTC_CTL1,
+                &rc5t583_rtc->irqen);
+        return ret;
+}
+
+static int rc5t583_rtc_resume(struct device *dev)
+{
+        struct rc5t583 *rc5t583 = dev_get_drvdata(dev->parent);
+        struct rc5t583_rtc *rc5t583_rtc = dev_get_drvdata(dev);
+
+        /* Restore list of enabled interrupts before suspend */
+        return regmap_write(rc5t583->regmap, RC5T583_RTC_CTL1,
+                rc5t583_rtc->irqen);
+}
+
+static const struct dev_pm_ops rc5t583_rtc_pm_ops = {
+        .suspend        = rc5t583_rtc_suspend,
+        .resume         = rc5t583_rtc_resume,
+};
+
+#define DEV_PM_OPS     (&rc5t583_rtc_pm_ops)
+#else
+#define DEV_PM_OPS     NULL
+#endif
+
+static struct platform_driver rc5t583_rtc_driver = {
+        .probe          = rc5t583_rtc_probe,
+        .remove         = __devexit_p(rc5t583_rtc_remove),
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "rtc-rc5t583",
+                .pm     = DEV_PM_OPS,
+        },
+};
+
+module_platform_driver(rc5t583_rtc_driver);
+MODULE_ALIAS("platform:rtc-rc5t583");
+MODULE_AUTHOR("Venu Byravarasu <vbyravarasu@nvidia.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index fb4842c3544e..76f565ae384d 100644
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -104,7 +104,12 @@ static int rs5c_get_regs(struct rs5c372 *rs5c)
 {
         struct i2c_client       *client = rs5c->client;
         struct i2c_msg          msgs[] = {
-                { client->addr, I2C_M_RD, sizeof rs5c->buf, rs5c->buf },
+                {
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = sizeof(rs5c->buf),
+                        .buf = rs5c->buf
+                },
         };
 
         /* This implements the third reading method from the datasheet, using
diff --git a/drivers/rtc/rtc-s35390a.c b/drivers/rtc/rtc-s35390a.c
index c9562ceedef3..8a092325188d 100644
--- a/drivers/rtc/rtc-s35390a.c
+++ b/drivers/rtc/rtc-s35390a.c
@@ -19,6 +19,8 @@
 #define S35390A_CMD_STATUS1     0
 #define S35390A_CMD_STATUS2     1
 #define S35390A_CMD_TIME1       2
+#define S35390A_CMD_TIME2       3
+#define S35390A_CMD_INT2_REG1   5
 
 #define S35390A_BYTE_YEAR       0
 #define S35390A_BYTE_MONTH      1
@@ -28,12 +30,23 @@
 #define S35390A_BYTE_MINS       5
 #define S35390A_BYTE_SECS       6
 
+#define S35390A_ALRM_BYTE_WDAY  0
+#define S35390A_ALRM_BYTE_HOURS 1
+#define S35390A_ALRM_BYTE_MINS  2
+
 #define S35390A_FLAG_POC        0x01
 #define S35390A_FLAG_BLD        0x02
 #define S35390A_FLAG_24H        0x40
 #define S35390A_FLAG_RESET      0x80
 #define S35390A_FLAG_TEST       0x01
 
+#define S35390A_INT2_MODE_MASK          0xF0
+
+#define S35390A_INT2_MODE_NOINTR        0x00
+#define S35390A_INT2_MODE_FREQ          0x10
+#define S35390A_INT2_MODE_ALARM         0x40
+#define S35390A_INT2_MODE_PMIN_EDG      0x20
+
 static const struct i2c_device_id s35390a_id[] = {
         { "s35390a", 0 },
         { }
@@ -50,7 +63,11 @@ static int s35390a_set_reg(struct s35390a *s35390a, int reg, char *buf, int len)
 {
         struct i2c_client *client = s35390a->client[reg];
         struct i2c_msg msg[] = {
-                { client->addr, 0, len, buf },
+                {
+                        .addr = client->addr,
+                        .len = len,
+                        .buf = buf
+                },
         };
 
         if ((i2c_transfer(client->adapter, msg, 1)) != 1)
@@ -63,7 +80,12 @@ static int s35390a_get_reg(struct s35390a *s35390a, int reg, char *buf, int len)
 {
         struct i2c_client *client = s35390a->client[reg];
         struct i2c_msg msg[] = {
-                { client->addr, I2C_M_RD, len, buf },
+                {
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = len,
+                        .buf = buf
+                },
         };
 
         if ((i2c_transfer(client->adapter, msg, 1)) != 1)
@@ -184,6 +206,104 @@ static int s35390a_get_datetime(struct i2c_client *client, struct rtc_time *tm)
         return rtc_valid_tm(tm);
 }
 
+static int s35390a_set_alarm(struct i2c_client *client, struct rtc_wkalrm *alm)
+{
+        struct s35390a *s35390a = i2c_get_clientdata(client);
+        char buf[3], sts = 0;
+        int err, i;
+
+        dev_dbg(&client->dev, "%s: alm is secs=%d, mins=%d, hours=%d mday=%d, "\
+                "mon=%d, year=%d, wday=%d\n", __func__, alm->time.tm_sec,
+                alm->time.tm_min, alm->time.tm_hour, alm->time.tm_mday,
+                alm->time.tm_mon, alm->time.tm_year, alm->time.tm_wday);
+
+        /* disable interrupt */
+        err = s35390a_set_reg(s35390a, S35390A_CMD_STATUS2, &sts, sizeof(sts));
+        if (err < 0)
+                return err;
+
+        /* clear pending interrupt, if any */
+        err = s35390a_get_reg(s35390a, S35390A_CMD_STATUS1, &sts, sizeof(sts));
+        if (err < 0)
+                return err;
+
+        if (alm->enabled)
+                sts = S35390A_INT2_MODE_ALARM;
+        else
+                sts = S35390A_INT2_MODE_NOINTR;
+
+        /* This chip expects the bits of each byte to be in reverse order */
+        sts = bitrev8(sts);
+
+        /* set interupt mode*/
+        err = s35390a_set_reg(s35390a, S35390A_CMD_STATUS2, &sts, sizeof(sts));
+        if (err < 0)
+                return err;
+
+        if (alm->time.tm_wday != -1)
+                buf[S35390A_ALRM_BYTE_WDAY] = bin2bcd(alm->time.tm_wday) | 0x80;
+
+        buf[S35390A_ALRM_BYTE_HOURS] = s35390a_hr2reg(s35390a,
+                        alm->time.tm_hour) | 0x80;
+        buf[S35390A_ALRM_BYTE_MINS] = bin2bcd(alm->time.tm_min) | 0x80;
+
+        if (alm->time.tm_hour >= 12)
+                buf[S35390A_ALRM_BYTE_HOURS] |= 0x40;
+
+        for (i = 0; i < 3; ++i)
+                buf[i] = bitrev8(buf[i]);
+
+        err = s35390a_set_reg(s35390a, S35390A_CMD_INT2_REG1, buf,
+                                                                sizeof(buf));
+
+        return err;
+}
+
+static int s35390a_read_alarm(struct i2c_client *client, struct rtc_wkalrm *alm)
+{
+        struct s35390a *s35390a = i2c_get_clientdata(client);
+        char buf[3], sts;
+        int i, err;
+
+        err = s35390a_get_reg(s35390a, S35390A_CMD_STATUS2, &sts, sizeof(sts));
+        if (err < 0)
+                return err;
+
+        if (bitrev8(sts) != S35390A_INT2_MODE_ALARM)
+                return -EINVAL;
+
+        err = s35390a_get_reg(s35390a, S35390A_CMD_INT2_REG1, buf, sizeof(buf));
+        if (err < 0)
+                return err;
+
+        /* This chip returns the bits of each byte in reverse order */
+        for (i = 0; i < 3; ++i) {
+                buf[i] = bitrev8(buf[i]);
+                buf[i] &= ~0x80;
+        }
+
+        alm->time.tm_wday = bcd2bin(buf[S35390A_ALRM_BYTE_WDAY]);
+        alm->time.tm_hour = s35390a_reg2hr(s35390a,
+                                                buf[S35390A_ALRM_BYTE_HOURS]);
+        alm->time.tm_min = bcd2bin(buf[S35390A_ALRM_BYTE_MINS]);
+
+        dev_dbg(&client->dev, "%s: alm is mins=%d, hours=%d, wday=%d\n",
+                        __func__, alm->time.tm_min, alm->time.tm_hour,
+                        alm->time.tm_wday);
+
+        return 0;
+}
+
+static int s35390a_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        return s35390a_read_alarm(to_i2c_client(dev), alm);
+}
+
+static int s35390a_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        return s35390a_set_alarm(to_i2c_client(dev), alm);
+}
+
 static int s35390a_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
         return s35390a_get_datetime(to_i2c_client(dev), tm);
@@ -197,6 +317,9 @@ static int s35390a_rtc_set_time(struct device *dev, struct rtc_time *tm)
 static const struct rtc_class_ops s35390a_rtc_ops = {
         .read_time      = s35390a_rtc_read_time,
         .set_time       = s35390a_rtc_set_time,
+        .set_alarm      = s35390a_rtc_set_alarm,
+        .read_alarm     = s35390a_rtc_read_alarm,
+
 };
 
 static struct i2c_driver s35390a_driver;
@@ -261,6 +384,8 @@ static int s35390a_probe(struct i2c_client *client,
         if (s35390a_get_datetime(client, &tm) < 0)
                 dev_warn(&client->dev, "clock needs to be set\n");
 
+        device_set_wakeup_capable(&client->dev, 1);
+
         s35390a->rtc = rtc_device_register(s35390a_driver.driver.name,
                                 &client->dev, &s35390a_rtc_ops, THIS_MODULE);
 
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index bfbd92c8d1c9..77823d21d314 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -476,13 +476,13 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
         s3c_rtc_tickno = platform_get_irq(pdev, 1);
         if (s3c_rtc_tickno < 0) {
                 dev_err(&pdev->dev, "no irq for rtc tick\n");
-                return -ENOENT;
+                return s3c_rtc_tickno;
         }
 
         s3c_rtc_alarmno = platform_get_irq(pdev, 0);
         if (s3c_rtc_alarmno < 0) {
                 dev_err(&pdev->dev, "no irq for alarm\n");
-                return -ENOENT;
+                return s3c_rtc_alarmno;
         }
 
         pr_debug("s3c2410_rtc: tick irq %d, alarm irq %d\n",
diff --git a/drivers/rtc/rtc-snvs.c b/drivers/rtc/rtc-snvs.c
new file mode 100644
index 000000000000..3c0da333f465
--- /dev/null
+++ b/drivers/rtc/rtc-snvs.c
@@ -0,0 +1,350 @@
+/*
+ * Copyright (C) 2011-2012 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/rtc.h>
+
+/* These register offsets are relative to LP (Low Power) range */
+#define SNVS_LPCR               0x04
+#define SNVS_LPSR               0x18
+#define SNVS_LPSRTCMR           0x1c
+#define SNVS_LPSRTCLR           0x20
+#define SNVS_LPTAR              0x24
+#define SNVS_LPPGDR             0x30
+
+#define SNVS_LPCR_SRTC_ENV      (1 << 0)
+#define SNVS_LPCR_LPTA_EN       (1 << 1)
+#define SNVS_LPCR_LPWUI_EN      (1 << 3)
+#define SNVS_LPSR_LPTA          (1 << 0)
+
+#define SNVS_LPPGDR_INIT        0x41736166
+#define CNTR_TO_SECS_SH         15
+
+struct snvs_rtc_data {
+        struct rtc_device *rtc;
+        void __iomem *ioaddr;
+        int irq;
+        spinlock_t lock;
+};
+
+static u32 rtc_read_lp_counter(void __iomem *ioaddr)
+{
+        u64 read1, read2;
+
+        do {
+                read1 = readl(ioaddr + SNVS_LPSRTCMR);
+                read1 <<= 32;
+                read1 |= readl(ioaddr + SNVS_LPSRTCLR);
+
+                read2 = readl(ioaddr + SNVS_LPSRTCMR);
+                read2 <<= 32;
+                read2 |= readl(ioaddr + SNVS_LPSRTCLR);
+        } while (read1 != read2);
+
+        /* Convert 47-bit counter to 32-bit raw second count */
+        return (u32) (read1 >> CNTR_TO_SECS_SH);
+}
+
+static void rtc_write_sync_lp(void __iomem *ioaddr)
+{
+        u32 count1, count2, count3;
+        int i;
+
+        /* Wait for 3 CKIL cycles */
+        for (i = 0; i < 3; i++) {
+                do {
+                        count1 = readl(ioaddr + SNVS_LPSRTCLR);
+                        count2 = readl(ioaddr + SNVS_LPSRTCLR);
+                } while (count1 != count2);
+
+                /* Now wait until counter value changes */
+                do {
+                        do {
+                                count2 = readl(ioaddr + SNVS_LPSRTCLR);
+                                count3 = readl(ioaddr + SNVS_LPSRTCLR);
+                        } while (count2 != count3);
+                } while (count3 == count1);
+        }
+}
+
+static int snvs_rtc_enable(struct snvs_rtc_data *data, bool enable)
+{
+        unsigned long flags;
+        int timeout = 1000;
+        u32 lpcr;
+
+        spin_lock_irqsave(&data->lock, flags);
+
+        lpcr = readl(data->ioaddr + SNVS_LPCR);
+        if (enable)
+                lpcr |= SNVS_LPCR_SRTC_ENV;
+        else
+                lpcr &= ~SNVS_LPCR_SRTC_ENV;
+        writel(lpcr, data->ioaddr + SNVS_LPCR);
+
+        spin_unlock_irqrestore(&data->lock, flags);
+
+        while (--timeout) {
+                lpcr = readl(data->ioaddr + SNVS_LPCR);
+
+                if (enable) {
+                        if (lpcr & SNVS_LPCR_SRTC_ENV)
+                                break;
+                } else {
+                        if (!(lpcr & SNVS_LPCR_SRTC_ENV))
+                                break;
+                }
+        }
+
+        if (!timeout)
+                return -ETIMEDOUT;
+
+        return 0;
+}
+
+static int snvs_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct snvs_rtc_data *data = dev_get_drvdata(dev);
+        unsigned long time = rtc_read_lp_counter(data->ioaddr);
+
+        rtc_time_to_tm(time, tm);
+
+        return 0;
+}
+
+static int snvs_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct snvs_rtc_data *data = dev_get_drvdata(dev);
+        unsigned long time;
+
+        rtc_tm_to_time(tm, &time);
+
+        /* Disable RTC first */
+        snvs_rtc_enable(data, false);
+
+        /* Write 32-bit time to 47-bit timer, leaving 15 LSBs blank */
+        writel(time << CNTR_TO_SECS_SH, data->ioaddr + SNVS_LPSRTCLR);
+        writel(time >> (32 - CNTR_TO_SECS_SH), data->ioaddr + SNVS_LPSRTCMR);
+
+        /* Enable RTC again */
+        snvs_rtc_enable(data, true);
+
+        return 0;
+}
+
+static int snvs_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct snvs_rtc_data *data = dev_get_drvdata(dev);
+        u32 lptar, lpsr;
+
+        lptar = readl(data->ioaddr + SNVS_LPTAR);
+        rtc_time_to_tm(lptar, &alrm->time);
+
+        lpsr = readl(data->ioaddr + SNVS_LPSR);
+        alrm->pending = (lpsr & SNVS_LPSR_LPTA) ? 1 : 0;
+
+        return 0;
+}
+
+static int snvs_rtc_alarm_irq_enable(struct device *dev, unsigned int enable)
+{
+        struct snvs_rtc_data *data = dev_get_drvdata(dev);
+        u32 lpcr;
+        unsigned long flags;
+
+        spin_lock_irqsave(&data->lock, flags);
+
+        lpcr = readl(data->ioaddr + SNVS_LPCR);
+        if (enable)
+                lpcr |= (SNVS_LPCR_LPTA_EN | SNVS_LPCR_LPWUI_EN);
+        else
+                lpcr &= ~(SNVS_LPCR_LPTA_EN | SNVS_LPCR_LPWUI_EN);
+        writel(lpcr, data->ioaddr + SNVS_LPCR);
+
+        spin_unlock_irqrestore(&data->lock, flags);
+
+        rtc_write_sync_lp(data->ioaddr);
+
+        return 0;
+}
+
+static int snvs_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct snvs_rtc_data *data = dev_get_drvdata(dev);
+        struct rtc_time *alrm_tm = &alrm->time;
+        unsigned long time;
+        unsigned long flags;
+        u32 lpcr;
+
+        rtc_tm_to_time(alrm_tm, &time);
+
+        spin_lock_irqsave(&data->lock, flags);
+
+        /* Have to clear LPTA_EN before programming new alarm time in LPTAR */
+        lpcr = readl(data->ioaddr + SNVS_LPCR);
+        lpcr &= ~SNVS_LPCR_LPTA_EN;
+        writel(lpcr, data->ioaddr + SNVS_LPCR);
+
+        spin_unlock_irqrestore(&data->lock, flags);
+
+        writel(time, data->ioaddr + SNVS_LPTAR);
+
+        /* Clear alarm interrupt status bit */
+        writel(SNVS_LPSR_LPTA, data->ioaddr + SNVS_LPSR);
+
+        return snvs_rtc_alarm_irq_enable(dev, alrm->enabled);
+}
+
+static const struct rtc_class_ops snvs_rtc_ops = {
+        .read_time = snvs_rtc_read_time,
+        .set_time = snvs_rtc_set_time,
+        .read_alarm = snvs_rtc_read_alarm,
+        .set_alarm = snvs_rtc_set_alarm,
+        .alarm_irq_enable = snvs_rtc_alarm_irq_enable,
+};
+
+static irqreturn_t snvs_rtc_irq_handler(int irq, void *dev_id)
+{
+        struct device *dev = dev_id;
+        struct snvs_rtc_data *data = dev_get_drvdata(dev);
+        u32 lpsr;
+        u32 events = 0;
+
+        lpsr = readl(data->ioaddr + SNVS_LPSR);
+
+        if (lpsr & SNVS_LPSR_LPTA) {
+                events |= (RTC_AF | RTC_IRQF);
+
+                /* RTC alarm should be one-shot */
+                snvs_rtc_alarm_irq_enable(dev, 0);
+
+                rtc_update_irq(data->rtc, 1, events);
+        }
+
+        /* clear interrupt status */
+        writel(lpsr, data->ioaddr + SNVS_LPSR);
+
+        return events ? IRQ_HANDLED : IRQ_NONE;
+}
+
+static int __devinit snvs_rtc_probe(struct platform_device *pdev)
+{
+        struct snvs_rtc_data *data;
+        struct resource *res;
+        int ret;
+
+        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        data->ioaddr = devm_request_and_ioremap(&pdev->dev, res);
+        if (!data->ioaddr)
+                return -EADDRNOTAVAIL;
+
+        data->irq = platform_get_irq(pdev, 0);
+        if (data->irq < 0)
+                return data->irq;
+
+        platform_set_drvdata(pdev, data);
+
+        spin_lock_init(&data->lock);
+
+        /* Initialize glitch detect */
+        writel(SNVS_LPPGDR_INIT, data->ioaddr + SNVS_LPPGDR);
+
+        /* Clear interrupt status */
+        writel(0xffffffff, data->ioaddr + SNVS_LPSR);
+
+        /* Enable RTC */
+        snvs_rtc_enable(data, true);
+
+        device_init_wakeup(&pdev->dev, true);
+
+        ret = devm_request_irq(&pdev->dev, data->irq, snvs_rtc_irq_handler,
+                               IRQF_SHARED, "rtc alarm", &pdev->dev);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to request irq %d: %d\n",
+                        data->irq, ret);
+                return ret;
+        }
+
+        data->rtc = rtc_device_register(pdev->name, &pdev->dev,
+                                        &snvs_rtc_ops, THIS_MODULE);
+        if (IS_ERR(data->rtc)) {
+                ret = PTR_ERR(data->rtc);
+                dev_err(&pdev->dev, "failed to register rtc: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int __devexit snvs_rtc_remove(struct platform_device *pdev)
+{
+        struct snvs_rtc_data *data = platform_get_drvdata(pdev);
+
+        rtc_device_unregister(data->rtc);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int snvs_rtc_suspend(struct device *dev)
+{
+        struct snvs_rtc_data *data = dev_get_drvdata(dev);
+
+        if (device_may_wakeup(dev))
+                enable_irq_wake(data->irq);
+
+        return 0;
+}
+
+static int snvs_rtc_resume(struct device *dev)
+{
+        struct snvs_rtc_data *data = dev_get_drvdata(dev);
+
+        if (device_may_wakeup(dev))
+                disable_irq_wake(data->irq);
+
+        return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(snvs_rtc_pm_ops, snvs_rtc_suspend, snvs_rtc_resume);
+
+static const struct of_device_id __devinitconst snvs_dt_ids[] = {
+        { .compatible = "fsl,sec-v4.0-mon-rtc-lp", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, snvs_dt_ids);
+
+static struct platform_driver snvs_rtc_driver = {
+        .driver = {
+                .name   = "snvs_rtc",
+                .owner  = THIS_MODULE,
+                .pm     = &snvs_rtc_pm_ops,
+                .of_match_table = snvs_dt_ids,
+        },
+        .probe          = snvs_rtc_probe,
+        .remove         = __devexit_p(snvs_rtc_remove),
+};
+module_platform_driver(snvs_rtc_driver);
+
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("Freescale SNVS RTC Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c
index e2785479113c..bb507d23f6ce 100644
--- a/drivers/rtc/rtc-spear.c
+++ b/drivers/rtc/rtc-spear.c
@@ -235,7 +235,7 @@ static int spear_rtc_read_time(struct device *dev, struct rtc_time *tm)
 static int spear_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
         struct spear_rtc_config *config = dev_get_drvdata(dev);
-        unsigned int time, date, err = 0;
+        unsigned int time, date;
 
         if (tm2bcd(tm) < 0)
                 return -EINVAL;
@@ -247,11 +247,8 @@ static int spear_rtc_set_time(struct device *dev, struct rtc_time *tm)
                 (tm->tm_year << YEAR_SHIFT);
         writel(time, config->ioaddr + TIME_REG);
         writel(date, config->ioaddr + DATE_REG);
-        err = is_write_complete(config);
-        if (err < 0)
-                return err;
 
-        return 0;
+        return is_write_complete(config);
 }
 
 /*
@@ -295,7 +292,8 @@ static int spear_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
 static int spear_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
 {
         struct spear_rtc_config *config = dev_get_drvdata(dev);
-        unsigned int time, date, err = 0;
+        unsigned int time, date;
+        int err;
 
         if (tm2bcd(&alm->time) < 0)
                 return -EINVAL;
@@ -357,7 +355,7 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev)
 {
         struct resource *res;
         struct spear_rtc_config *config;
-        unsigned int status = 0;
+        int status = 0;
         int irq;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 380083ca572f..b70e2bb63645 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -102,6 +102,12 @@ rtc_sysfs_set_max_user_freq(struct device *dev, struct device_attribute *attr,
         return n;
 }
 
+/**
+ * rtc_sysfs_show_hctosys - indicate if the given RTC set the system time
+ *
+ * Returns 1 if the system clock was set by this RTC at the last
+ * boot or resume event.
+ */
 static ssize_t
 rtc_sysfs_show_hctosys(struct device *dev, struct device_attribute *attr,
                 char *buf)
diff --git a/drivers/rtc/rtc-tps65910.c b/drivers/rtc/rtc-tps65910.c
new file mode 100644
index 000000000000..7a82337e4dee
--- /dev/null
+++ b/drivers/rtc/rtc-tps65910.c
@@ -0,0 +1,349 @@
+/*
+ * rtc-tps65910.c -- TPS65910 Real Time Clock interface
+ *
+ * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+ * Author: Venu Byravarasu <vbyravarasu@nvidia.com>
+ *
+ * Based on original TI driver rtc-twl.c
+ *   Copyright (C) 2007 MontaVista Software, Inc
+ *   Author: Alexandre Rusev <source@mvista.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/rtc.h>
+#include <linux/bcd.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/tps65910.h>
+
+struct tps65910_rtc {
+        struct rtc_device       *rtc;
+        /* To store the list of enabled interrupts */
+        u32 irqstat;
+};
+
+/* Total number of RTC registers needed to set time*/
+#define NUM_TIME_REGS   (TPS65910_YEARS - TPS65910_SECONDS + 1)
+
+static int tps65910_rtc_alarm_irq_enable(struct device *dev, unsigned enabled)
+{
+        struct tps65910 *tps = dev_get_drvdata(dev->parent);
+        u8 val = 0;
+
+        if (enabled)
+                val = TPS65910_RTC_INTERRUPTS_IT_ALARM;
+
+        return regmap_write(tps->regmap, TPS65910_RTC_INTERRUPTS, val);
+}
+
+/*
+ * Gets current tps65910 RTC time and date parameters.
+ *
+ * The RTC's time/alarm representation is not what gmtime(3) requires
+ * Linux to use:
+ *
+ *  - Months are 1..12 vs Linux 0-11
+ *  - Years are 0..99 vs Linux 1900..N (we assume 21st century)
+ */
+static int tps65910_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        unsigned char rtc_data[NUM_TIME_REGS];
+        struct tps65910 *tps = dev_get_drvdata(dev->parent);
+        int ret;
+
+        /* Copy RTC counting registers to static registers or latches */
+        ret = regmap_update_bits(tps->regmap, TPS65910_RTC_CTRL,
+                TPS65910_RTC_CTRL_GET_TIME, TPS65910_RTC_CTRL_GET_TIME);
+        if (ret < 0) {
+                dev_err(dev, "RTC CTRL reg update failed with err:%d\n", ret);
+                return ret;
+        }
+
+        ret = regmap_bulk_read(tps->regmap, TPS65910_SECONDS, rtc_data,
+                NUM_TIME_REGS);
+        if (ret < 0) {
+                dev_err(dev, "reading from RTC failed with err:%d\n", ret);
+                return ret;
+        }
+
+        tm->tm_sec = bcd2bin(rtc_data[0]);
+        tm->tm_min = bcd2bin(rtc_data[1]);
+        tm->tm_hour = bcd2bin(rtc_data[2]);
+        tm->tm_mday = bcd2bin(rtc_data[3]);
+        tm->tm_mon = bcd2bin(rtc_data[4]) - 1;
+        tm->tm_year = bcd2bin(rtc_data[5]) + 100;
+
+        return ret;
+}
+
+static int tps65910_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        unsigned char rtc_data[NUM_TIME_REGS];
+        struct tps65910 *tps = dev_get_drvdata(dev->parent);
+        int ret;
+
+        rtc_data[0] = bin2bcd(tm->tm_sec);
+        rtc_data[1] = bin2bcd(tm->tm_min);
+        rtc_data[2] = bin2bcd(tm->tm_hour);
+        rtc_data[3] = bin2bcd(tm->tm_mday);
+        rtc_data[4] = bin2bcd(tm->tm_mon + 1);
+        rtc_data[5] = bin2bcd(tm->tm_year - 100);
+
+        /* Stop RTC while updating the RTC time registers */
+        ret = regmap_update_bits(tps->regmap, TPS65910_RTC_CTRL,
+                TPS65910_RTC_CTRL_STOP_RTC, 0);
+        if (ret < 0) {
+                dev_err(dev, "RTC stop failed with err:%d\n", ret);
+                return ret;
+        }
+
+        /* update all the time registers in one shot */
+        ret = regmap_bulk_write(tps->regmap, TPS65910_SECONDS, rtc_data,
+                NUM_TIME_REGS);
+        if (ret < 0) {
+                dev_err(dev, "rtc_set_time error %d\n", ret);
+                return ret;
+        }
+
+        /* Start back RTC */
+        ret = regmap_update_bits(tps->regmap, TPS65910_RTC_CTRL,
+                TPS65910_RTC_CTRL_STOP_RTC, 1);
+        if (ret < 0)
+                dev_err(dev, "RTC start failed with err:%d\n", ret);
+
+        return ret;
+}
+
+/*
+ * Gets current tps65910 RTC alarm time.
+ */
+static int tps65910_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        unsigned char alarm_data[NUM_TIME_REGS];
+        u32 int_val;
+        struct tps65910 *tps = dev_get_drvdata(dev->parent);
+        int ret;
+
+        ret = regmap_bulk_read(tps->regmap, TPS65910_SECONDS, alarm_data,
+                NUM_TIME_REGS);
+        if (ret < 0) {
+                dev_err(dev, "rtc_read_alarm error %d\n", ret);
+                return ret;
+        }
+
+        alm->time.tm_sec = bcd2bin(alarm_data[0]);
+        alm->time.tm_min = bcd2bin(alarm_data[1]);
+        alm->time.tm_hour = bcd2bin(alarm_data[2]);
+        alm->time.tm_mday = bcd2bin(alarm_data[3]);
+        alm->time.tm_mon = bcd2bin(alarm_data[4]) - 1;
+        alm->time.tm_year = bcd2bin(alarm_data[5]) + 100;
+
+        ret = regmap_read(tps->regmap, TPS65910_RTC_INTERRUPTS, &int_val);
+        if (ret < 0)
+                return ret;
+
+        if (int_val & TPS65910_RTC_INTERRUPTS_IT_ALARM)
+                alm->enabled = 1;
+
+        return ret;
+}
+
+static int tps65910_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        unsigned char alarm_data[NUM_TIME_REGS];
+        struct tps65910 *tps = dev_get_drvdata(dev->parent);
+        int ret;
+
+        ret = tps65910_rtc_alarm_irq_enable(dev, 0);
+        if (ret)
+                return ret;
+
+        alarm_data[0] = bin2bcd(alm->time.tm_sec);
+        alarm_data[1] = bin2bcd(alm->time.tm_min);
+        alarm_data[2] = bin2bcd(alm->time.tm_hour);
+        alarm_data[3] = bin2bcd(alm->time.tm_mday);
+        alarm_data[4] = bin2bcd(alm->time.tm_mon + 1);
+        alarm_data[5] = bin2bcd(alm->time.tm_year - 100);
+
+        /* update all the alarm registers in one shot */
+        ret = regmap_bulk_write(tps->regmap, TPS65910_ALARM_SECONDS,
+                alarm_data, NUM_TIME_REGS);
+        if (ret) {
+                dev_err(dev, "rtc_set_alarm error %d\n", ret);
+                return ret;
+        }
+
+        if (alm->enabled)
+                ret = tps65910_rtc_alarm_irq_enable(dev, 1);
+
+        return ret;
+}
+
+static irqreturn_t tps65910_rtc_interrupt(int irq, void *rtc)
+{
+        struct device *dev = rtc;
+        unsigned long events = 0;
+        struct tps65910 *tps = dev_get_drvdata(dev->parent);
+        struct tps65910_rtc *tps_rtc = dev_get_drvdata(dev);
+        int ret;
+        u32 rtc_reg;
+
+        ret = regmap_read(tps->regmap, TPS65910_RTC_STATUS, &rtc_reg);
+        if (ret)
+                return IRQ_NONE;
+
+        if (rtc_reg & TPS65910_RTC_STATUS_ALARM)
+                events = RTC_IRQF | RTC_AF;
+
+        ret = regmap_write(tps->regmap, TPS65910_RTC_STATUS, rtc_reg);
+        if (ret)
+                return IRQ_NONE;
+
+        /* Notify RTC core on event */
+        rtc_update_irq(tps_rtc->rtc, 1, events);
+
+        return IRQ_HANDLED;
+}
+
+static const struct rtc_class_ops tps65910_rtc_ops = {
+        .read_time      = tps65910_rtc_read_time,
+        .set_time       = tps65910_rtc_set_time,
+        .read_alarm     = tps65910_rtc_read_alarm,
+        .set_alarm      = tps65910_rtc_set_alarm,
+        .alarm_irq_enable = tps65910_rtc_alarm_irq_enable,
+};
+
+static int __devinit tps65910_rtc_probe(struct platform_device *pdev)
+{
+        struct tps65910 *tps65910 = NULL;
+        struct tps65910_rtc *tps_rtc = NULL;
+        int ret;
+        int irq;
+        u32 rtc_reg;
+
+        tps65910 = dev_get_drvdata(pdev->dev.parent);
+
+        tps_rtc = devm_kzalloc(&pdev->dev, sizeof(struct tps65910_rtc),
+                        GFP_KERNEL);
+        if (!tps_rtc)
+                return -ENOMEM;
+
+        /* Clear pending interrupts */
+        ret = regmap_read(tps65910->regmap, TPS65910_RTC_STATUS, &rtc_reg);
+        if (ret < 0)
+                return ret;
+
+        ret = regmap_write(tps65910->regmap, TPS65910_RTC_STATUS, rtc_reg);
+        if (ret < 0)
+                return ret;
+
+        dev_dbg(&pdev->dev, "Enabling rtc-tps65910.\n");
+        rtc_reg = TPS65910_RTC_CTRL_STOP_RTC;
+        ret = regmap_write(tps65910->regmap, TPS65910_RTC_CTRL, rtc_reg);
+        if (ret < 0)
+                return ret;
+
+        irq  = platform_get_irq(pdev, 0);
+        if (irq <= 0) {
+                dev_warn(&pdev->dev, "Wake up is not possible as irq = %d\n",
+                        irq);
+                return ret;
+        }
+
+        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                tps65910_rtc_interrupt, IRQF_TRIGGER_LOW,
+                "rtc-tps65910", &pdev->dev);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "IRQ is not free.\n");
+                return ret;
+        }
+        device_init_wakeup(&pdev->dev, 1);
+
+        tps_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
+                &tps65910_rtc_ops, THIS_MODULE);
+        if (IS_ERR(tps_rtc->rtc)) {
+                ret = PTR_ERR(tps_rtc->rtc);
+                dev_err(&pdev->dev, "RTC device register: err %d\n", ret);
+                return ret;
+        }
+
+        platform_set_drvdata(pdev, tps_rtc);
+
+        return 0;
+}
+
+/*
+ * Disable tps65910 RTC interrupts.
+ * Sets status flag to free.
+ */
+static int __devexit tps65910_rtc_remove(struct platform_device *pdev)
+{
+        /* leave rtc running, but disable irqs */
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
+
+        tps65910_rtc_alarm_irq_enable(&rtc->dev, 0);
+
+        rtc_device_unregister(rtc);
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+
+static int tps65910_rtc_suspend(struct device *dev)
+{
+        struct tps65910 *tps = dev_get_drvdata(dev->parent);
+        u8 alarm = TPS65910_RTC_INTERRUPTS_IT_ALARM;
+        int ret;
+
+        /* Store current list of enabled interrupts*/
+        ret = regmap_read(tps->regmap, TPS65910_RTC_INTERRUPTS,
+                &tps->rtc->irqstat);
+        if (ret < 0)
+                return ret;
+
+        /* Enable RTC ALARM interrupt only */
+        return regmap_write(tps->regmap, TPS65910_RTC_INTERRUPTS, alarm);
+}
+
+static int tps65910_rtc_resume(struct device *dev)
+{
+        struct tps65910 *tps = dev_get_drvdata(dev->parent);
+
+        /* Restore list of enabled interrupts before suspend */
+        return regmap_write(tps->regmap, TPS65910_RTC_INTERRUPTS,
+                tps->rtc->irqstat);
+}
+
+static const struct dev_pm_ops tps65910_rtc_pm_ops = {
+        .suspend        = tps65910_rtc_suspend,
+        .resume         = tps65910_rtc_resume,
+};
+
+#define DEV_PM_OPS     (&tps65910_rtc_pm_ops)
+#else
+#define DEV_PM_OPS     NULL
+#endif
+
+static struct platform_driver tps65910_rtc_driver = {
+        .probe          = tps65910_rtc_probe,
+        .remove         = __devexit_p(tps65910_rtc_remove),
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "tps65910-rtc",
+                .pm     = DEV_PM_OPS,
+        },
+};
+
+module_platform_driver(tps65910_rtc_driver);
+MODULE_ALIAS("platform:rtc-tps65910");
+MODULE_AUTHOR("Venu Byravarasu <vbyravarasu@nvidia.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index 403b3d41d101..f36e59c6bc01 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -97,8 +97,17 @@ static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm,
         int i;
 
         struct i2c_msg msgs[] = {
-                { client->addr, 0, 2, dt_addr },        /* setup read ptr */
-                { client->addr, I2C_M_RD, 8, buf },     /* read date */
+                {/* setup read ptr */
+                        .addr = client->addr,
+                        .len = 2,
+                        .buf = dt_addr
+                },
+                {/* read date */
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = 8,
+                        .buf = buf
+                },
         };
 
         /* read date registers */
@@ -142,8 +151,17 @@ static int x1205_get_status(struct i2c_client *client, unsigned char *sr)
         static unsigned char sr_addr[2] = { 0, X1205_REG_SR };
 
         struct i2c_msg msgs[] = {
-                { client->addr, 0, 2, sr_addr },        /* setup read ptr */
-                { client->addr, I2C_M_RD, 1, sr },      /* read status */
+                {     /* setup read ptr */
+                        .addr = client->addr,
+                        .len = 2,
+                        .buf = sr_addr
+                },
+                {    /* read status */
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = 1,
+                        .buf = sr
+                },
         };
 
         /* read status register */
@@ -279,8 +297,17 @@ static int x1205_get_dtrim(struct i2c_client *client, int *trim)
         static unsigned char dtr_addr[2] = { 0, X1205_REG_DTR };
 
         struct i2c_msg msgs[] = {
-                { client->addr, 0, 2, dtr_addr },       /* setup read ptr */
-                { client->addr, I2C_M_RD, 1, &dtr },    /* read dtr */
+                {       /* setup read ptr */
+                        .addr = client->addr,
+                        .len = 2,
+                        .buf = dtr_addr
+                },
+                {      /* read dtr */
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = 1,
+                        .buf = &dtr
+                },
         };
 
         /* read dtr register */
@@ -311,8 +338,17 @@ static int x1205_get_atrim(struct i2c_client *client, int *trim)
         static unsigned char atr_addr[2] = { 0, X1205_REG_ATR };
 
         struct i2c_msg msgs[] = {
-                { client->addr, 0, 2, atr_addr },       /* setup read ptr */
-                { client->addr, I2C_M_RD, 1, &atr },    /* read atr */
+                {/* setup read ptr */
+                        .addr = client->addr,
+                        .len = 2,
+                        .buf = atr_addr
+                },
+                {/* read atr */
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = 1,
+                        .buf = &atr
+                },
         };
 
         /* read atr register */
@@ -381,8 +417,17 @@ static int x1205_validate_client(struct i2c_client *client)
                 unsigned char addr[2] = { 0, probe_zero_pattern[i] };
 
                 struct i2c_msg msgs[2] = {
-                        { client->addr, 0, 2, addr },
-                        { client->addr, I2C_M_RD, 1, &buf },
+                        {
+                                .addr = client->addr,
+                                .len = 2,
+                                .buf = addr
+                        },
+                        {
+                                .addr = client->addr,
+                                .flags = I2C_M_RD,
+                                .len = 1,
+                                .buf = &buf
+                        },
                 };
 
                 if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
@@ -409,8 +454,17 @@ static int x1205_validate_client(struct i2c_client *client)
                 unsigned char addr[2] = { 0, probe_limits_pattern[i].reg };
 
                 struct i2c_msg msgs[2] = {
-                        { client->addr, 0, 2, addr },
-                        { client->addr, I2C_M_RD, 1, &reg },
+                        {
+                                .addr = client->addr,
+                                .len = 2,
+                                .buf = addr
+                        },
+                        {
+                                .addr = client->addr,
+                                .flags = I2C_M_RD,
+                                .len = 1,
+                                .buf = &reg
+                        },
                 };
 
                 if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
@@ -444,8 +498,18 @@ static int x1205_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         static unsigned char int_addr[2] = { 0, X1205_REG_INT };
         struct i2c_client *client = to_i2c_client(dev);
         struct i2c_msg msgs[] = {
-                { client->addr, 0, 2, int_addr },        /* setup read ptr */
-                { client->addr, I2C_M_RD, 1, &intreg },  /* read INT register */
+                { /* setup read ptr */
+                        .addr = client->addr,
+                        .len = 2,
+                        .buf = int_addr
+                },
+                {/* read INT register */
+
+                        .addr = client->addr,
+                        .flags = I2C_M_RD,
+                        .len = 1,
+                        .buf = &intreg
+                },
         };
 
         /* read interrupt register and status register */
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 7199534cd07d..cb7f1582a6d1 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
 #elif defined(__devinitconst)
 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
 #else
-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
+static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
 #endif
         { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
         { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index ff80552ead84..1c4120c3db41 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
         .lldd_ata_set_dmamode   = asd_set_dmamode,
 };
 
-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
+static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
         {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
         {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
         {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index 68ce08552f69..a540162ac59c 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -1173,7 +1173,16 @@ wait_io1:
         outw(val, tmport);
         outb(2, 0x80);
 TCM_SYNC:
-        udelay(0x800);
+        /*
+         * The funny division into multiple delays is to accomodate
+         * arches like ARM where udelay() multiplies its argument by
+         * a large number to initialize a loop counter.  To avoid
+         * overflow, the maximum supported udelay is 2000 microseconds.
+         *
+         * XXX it would be more polite to find a way to use msleep()
+         */
+        mdelay(2);
+        udelay(48);
         if ((inb(tmport) & 0x80) == 0x00) {     /* bsy ? */
                 outw(0, tmport--);
                 outb(0, tmport);
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 67789b8345d2..efd81bb25e01 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -78,7 +78,7 @@ again:
         else if (unlikely(err))
                 return err;
 
-        *id = *id & MAX_ID_MASK;
+        *id = *id & MAX_IDR_MASK;
         return 0;
 }
 
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 747442d2c0f6..0fefa84ed9ae 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -149,7 +149,7 @@ enum {
 };
 
 /* Must match above enum */
-static const char *r128_family[] __devinitdata = {
+static char * const r128_family[] __devinitconst = {
         "AGP",
         "PCI",
         "PRO AGP",
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 63cee2e9d622..c101697a4ba7 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -229,13 +229,6 @@ config BACKLIGHT_HP700
           If you have an HP Jornada 700 series,
           say Y to include backlight control driver.
 
-config BACKLIGHT_PROGEAR
-        tristate "Frontpath ProGear Backlight Driver"
-        depends on PCI && X86
-        help
-          If you have a Frontpath ProGear say Y to enable the
-          backlight driver.
-
 config BACKLIGHT_CARILLO_RANCH
         tristate "Intel Carillo Ranch Backlight Driver"
         depends on LCD_CLASS_DEVICE && PCI && X86 && FB_LE80578
@@ -352,6 +345,22 @@ config BACKLIGHT_AAT2870
           If you have a AnalogicTech AAT2870 say Y to enable the
           backlight driver.
 
+config BACKLIGHT_LM3630
+        tristate "Backlight Driver for LM3630"
+        depends on BACKLIGHT_CLASS_DEVICE && I2C
+        select REGMAP_I2C
+        help
+          This supports TI LM3630 Backlight Driver
+
+config BACKLIGHT_LM3639
+        tristate "Backlight Driver for LM3639"
+        depends on BACKLIGHT_CLASS_DEVICE && I2C
+        select REGMAP_I2C
+        select NEW_LEDS
+        select LEDS_CLASS
+        help
+          This supports TI LM3639 Backlight + 1.5A Flash LED Driver
+
 config BACKLIGHT_LP855X
         tristate "Backlight driver for TI LP855X"
         depends on BACKLIGHT_CLASS_DEVICE && I2C
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 00223a62ec12..e7ce7291635d 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -23,10 +23,11 @@ obj-$(CONFIG_BACKLIGHT_HP700)	+= jornada720_bl.o
 obj-$(CONFIG_BACKLIGHT_HP680)   += hp680_bl.o
 obj-$(CONFIG_BACKLIGHT_LM3533)  += lm3533_bl.o
 obj-$(CONFIG_BACKLIGHT_LOCOMO)  += locomolcd.o
+obj-$(CONFIG_BACKLIGHT_LM3630)  += lm3630_bl.o
+obj-$(CONFIG_BACKLIGHT_LM3639)  += lm3639_bl.o
 obj-$(CONFIG_BACKLIGHT_LP855X)  += lp855x_bl.o
 obj-$(CONFIG_BACKLIGHT_OMAP1)   += omap1_bl.o
 obj-$(CONFIG_BACKLIGHT_PANDORA) += pandora_bl.o
-obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
 obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
 obj-$(CONFIG_BACKLIGHT_PWM)     += pwm_bl.o
 obj-$(CONFIG_BACKLIGHT_DA903X)  += da903x_bl.o
diff --git a/drivers/video/backlight/da9052_bl.c b/drivers/video/backlight/da9052_bl.c
index b628d68f5162..ac196181fe45 100644
--- a/drivers/video/backlight/da9052_bl.c
+++ b/drivers/video/backlight/da9052_bl.c
@@ -72,7 +72,7 @@ static int da9052_adjust_wled_brightness(struct da9052_bl *wleds)
         if (ret < 0)
                 return ret;
 
-        msleep(10);
+        usleep_range(10000, 11000);
 
         if (wleds->brightness) {
                 ret = da9052_reg_write(wleds->da9052, wled_bank[wleds->led_reg],
@@ -129,7 +129,6 @@ static int da9052_backlight_probe(struct platform_device *pdev)
                                        &da9052_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "Failed to register backlight\n");
-                devm_kfree(&pdev->dev, wleds);
                 return PTR_ERR(bl);
         }
 
@@ -149,7 +148,6 @@ static int da9052_backlight_remove(struct platform_device *pdev)
         wleds->state = DA9052_WLEDS_OFF;
         da9052_adjust_wled_brightness(wleds);
         backlight_device_unregister(bl);
-        devm_kfree(&pdev->dev, wleds);
 
         return 0;
 }
diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
index 72dd5556a35b..6c5ed6b242cc 100644
--- a/drivers/video/backlight/kb3886_bl.c
+++ b/drivers/video/backlight/kb3886_bl.c
@@ -34,9 +34,9 @@ static void kb3886_bl_set_intensity(int intensity)
         mutex_lock(&bl_mutex);
         intensity = intensity&0xff;
         outb(KB3886_ADC_DAC_PWM, KB3886_PARENT);
-        msleep(10);
+        usleep_range(10000, 11000);
         outb(KB3886_PWM0_WRITE, KB3886_IO);
-        msleep(10);
+        usleep_range(10000, 11000);
         outb(intensity, KB3886_IO);
         mutex_unlock(&bl_mutex);
 }
diff --git a/drivers/video/backlight/lm3630_bl.c b/drivers/video/backlight/lm3630_bl.c
new file mode 100644
index 000000000000..dc191441796f
--- /dev/null
+++ b/drivers/video/backlight/lm3630_bl.c
@@ -0,0 +1,475 @@
+/*
+* Simple driver for Texas Instruments LM3630 Backlight driver chip
+* Copyright (C) 2012 Texas Instruments
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+*/
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/backlight.h>
+#include <linux/err.h>
+#include <linux/delay.h>
+#include <linux/uaccess.h>
+#include <linux/interrupt.h>
+#include <linux/regmap.h>
+#include <linux/platform_data/lm3630_bl.h>
+
+#define REG_CTRL        0x00
+#define REG_CONFIG      0x01
+#define REG_BRT_A       0x03
+#define REG_BRT_B       0x04
+#define REG_INT_STATUS  0x09
+#define REG_INT_EN      0x0A
+#define REG_FAULT       0x0B
+#define REG_PWM_OUTLOW  0x12
+#define REG_PWM_OUTHIGH 0x13
+#define REG_MAX         0x1F
+
+#define INT_DEBOUNCE_MSEC       10
+
+enum lm3630_leds {
+        BLED_ALL = 0,
+        BLED_1,
+        BLED_2
+};
+
+static const char *bled_name[] = {
+        [BLED_ALL] = "lm3630_bled",     /*Bank1 controls all string */
+        [BLED_1] = "lm3630_bled1",      /*Bank1 controls bled1 */
+        [BLED_2] = "lm3630_bled2",      /*Bank1 or 2 controls bled2 */
+};
+
+struct lm3630_chip_data {
+        struct device *dev;
+        struct delayed_work work;
+        int irq;
+        struct workqueue_struct *irqthread;
+        struct lm3630_platform_data *pdata;
+        struct backlight_device *bled1;
+        struct backlight_device *bled2;
+        struct regmap *regmap;
+};
+
+/* initialize chip */
+static int __devinit lm3630_chip_init(struct lm3630_chip_data *pchip)
+{
+        int ret;
+        unsigned int reg_val;
+        struct lm3630_platform_data *pdata = pchip->pdata;
+
+        /*pwm control */
+        reg_val = ((pdata->pwm_active & 0x01) << 2) | (pdata->pwm_ctrl & 0x03);
+        ret = regmap_update_bits(pchip->regmap, REG_CONFIG, 0x07, reg_val);
+        if (ret < 0)
+                goto out;
+
+        /* bank control */
+        reg_val = ((pdata->bank_b_ctrl & 0x01) << 1) |
+                        (pdata->bank_a_ctrl & 0x07);
+        ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x07, reg_val);
+        if (ret < 0)
+                goto out;
+
+        ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
+        if (ret < 0)
+                goto out;
+
+        /* set initial brightness */
+        if (pdata->bank_a_ctrl != BANK_A_CTRL_DISABLE) {
+                ret = regmap_write(pchip->regmap,
+                                   REG_BRT_A, pdata->init_brt_led1);
+                if (ret < 0)
+                        goto out;
+        }
+
+        if (pdata->bank_b_ctrl != BANK_B_CTRL_DISABLE) {
+                ret = regmap_write(pchip->regmap,
+                                   REG_BRT_B, pdata->init_brt_led2);
+                if (ret < 0)
+                        goto out;
+        }
+        return ret;
+
+out:
+        dev_err(pchip->dev, "i2c failed to access register\n");
+        return ret;
+}
+
+/* interrupt handling */
+static void lm3630_delayed_func(struct work_struct *work)
+{
+        int ret;
+        unsigned int reg_val;
+        struct lm3630_chip_data *pchip;
+
+        pchip = container_of(work, struct lm3630_chip_data, work.work);
+
+        ret = regmap_read(pchip->regmap, REG_INT_STATUS, &reg_val);
+        if (ret < 0) {
+                dev_err(pchip->dev,
+                        "i2c failed to access REG_INT_STATUS Register\n");
+                return;
+        }
+
+        dev_info(pchip->dev, "REG_INT_STATUS Register is 0x%x\n", reg_val);
+}
+
+static irqreturn_t lm3630_isr_func(int irq, void *chip)
+{
+        int ret;
+        struct lm3630_chip_data *pchip = chip;
+        unsigned long delay = msecs_to_jiffies(INT_DEBOUNCE_MSEC);
+
+        queue_delayed_work(pchip->irqthread, &pchip->work, delay);
+
+        ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
+        if (ret < 0)
+                goto out;
+
+        return IRQ_HANDLED;
+out:
+        dev_err(pchip->dev, "i2c failed to access register\n");
+        return IRQ_HANDLED;
+}
+
+static int lm3630_intr_config(struct lm3630_chip_data *pchip)
+{
+        INIT_DELAYED_WORK(&pchip->work, lm3630_delayed_func);
+        pchip->irqthread = create_singlethread_workqueue("lm3630-irqthd");
+        if (!pchip->irqthread) {
+                dev_err(pchip->dev, "create irq thread fail...\n");
+                return -1;
+        }
+        if (request_threaded_irq
+            (pchip->irq, NULL, lm3630_isr_func,
+             IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "lm3630_irq", pchip)) {
+                dev_err(pchip->dev, "request threaded irq fail..\n");
+                return -1;
+        }
+        return 0;
+}
+
+static bool
+set_intensity(struct backlight_device *bl, struct lm3630_chip_data *pchip)
+{
+        if (!pchip->pdata->pwm_set_intensity)
+                return false;
+        pchip->pdata->pwm_set_intensity(bl->props.brightness - 1,
+                                        pchip->pdata->pwm_period);
+        return true;
+}
+
+/* update and get brightness */
+static int lm3630_bank_a_update_status(struct backlight_device *bl)
+{
+        int ret;
+        struct lm3630_chip_data *pchip = bl_get_data(bl);
+        enum lm3630_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
+
+        /* brightness 0 means disable */
+        if (!bl->props.brightness) {
+                ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x04, 0x00);
+                if (ret < 0)
+                        goto out;
+                return bl->props.brightness;
+        }
+
+        /* pwm control */
+        if (pwm_ctrl == PWM_CTRL_BANK_A || pwm_ctrl == PWM_CTRL_BANK_ALL) {
+                if (!set_intensity(bl, pchip))
+                        dev_err(pchip->dev, "No pwm control func. in plat-data\n");
+        } else {
+
+                /* i2c control */
+                ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
+                if (ret < 0)
+                        goto out;
+                mdelay(1);
+                ret = regmap_write(pchip->regmap,
+                                   REG_BRT_A, bl->props.brightness - 1);
+                if (ret < 0)
+                        goto out;
+        }
+        return bl->props.brightness;
+out:
+        dev_err(pchip->dev, "i2c failed to access REG_CTRL\n");
+        return bl->props.brightness;
+}
+
+static int lm3630_bank_a_get_brightness(struct backlight_device *bl)
+{
+        unsigned int reg_val;
+        int brightness, ret;
+        struct lm3630_chip_data *pchip = bl_get_data(bl);
+        enum lm3630_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
+
+        if (pwm_ctrl == PWM_CTRL_BANK_A || pwm_ctrl == PWM_CTRL_BANK_ALL) {
+                ret = regmap_read(pchip->regmap, REG_PWM_OUTHIGH, &reg_val);
+                if (ret < 0)
+                        goto out;
+                brightness = reg_val & 0x01;
+                ret = regmap_read(pchip->regmap, REG_PWM_OUTLOW, &reg_val);
+                if (ret < 0)
+                        goto out;
+                brightness = ((brightness << 8) | reg_val) + 1;
+        } else {
+                ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
+                if (ret < 0)
+                        goto out;
+                mdelay(1);
+                ret = regmap_read(pchip->regmap, REG_BRT_A, &reg_val);
+                if (ret < 0)
+                        goto out;
+                brightness = reg_val + 1;
+        }
+        bl->props.brightness = brightness;
+        return bl->props.brightness;
+out:
+        dev_err(pchip->dev, "i2c failed to access register\n");
+        return 0;
+}
+
+static const struct backlight_ops lm3630_bank_a_ops = {
+        .options = BL_CORE_SUSPENDRESUME,
+        .update_status = lm3630_bank_a_update_status,
+        .get_brightness = lm3630_bank_a_get_brightness,
+};
+
+static int lm3630_bank_b_update_status(struct backlight_device *bl)
+{
+        int ret;
+        struct lm3630_chip_data *pchip = bl_get_data(bl);
+        enum lm3630_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
+
+        if (pwm_ctrl == PWM_CTRL_BANK_B || pwm_ctrl == PWM_CTRL_BANK_ALL) {
+                if (!set_intensity(bl, pchip))
+                        dev_err(pchip->dev,
+                                "no pwm control func. in plat-data\n");
+        } else {
+                ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
+                if (ret < 0)
+                        goto out;
+                mdelay(1);
+                ret = regmap_write(pchip->regmap,
+                                   REG_BRT_B, bl->props.brightness - 1);
+        }
+        return bl->props.brightness;
+out:
+        dev_err(pchip->dev, "i2c failed to access register\n");
+        return bl->props.brightness;
+}
+
+static int lm3630_bank_b_get_brightness(struct backlight_device *bl)
+{
+        unsigned int reg_val;
+        int brightness, ret;
+        struct lm3630_chip_data *pchip = bl_get_data(bl);
+        enum lm3630_pwm_ctrl pwm_ctrl = pchip->pdata->pwm_ctrl;
+
+        if (pwm_ctrl == PWM_CTRL_BANK_B || pwm_ctrl == PWM_CTRL_BANK_ALL) {
+                ret = regmap_read(pchip->regmap, REG_PWM_OUTHIGH, &reg_val);
+                if (ret < 0)
+                        goto out;
+                brightness = reg_val & 0x01;
+                ret = regmap_read(pchip->regmap, REG_PWM_OUTLOW, &reg_val);
+                if (ret < 0)
+                        goto out;
+                brightness = ((brightness << 8) | reg_val) + 1;
+        } else {
+                ret = regmap_update_bits(pchip->regmap, REG_CTRL, 0x80, 0x00);
+                if (ret < 0)
+                        goto out;
+                mdelay(1);
+                ret = regmap_read(pchip->regmap, REG_BRT_B, &reg_val);
+                if (ret < 0)
+                        goto out;
+                brightness = reg_val + 1;
+        }
+        bl->props.brightness = brightness;
+
+        return bl->props.brightness;
+out:
+        dev_err(pchip->dev, "i2c failed to access register\n");
+        return bl->props.brightness;
+}
+
+static const struct backlight_ops lm3630_bank_b_ops = {
+        .options = BL_CORE_SUSPENDRESUME,
+        .update_status = lm3630_bank_b_update_status,
+        .get_brightness = lm3630_bank_b_get_brightness,
+};
+
+static int lm3630_backlight_register(struct lm3630_chip_data *pchip,
+                                     enum lm3630_leds ledno)
+{
+        const char *name = bled_name[ledno];
+        struct backlight_properties props;
+        struct lm3630_platform_data *pdata = pchip->pdata;
+
+        props.type = BACKLIGHT_RAW;
+        switch (ledno) {
+        case BLED_1:
+        case BLED_ALL:
+                props.brightness = pdata->init_brt_led1;
+                props.max_brightness = pdata->max_brt_led1;
+                pchip->bled1 =
+                    backlight_device_register(name, pchip->dev, pchip,
+                                              &lm3630_bank_a_ops, &props);
+                if (IS_ERR(pchip->bled1))
+                        return -EIO;
+                break;
+        case BLED_2:
+                props.brightness = pdata->init_brt_led2;
+                props.max_brightness = pdata->max_brt_led2;
+                pchip->bled2 =
+                    backlight_device_register(name, pchip->dev, pchip,
+                                              &lm3630_bank_b_ops, &props);
+                if (IS_ERR(pchip->bled2))
+                        return -EIO;
+                break;
+        }
+        return 0;
+}
+
+static void lm3630_backlight_unregister(struct lm3630_chip_data *pchip)
+{
+        if (pchip->bled1)
+                backlight_device_unregister(pchip->bled1);
+        if (pchip->bled2)
+                backlight_device_unregister(pchip->bled2);
+}
+
+static const struct regmap_config lm3630_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+        .max_register = REG_MAX,
+};
+
+static int __devinit lm3630_probe(struct i2c_client *client,
+                                  const struct i2c_device_id *id)
+{
+        struct lm3630_platform_data *pdata = client->dev.platform_data;
+        struct lm3630_chip_data *pchip;
+        int ret;
+
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
+                dev_err(&client->dev, "fail : i2c functionality check...\n");
+                return -EOPNOTSUPP;
+        }
+
+        if (pdata == NULL) {
+                dev_err(&client->dev, "fail : no platform data.\n");
+                return -ENODATA;
+        }
+
+        pchip = devm_kzalloc(&client->dev, sizeof(struct lm3630_chip_data),
+                             GFP_KERNEL);
+        if (!pchip)
+                return -ENOMEM;
+        pchip->pdata = pdata;
+        pchip->dev = &client->dev;
+
+        pchip->regmap = devm_regmap_init_i2c(client, &lm3630_regmap);
+        if (IS_ERR(pchip->regmap)) {
+                ret = PTR_ERR(pchip->regmap);
+                dev_err(&client->dev, "fail : allocate register map: %d\n",
+                        ret);
+                return ret;
+        }
+        i2c_set_clientdata(client, pchip);
+
+        /* chip initialize */
+        ret = lm3630_chip_init(pchip);
+        if (ret < 0) {
+                dev_err(&client->dev, "fail : init chip\n");
+                goto err_chip_init;
+        }
+
+        switch (pdata->bank_a_ctrl) {
+        case BANK_A_CTRL_ALL:
+                ret = lm3630_backlight_register(pchip, BLED_ALL);
+                pdata->bank_b_ctrl = BANK_B_CTRL_DISABLE;
+                break;
+        case BANK_A_CTRL_LED1:
+                ret = lm3630_backlight_register(pchip, BLED_1);
+                break;
+        case BANK_A_CTRL_LED2:
+                ret = lm3630_backlight_register(pchip, BLED_2);
+                pdata->bank_b_ctrl = BANK_B_CTRL_DISABLE;
+                break;
+        default:
+                break;
+        }
+
+        if (ret < 0)
+                goto err_bl_reg;
+
+        if (pdata->bank_b_ctrl && pchip->bled2 == NULL) {
+                ret = lm3630_backlight_register(pchip, BLED_2);
+                if (ret < 0)
+                        goto err_bl_reg;
+        }
+
+        /* interrupt enable  : irq 0 is not allowed for lm3630 */
+        pchip->irq = client->irq;
+        if (pchip->irq)
+                lm3630_intr_config(pchip);
+
+        dev_info(&client->dev, "LM3630 backlight register OK.\n");
+        return 0;
+
+err_bl_reg:
+        dev_err(&client->dev, "fail : backlight register.\n");
+        lm3630_backlight_unregister(pchip);
+err_chip_init:
+        return ret;
+}
+
+static int __devexit lm3630_remove(struct i2c_client *client)
+{
+        int ret;
+        struct lm3630_chip_data *pchip = i2c_get_clientdata(client);
+
+        ret = regmap_write(pchip->regmap, REG_BRT_A, 0);
+        if (ret < 0)
+                dev_err(pchip->dev, "i2c failed to access register\n");
+
+        ret = regmap_write(pchip->regmap, REG_BRT_B, 0);
+        if (ret < 0)
+                dev_err(pchip->dev, "i2c failed to access register\n");
+
+        lm3630_backlight_unregister(pchip);
+        if (pchip->irq) {
+                free_irq(pchip->irq, pchip);
+                flush_workqueue(pchip->irqthread);
+                destroy_workqueue(pchip->irqthread);
+        }
+        return 0;
+}
+
+static const struct i2c_device_id lm3630_id[] = {
+        {LM3630_NAME, 0},
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, lm3630_id);
+
+static struct i2c_driver lm3630_i2c_driver = {
+        .driver = {
+                   .name = LM3630_NAME,
+                   },
+        .probe = lm3630_probe,
+        .remove = __devexit_p(lm3630_remove),
+        .id_table = lm3630_id,
+};
+
+module_i2c_driver(lm3630_i2c_driver);
+
+MODULE_DESCRIPTION("Texas Instruments Backlight driver for LM3630");
+MODULE_AUTHOR("G.Shark Jeong <gshark.jeong@gmail.com>");
+MODULE_AUTHOR("Daniel Jeong <daniel.jeong@ti.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/backlight/lm3639_bl.c b/drivers/video/backlight/lm3639_bl.c
new file mode 100644
index 000000000000..c6915c6c3cd1
--- /dev/null
+++ b/drivers/video/backlight/lm3639_bl.c
@@ -0,0 +1,437 @@
+/*
+* Simple driver for Texas Instruments LM3639 Backlight + Flash LED driver chip
+* Copyright (C) 2012 Texas Instruments
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+*/
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/leds.h>
+#include <linux/backlight.h>
+#include <linux/err.h>
+#include <linux/delay.h>
+#include <linux/uaccess.h>
+#include <linux/interrupt.h>
+#include <linux/regmap.h>
+#include <linux/platform_data/lm3639_bl.h>
+
+#define REG_DEV_ID      0x00
+#define REG_CHECKSUM    0x01
+#define REG_BL_CONF_1   0x02
+#define REG_BL_CONF_2   0x03
+#define REG_BL_CONF_3   0x04
+#define REG_BL_CONF_4   0x05
+#define REG_FL_CONF_1   0x06
+#define REG_FL_CONF_2   0x07
+#define REG_FL_CONF_3   0x08
+#define REG_IO_CTRL     0x09
+#define REG_ENABLE      0x0A
+#define REG_FLAG        0x0B
+#define REG_MAX         REG_FLAG
+
+struct lm3639_chip_data {
+        struct device *dev;
+        struct lm3639_platform_data *pdata;
+
+        struct backlight_device *bled;
+        struct led_classdev cdev_flash;
+        struct led_classdev cdev_torch;
+        struct regmap *regmap;
+
+        unsigned int bled_mode;
+        unsigned int bled_map;
+        unsigned int last_flag;
+};
+
+/* initialize chip */
+static int __devinit lm3639_chip_init(struct lm3639_chip_data *pchip)
+{
+        int ret;
+        unsigned int reg_val;
+        struct lm3639_platform_data *pdata = pchip->pdata;
+
+        /* input pins config. */
+        ret =
+            regmap_update_bits(pchip->regmap, REG_BL_CONF_1, 0x08,
+                               pdata->pin_pwm);
+        if (ret < 0)
+                goto out;
+
+        reg_val = (pdata->pin_pwm & 0x40) | pdata->pin_strobe | pdata->pin_tx;
+        ret = regmap_update_bits(pchip->regmap, REG_IO_CTRL, 0x7C, reg_val);
+        if (ret < 0)
+                goto out;
+
+        /* init brightness */
+        ret = regmap_write(pchip->regmap, REG_BL_CONF_4, pdata->init_brt_led);
+        if (ret < 0)
+                goto out;
+
+        ret = regmap_write(pchip->regmap, REG_BL_CONF_3, pdata->init_brt_led);
+        if (ret < 0)
+                goto out;
+
+        /* output pins config. */
+        if (!pdata->init_brt_led)
+                reg_val = pdata->fled_pins | pdata->bled_pins;
+        else
+                reg_val = pdata->fled_pins | pdata->bled_pins | 0x01;
+
+        ret = regmap_update_bits(pchip->regmap, REG_ENABLE, 0x79, reg_val);
+        if (ret < 0)
+                goto out;
+
+        return ret;
+out:
+        dev_err(pchip->dev, "i2c failed to access register\n");
+        return ret;
+}
+
+/* update and get brightness */
+static int lm3639_bled_update_status(struct backlight_device *bl)
+{
+        int ret;
+        unsigned int reg_val;
+        struct lm3639_chip_data *pchip = bl_get_data(bl);
+        struct lm3639_platform_data *pdata = pchip->pdata;
+
+        ret = regmap_read(pchip->regmap, REG_FLAG, &reg_val);
+        if (ret < 0)
+                goto out;
+
+        if (reg_val != 0)
+                dev_info(pchip->dev, "last flag is 0x%x\n", reg_val);
+
+        /* pwm control */
+        if (pdata->pin_pwm) {
+                if (pdata->pwm_set_intensity)
+                        pdata->pwm_set_intensity(bl->props.brightness,
+                                                 pdata->max_brt_led);
+                else
+                        dev_err(pchip->dev,
+                                "No pwm control func. in plat-data\n");
+                return bl->props.brightness;
+        }
+
+        /* i2c control and set brigtness */
+        ret = regmap_write(pchip->regmap, REG_BL_CONF_4, bl->props.brightness);
+        if (ret < 0)
+                goto out;
+        ret = regmap_write(pchip->regmap, REG_BL_CONF_3, bl->props.brightness);
+        if (ret < 0)
+                goto out;
+
+        if (!bl->props.brightness)
+                ret = regmap_update_bits(pchip->regmap, REG_ENABLE, 0x01, 0x00);
+        else
+                ret = regmap_update_bits(pchip->regmap, REG_ENABLE, 0x01, 0x01);
+        if (ret < 0)
+                goto out;
+
+        return bl->props.brightness;
+out:
+        dev_err(pchip->dev, "i2c failed to access registers\n");
+        return bl->props.brightness;
+}
+
+static int lm3639_bled_get_brightness(struct backlight_device *bl)
+{
+        int ret;
+        unsigned int reg_val;
+        struct lm3639_chip_data *pchip = bl_get_data(bl);
+        struct lm3639_platform_data *pdata = pchip->pdata;
+
+        if (pdata->pin_pwm) {
+                if (pdata->pwm_get_intensity)
+                        bl->props.brightness = pdata->pwm_get_intensity();
+                else
+                        dev_err(pchip->dev,
+                                "No pwm control func. in plat-data\n");
+                return bl->props.brightness;
+        }
+
+        ret = regmap_read(pchip->regmap, REG_BL_CONF_1, &reg_val);
+        if (ret < 0)
+                goto out;
+        if (reg_val & 0x10)
+                ret = regmap_read(pchip->regmap, REG_BL_CONF_4, &reg_val);
+        else
+                ret = regmap_read(pchip->regmap, REG_BL_CONF_3, &reg_val);
+        if (ret < 0)
+                goto out;
+        bl->props.brightness = reg_val;
+
+        return bl->props.brightness;
+out:
+        dev_err(pchip->dev, "i2c failed to access register\n");
+        return bl->props.brightness;
+}
+
+static const struct backlight_ops lm3639_bled_ops = {
+        .options = BL_CORE_SUSPENDRESUME,
+        .update_status = lm3639_bled_update_status,
+        .get_brightness = lm3639_bled_get_brightness,
+};
+
+/* backlight mapping mode */
+static ssize_t lm3639_bled_mode_store(struct device *dev,
+                                      struct device_attribute *devAttr,
+                                      const char *buf, size_t size)
+{
+        ssize_t ret;
+        struct lm3639_chip_data *pchip = dev_get_drvdata(dev);
+        unsigned int state;
+
+        ret = kstrtouint(buf, 10, &state);
+        if (ret)
+                goto out_input;
+
+        if (!state)
+                ret =
+                    regmap_update_bits(pchip->regmap, REG_BL_CONF_1, 0x10,
+                                       0x00);
+        else
+                ret =
+                    regmap_update_bits(pchip->regmap, REG_BL_CONF_1, 0x10,
+                                       0x10);
+
+        if (ret < 0)
+                goto out;
+
+        return size;
+
+out:
+        dev_err(pchip->dev, "%s:i2c access fail to register\n", __func__);
+        return size;
+
+out_input:
+        dev_err(pchip->dev, "%s:input conversion fail\n", __func__);
+        return size;
+
+}
+
+static DEVICE_ATTR(bled_mode, 0666, NULL, lm3639_bled_mode_store);
+
+/* torch */
+static void lm3639_torch_brightness_set(struct led_classdev *cdev,
+                                        enum led_brightness brightness)
+{
+        int ret;
+        unsigned int reg_val;
+        struct lm3639_chip_data *pchip;
+
+        pchip = container_of(cdev, struct lm3639_chip_data, cdev_torch);
+
+        ret = regmap_read(pchip->regmap, REG_FLAG, &reg_val);
+        if (ret < 0)
+                goto out;
+        if (reg_val != 0)
+                dev_info(pchip->dev, "last flag is 0x%x\n", reg_val);
+
+        /* brightness 0 means off state */
+        if (!brightness) {
+                ret = regmap_update_bits(pchip->regmap, REG_ENABLE, 0x06, 0x00);
+                if (ret < 0)
+                        goto out;
+                return;
+        }
+
+        ret = regmap_update_bits(pchip->regmap,
+                                 REG_FL_CONF_1, 0x70, (brightness - 1) << 4);
+        if (ret < 0)
+                goto out;
+        ret = regmap_update_bits(pchip->regmap, REG_ENABLE, 0x06, 0x02);
+        if (ret < 0)
+                goto out;
+
+        return;
+out:
+        dev_err(pchip->dev, "i2c failed to access register\n");
+        return;
+}
+
+/* flash */
+static void lm3639_flash_brightness_set(struct led_classdev *cdev,
+                                        enum led_brightness brightness)
+{
+        int ret;
+        unsigned int reg_val;
+        struct lm3639_chip_data *pchip;
+
+        pchip = container_of(cdev, struct lm3639_chip_data, cdev_flash);
+
+        ret = regmap_read(pchip->regmap, REG_FLAG, &reg_val);
+        if (ret < 0)
+                goto out;
+        if (reg_val != 0)
+                dev_info(pchip->dev, "last flag is 0x%x\n", reg_val);
+
+        /* torch off before flash control */
+        ret = regmap_update_bits(pchip->regmap, REG_ENABLE, 0x06, 0x00);
+        if (ret < 0)
+                goto out;
+
+        /* brightness 0 means off state */
+        if (!brightness)
+                return;
+
+        ret = regmap_update_bits(pchip->regmap,
+                                 REG_FL_CONF_1, 0x0F, brightness - 1);
+        if (ret < 0)
+                goto out;
+        ret = regmap_update_bits(pchip->regmap, REG_ENABLE, 0x06, 0x06);
+        if (ret < 0)
+                goto out;
+
+        return;
+out:
+        dev_err(pchip->dev, "i2c failed to access register\n");
+        return;
+}
+
+static const struct regmap_config lm3639_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+        .max_register = REG_MAX,
+};
+
+static int __devinit lm3639_probe(struct i2c_client *client,
+                                  const struct i2c_device_id *id)
+{
+        int ret;
+        struct lm3639_chip_data *pchip;
+        struct lm3639_platform_data *pdata = client->dev.platform_data;
+        struct backlight_properties props;
+
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
+                dev_err(&client->dev, "i2c functionality check fail.\n");
+                return -EOPNOTSUPP;
+        }
+
+        if (pdata == NULL) {
+                dev_err(&client->dev, "Needs Platform Data.\n");
+                return -ENODATA;
+        }
+
+        pchip = devm_kzalloc(&client->dev,
+                             sizeof(struct lm3639_chip_data), GFP_KERNEL);
+        if (!pchip)
+                return -ENOMEM;
+
+        pchip->pdata = pdata;
+        pchip->dev = &client->dev;
+
+        pchip->regmap = devm_regmap_init_i2c(client, &lm3639_regmap);
+        if (IS_ERR(pchip->regmap)) {
+                ret = PTR_ERR(pchip->regmap);
+                dev_err(&client->dev, "fail : allocate register map: %d\n",
+                        ret);
+                return ret;
+        }
+        i2c_set_clientdata(client, pchip);
+
+        /* chip initialize */
+        ret = lm3639_chip_init(pchip);
+        if (ret < 0) {
+                dev_err(&client->dev, "fail : chip init\n");
+                goto err_out;
+        }
+
+        /* backlight */
+        props.type = BACKLIGHT_RAW;
+        props.brightness = pdata->init_brt_led;
+        props.max_brightness = pdata->max_brt_led;
+        pchip->bled =
+            backlight_device_register("lm3639_bled", pchip->dev, pchip,
+                                      &lm3639_bled_ops, &props);
+        if (IS_ERR(pchip->bled)) {
+                dev_err(&client->dev, "fail : backlight register\n");
+                ret = -EIO;
+                goto err_out;
+        }
+
+        ret = device_create_file(&(pchip->bled->dev), &dev_attr_bled_mode);
+        if (ret < 0) {
+                dev_err(&client->dev, "failed : add sysfs entries\n");
+                ret = -EIO;
+                goto err_bled_mode;
+        }
+
+        /* flash */
+        pchip->cdev_flash.name = "lm3639_flash";
+        pchip->cdev_flash.max_brightness = 16;
+        pchip->cdev_flash.brightness_set = lm3639_flash_brightness_set;
+        ret = led_classdev_register((struct device *)
+                                    &client->dev, &pchip->cdev_flash);
+        if (ret < 0) {
+                dev_err(&client->dev, "fail : flash register\n");
+                ret = -EIO;
+                goto err_flash;
+        }
+
+        /* torch */
+        pchip->cdev_torch.name = "lm3639_torch";
+        pchip->cdev_torch.max_brightness = 8;
+        pchip->cdev_torch.brightness_set = lm3639_torch_brightness_set;
+        ret = led_classdev_register((struct device *)
+                                    &client->dev, &pchip->cdev_torch);
+        if (ret < 0) {
+                dev_err(&client->dev, "fail : torch register\n");
+                ret = -EIO;
+                goto err_torch;
+        }
+
+        return 0;
+
+err_torch:
+        led_classdev_unregister(&pchip->cdev_flash);
+err_flash:
+        device_remove_file(&(pchip->bled->dev), &dev_attr_bled_mode);
+err_bled_mode:
+        backlight_device_unregister(pchip->bled);
+err_out:
+        return ret;
+}
+
+static int __devexit lm3639_remove(struct i2c_client *client)
+{
+        struct lm3639_chip_data *pchip = i2c_get_clientdata(client);
+
+        regmap_write(pchip->regmap, REG_ENABLE, 0x00);
+
+        if (&pchip->cdev_torch)
+                led_classdev_unregister(&pchip->cdev_torch);
+        if (&pchip->cdev_flash)
+                led_classdev_unregister(&pchip->cdev_flash);
+        if (pchip->bled) {
+                device_remove_file(&(pchip->bled->dev), &dev_attr_bled_mode);
+                backlight_device_unregister(pchip->bled);
+        }
+        return 0;
+}
+
+static const struct i2c_device_id lm3639_id[] = {
+        {LM3639_NAME, 0},
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, lm3639_id);
+static struct i2c_driver lm3639_i2c_driver = {
+        .driver = {
+                   .name = LM3639_NAME,
+                   },
+        .probe = lm3639_probe,
+        .remove = __devexit_p(lm3639_remove),
+        .id_table = lm3639_id,
+};
+
+module_i2c_driver(lm3639_i2c_driver);
+
+MODULE_DESCRIPTION("Texas Instruments Backlight+Flash LED driver for LM3639");
+MODULE_AUTHOR("Daniel Jeong <daniel.jeong@ti.com>");
+MODULE_AUTHOR("G.Shark Jeong <gshark.jeong@gmail.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c
index 6c0f1ac0d32a..4066a5bbd826 100644
--- a/drivers/video/backlight/ltv350qv.c
+++ b/drivers/video/backlight/ltv350qv.c
@@ -75,7 +75,7 @@ static int ltv350qv_power_on(struct ltv350qv *lcd)
         /* Power On Reset Display off State */
         if (ltv350qv_write_reg(lcd, LTV_PWRCTL1, 0x0000))
                 goto err;
-        msleep(15);
+        usleep_range(15000, 16000);
 
         /* Power Setting Function 1 */
         if (ltv350qv_write_reg(lcd, LTV_PWRCTL1, LTV_VCOM_DISABLE))
@@ -153,7 +153,7 @@ err_settings:
 err_power2:
 err_power1:
         ltv350qv_write_reg(lcd, LTV_PWRCTL2, 0x0000);
-        msleep(1);
+        usleep_range(1000, 1100);
 err:
         ltv350qv_write_reg(lcd, LTV_PWRCTL1, LTV_VCOM_DISABLE);
         return -EIO;
@@ -175,7 +175,7 @@ static int ltv350qv_power_off(struct ltv350qv *lcd)
         ret |= ltv350qv_write_reg(lcd, LTV_PWRCTL2, 0x0000);
 
         /* Wait at least 1 ms */
-        msleep(1);
+        usleep_range(1000, 1100);
 
         /* Power down setting 2 */
         ret |= ltv350qv_write_reg(lcd, LTV_PWRCTL1, LTV_VCOM_DISABLE);
diff --git a/drivers/video/backlight/platform_lcd.c b/drivers/video/backlight/platform_lcd.c
index b6672340d6c7..ca4f5d70fe10 100644
--- a/drivers/video/backlight/platform_lcd.c
+++ b/drivers/video/backlight/platform_lcd.c
@@ -16,6 +16,7 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/lcd.h>
+#include <linux/of.h>
 #include <linux/slab.h>
 
 #include <video/platform_lcd.h>
@@ -145,6 +146,14 @@ static SIMPLE_DEV_PM_OPS(platform_lcd_pm_ops, platform_lcd_suspend,
                         platform_lcd_resume);
 #endif
 
+#ifdef CONFIG_OF
+static const struct of_device_id platform_lcd_of_match[] = {
+        { .compatible = "platform-lcd" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, platform_lcd_of_match);
+#endif
+
 static struct platform_driver platform_lcd_driver = {
         .driver         = {
                 .name   = "platform-lcd",
@@ -152,6 +161,7 @@ static struct platform_driver platform_lcd_driver = {
 #ifdef CONFIG_PM
                 .pm     = &platform_lcd_pm_ops,
 #endif
+                .of_match_table = of_match_ptr(platform_lcd_of_match),
         },
         .probe          = platform_lcd_probe,
         .remove         = __devexit_p(platform_lcd_remove),
diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c
deleted file mode 100644
index 69b35f02929e..000000000000
--- a/drivers/video/backlight/progear_bl.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *  Backlight Driver for Frontpath ProGear HX1050+
- *
- *  Copyright (c) 2006 Marcin Juszkiewicz
- *
- *  Based on Progear LCD driver by M Schacht
- *  <mschacht at alumni dot washington dot edu>
- *
- *  Based on Sharp's Corgi Backlight Driver
- *  Based on Backlight Driver for HP Jornada 680
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mutex.h>
-#include <linux/fb.h>
-#include <linux/backlight.h>
-#include <linux/pci.h>
-
-#define PMU_LPCR               0xB0
-#define SB_MPS1                0x61
-#define HW_LEVEL_MAX           0x77
-#define HW_LEVEL_MIN           0x4f
-
-static struct pci_dev *pmu_dev = NULL;
-static struct pci_dev *sb_dev = NULL;
-
-static int progearbl_set_intensity(struct backlight_device *bd)
-{
-        int intensity = bd->props.brightness;
-
-        if (bd->props.power != FB_BLANK_UNBLANK)
-                intensity = 0;
-        if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-                intensity = 0;
-
-        pci_write_config_byte(pmu_dev, PMU_LPCR, intensity + HW_LEVEL_MIN);
-
-        return 0;
-}
-
-static int progearbl_get_intensity(struct backlight_device *bd)
-{
-        u8 intensity;
-        pci_read_config_byte(pmu_dev, PMU_LPCR, &intensity);
-
-        return intensity - HW_LEVEL_MIN;
-}
-
-static const struct backlight_ops progearbl_ops = {
-        .get_brightness = progearbl_get_intensity,
-        .update_status = progearbl_set_intensity,
-};
-
-static int progearbl_probe(struct platform_device *pdev)
-{
-        struct backlight_properties props;
-        u8 temp;
-        struct backlight_device *progear_backlight_device;
-        int ret;
-
-        pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, NULL);
-        if (!pmu_dev) {
-                pr_err("ALI M7101 PMU not found.\n");
-                return -ENODEV;
-        }
-
-        sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
-        if (!sb_dev) {
-                pr_err("ALI 1533 SB not found.\n");
-                ret = -ENODEV;
-                goto put_pmu;
-        }
-
-        /*     Set SB_MPS1 to enable brightness control. */
-        pci_read_config_byte(sb_dev, SB_MPS1, &temp);
-        pci_write_config_byte(sb_dev, SB_MPS1, temp | 0x20);
-
-        memset(&props, 0, sizeof(struct backlight_properties));
-        props.type = BACKLIGHT_RAW;
-        props.max_brightness = HW_LEVEL_MAX - HW_LEVEL_MIN;
-        progear_backlight_device = backlight_device_register("progear-bl",
-                                                             &pdev->dev, NULL,
-                                                             &progearbl_ops,
-                                                             &props);
-        if (IS_ERR(progear_backlight_device)) {
-                ret = PTR_ERR(progear_backlight_device);
-                goto put_sb;
-        }
-
-        platform_set_drvdata(pdev, progear_backlight_device);
-
-        progear_backlight_device->props.power = FB_BLANK_UNBLANK;
-        progear_backlight_device->props.brightness = HW_LEVEL_MAX - HW_LEVEL_MIN;
-        progearbl_set_intensity(progear_backlight_device);
-
-        return 0;
-put_sb:
-        pci_dev_put(sb_dev);
-put_pmu:
-        pci_dev_put(pmu_dev);
-        return ret;
-}
-
-static int progearbl_remove(struct platform_device *pdev)
-{
-        struct backlight_device *bd = platform_get_drvdata(pdev);
-        backlight_device_unregister(bd);
-
-        return 0;
-}
-
-static struct platform_driver progearbl_driver = {
-        .probe = progearbl_probe,
-        .remove = progearbl_remove,
-        .driver = {
-                   .name = "progear-bl",
-                   },
-};
-
-static struct platform_device *progearbl_device;
-
-static int __init progearbl_init(void)
-{
-        int ret = platform_driver_register(&progearbl_driver);
-
-        if (ret)
-                return ret;
-        progearbl_device = platform_device_register_simple("progear-bl", -1,
-                                                                NULL, 0);
-        if (IS_ERR(progearbl_device)) {
-                platform_driver_unregister(&progearbl_driver);
-                return PTR_ERR(progearbl_device);
-        }
-
-        return 0;
-}
-
-static void __exit progearbl_exit(void)
-{
-        pci_dev_put(pmu_dev);
-        pci_dev_put(sb_dev);
-
-        platform_device_unregister(progearbl_device);
-        platform_driver_unregister(&progearbl_driver);
-}
-
-module_init(progearbl_init);
-module_exit(progearbl_exit);
-
-MODULE_AUTHOR("Marcin Juszkiewicz <linux@hrw.one.pl>");
-MODULE_DESCRIPTION("ProGear Backlight Driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index 5a5d0928df33..265c5ed59ade 100644
--- a/drivers/video/geode/gx1fb_core.c
+++ b/drivers/video/geode/gx1fb_core.c
@@ -29,7 +29,7 @@ static int  crt_option = 1;
 static char panel_option[32] = "";
 
 /* Modes relevant to the GX1 (taken from modedb.c) */
-static const struct fb_videomode __devinitdata gx1_modedb[] = {
+static const struct fb_videomode __devinitconst gx1_modedb[] = {
         /* 640x480-60 VESA */
         { NULL, 60, 640, 480, 39682,  48, 16, 33, 10, 96, 2,
           0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
index 0fad23f810a3..0e9afa41d163 100644
--- a/drivers/video/gxt4500.c
+++ b/drivers/video/gxt4500.c
@@ -156,7 +156,7 @@ struct gxt4500_par {
 static char *mode_option;
 
 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
-static const struct fb_videomode defaultmode __devinitdata = {
+static const struct fb_videomode defaultmode __devinitconst = {
         .refresh = 60,
         .xres = 1280,
         .yres = 1024,
@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
         return 0;
 }
 
-static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
+static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
         .id = "IBM GXT4500P",
         .type = FB_TYPE_PACKED_PIXELS,
         .visual = FB_VISUAL_PSEUDOCOLOR,
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index b83f36190cae..5c067816a81d 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -97,7 +97,7 @@ static int i810fb_blank      (int blank_mode, struct fb_info *info);
 static void i810fb_release_resource       (struct fb_info *info, struct i810fb_par *par);
 
 /* PCI */
-static const char *i810_pci_list[] __devinitdata = {
+static const char * const i810_pci_list[] __devinitconst = {
         "Intel(R) 810 Framebuffer Device"                                 ,
         "Intel(R) 810-DC100 Framebuffer Device"                           ,
         "Intel(R) 810E Framebuffer Device"                                ,
diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
index de366937c933..3c63fc24bb1f 100644
--- a/drivers/video/jz4740_fb.c
+++ b/drivers/video/jz4740_fb.c
@@ -136,7 +136,7 @@ struct jzfb {
         uint32_t pseudo_palette[16];
 };
 
-static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
+static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
         .id             = "JZ4740 FB",
         .type           = FB_TYPE_PACKED_PIXELS,
         .visual         = FB_VISUAL_TRUECOLOR,
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index 022574202749..0efd1524b977 100644
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -164,3 +164,11 @@ config BINFMT_MISC
           You may say M here for module support and later load the module when
           you have use for it; the module is called binfmt_misc. If you
           don't know what to answer at this point, say Y.
+
+config COREDUMP
+        bool "Enable core dump support" if EXPERT
+        default y
+        help
+          This option enables support for performing core dumps. You almost
+          certainly want to say Y here. Not necessary on systems that never
+          need debugging or only ever run flawless code.
diff --git a/fs/Makefile b/fs/Makefile
index 8938f8250320..1d7af79288a0 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -11,7 +11,7 @@ obj-y :=	open.o read_write.o file_table.o super.o \
                 attr.o bad_inode.o file.o filesystems.o namespace.o \
                 seq_file.o xattr.o libfs.o fs-writeback.o \
                 pnode.o drop_caches.o splice.o sync.o utimes.o \
-                stack.o fs_struct.o statfs.o coredump.o
+                stack.o fs_struct.o statfs.o
 
 ifeq ($(CONFIG_BLOCK),y)
 obj-y +=        buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
@@ -48,6 +48,7 @@ obj-$(CONFIG_FS_MBCACHE)	+= mbcache.o
 obj-$(CONFIG_FS_POSIX_ACL)      += posix_acl.o xattr_acl.o
 obj-$(CONFIG_NFS_COMMON)        += nfs_common/
 obj-$(CONFIG_GENERIC_ACL)       += generic_acl.o
+obj-$(CONFIG_COREDUMP)          += coredump.o
 
 obj-$(CONFIG_FHANDLE)           += fhandle.o
 
diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
index d146e181d10d..0e7a6f81ae36 100644
--- a/fs/binfmt_aout.c
+++ b/fs/binfmt_aout.c
@@ -32,31 +32,8 @@
 
 static int load_aout_binary(struct linux_binprm *, struct pt_regs * regs);
 static int load_aout_library(struct file*);
-static int aout_core_dump(struct coredump_params *cprm);
-
-static struct linux_binfmt aout_format = {
-        .module         = THIS_MODULE,
-        .load_binary    = load_aout_binary,
-        .load_shlib     = load_aout_library,
-        .core_dump      = aout_core_dump,
-        .min_coredump   = PAGE_SIZE
-};
-
-#define BAD_ADDR(x)     ((unsigned long)(x) >= TASK_SIZE)
-
-static int set_brk(unsigned long start, unsigned long end)
-{
-        start = PAGE_ALIGN(start);
-        end = PAGE_ALIGN(end);
-        if (end > start) {
-                unsigned long addr;
-                addr = vm_brk(start, end - start);
-                if (BAD_ADDR(addr))
-                        return addr;
-        }
-        return 0;
-}
 
+#ifdef CONFIG_COREDUMP
 /*
  * Routine writes a core dump image in the current directory.
  * Currently only a stub-function.
@@ -66,7 +43,6 @@ static int set_brk(unsigned long start, unsigned long end)
  * field, which also makes sure the core-dumps won't be recursive if the
  * dumping of the process results in another error..
  */
-
 static int aout_core_dump(struct coredump_params *cprm)
 {
         struct file *file = cprm->file;
@@ -89,7 +65,7 @@ static int aout_core_dump(struct coredump_params *cprm)
         current->flags |= PF_DUMPCORE;
         strncpy(dump.u_comm, current->comm, sizeof(dump.u_comm));
         dump.u_ar0 = offsetof(struct user, regs);
-        dump.signal = cprm->signr;
+        dump.signal = cprm->siginfo->si_signo;
         aout_dump_thread(cprm->regs, &dump);
 
 /* If the size of the dump file exceeds the rlimit, then see what would happen
@@ -135,6 +111,32 @@ end_coredump:
         set_fs(fs);
         return has_dumped;
 }
+#else
+#define aout_core_dump NULL
+#endif
+
+static struct linux_binfmt aout_format = {
+        .module         = THIS_MODULE,
+        .load_binary    = load_aout_binary,
+        .load_shlib     = load_aout_library,
+        .core_dump      = aout_core_dump,
+        .min_coredump   = PAGE_SIZE
+};
+
+#define BAD_ADDR(x)     ((unsigned long)(x) >= TASK_SIZE)
+
+static int set_brk(unsigned long start, unsigned long end)
+{
+        start = PAGE_ALIGN(start);
+        end = PAGE_ALIGN(end);
+        if (end > start) {
+                unsigned long addr;
+                addr = vm_brk(start, end - start);
+                if (BAD_ADDR(addr))
+                        return addr;
+        }
+        return 0;
+}
 
 /*
  * create_aout_tables() parses the env- and arg-strings in new user
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 0225fddf49b7..28a64e769527 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -27,6 +27,7 @@
 #include <linux/compiler.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
+#include <linux/vmalloc.h>
 #include <linux/security.h>
 #include <linux/random.h>
 #include <linux/elf.h>
@@ -37,6 +38,13 @@
 #include <asm/page.h>
 #include <asm/exec.h>
 
+#ifndef user_long_t
+#define user_long_t long
+#endif
+#ifndef user_siginfo_t
+#define user_siginfo_t siginfo_t
+#endif
+
 static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs);
 static int load_elf_library(struct file *);
 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
@@ -881,7 +889,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
         }
 
         if (elf_interpreter) {
-                unsigned long uninitialized_var(interp_map_addr);
+                unsigned long interp_map_addr = 0;
 
                 elf_entry = load_elf_interp(&loc->interp_elf_ex,
                                             interpreter,
@@ -1372,6 +1380,103 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
         fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
 }
 
+static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
+                siginfo_t *siginfo)
+{
+        mm_segment_t old_fs = get_fs();
+        set_fs(KERNEL_DS);
+        copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
+        set_fs(old_fs);
+        fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
+}
+
+#define MAX_FILE_NOTE_SIZE (4*1024*1024)
+/*
+ * Format of NT_FILE note:
+ *
+ * long count     -- how many files are mapped
+ * long page_size -- units for file_ofs
+ * array of [COUNT] elements of
+ *   long start
+ *   long end
+ *   long file_ofs
+ * followed by COUNT filenames in ASCII: "FILE1" NUL "FILE2" NUL...
+ */
+static void fill_files_note(struct memelfnote *note)
+{
+        struct vm_area_struct *vma;
+        unsigned count, size, names_ofs, remaining, n;
+        user_long_t *data;
+        user_long_t *start_end_ofs;
+        char *name_base, *name_curpos;
+
+        /* *Estimated* file count and total data size needed */
+        count = current->mm->map_count;
+        size = count * 64;
+
+        names_ofs = (2 + 3 * count) * sizeof(data[0]);
+ alloc:
+        if (size >= MAX_FILE_NOTE_SIZE) /* paranoia check */
+                goto err;
+        size = round_up(size, PAGE_SIZE);
+        data = vmalloc(size);
+        if (!data)
+                goto err;
+
+        start_end_ofs = data + 2;
+        name_base = name_curpos = ((char *)data) + names_ofs;
+        remaining = size - names_ofs;
+        count = 0;
+        for (vma = current->mm->mmap; vma != NULL; vma = vma->vm_next) {
+                struct file *file;
+                const char *filename;
+
+                file = vma->vm_file;
+                if (!file)
+                        continue;
+                filename = d_path(&file->f_path, name_curpos, remaining);
+                if (IS_ERR(filename)) {
+                        if (PTR_ERR(filename) == -ENAMETOOLONG) {
+                                vfree(data);
+                                size = size * 5 / 4;
+                                goto alloc;
+                        }
+                        continue;
+                }
+
+                /* d_path() fills at the end, move name down */
+                /* n = strlen(filename) + 1: */
+                n = (name_curpos + remaining) - filename;
+                remaining = filename - name_curpos;
+                memmove(name_curpos, filename, n);
+                name_curpos += n;
+
+                *start_end_ofs++ = vma->vm_start;
+                *start_end_ofs++ = vma->vm_end;
+                *start_end_ofs++ = vma->vm_pgoff;
+                count++;
+        }
+
+        /* Now we know exact count of files, can store it */
+        data[0] = count;
+        data[1] = PAGE_SIZE;
+        /*
+         * Count usually is less than current->mm->map_count,
+         * we need to move filenames down.
+         */
+        n = current->mm->map_count - count;
+        if (n != 0) {
+                unsigned shift_bytes = n * 3 * sizeof(data[0]);
+                memmove(name_base - shift_bytes, name_base,
+                        name_curpos - name_base);
+                name_curpos -= shift_bytes;
+        }
+
+        size = name_curpos - (char *)data;
+        fill_note(note, "CORE", NT_FILE, size, data);
+ err: ;
+}
+
 #ifdef CORE_DUMP_USE_REGSET
 #include <linux/regset.h>
 
@@ -1385,7 +1490,10 @@ struct elf_thread_core_info {
 struct elf_note_info {
         struct elf_thread_core_info *thread;
         struct memelfnote psinfo;
+        struct memelfnote signote;
         struct memelfnote auxv;
+        struct memelfnote files;
+        user_siginfo_t csigdata;
         size_t size;
         int thread_notes;
 };
@@ -1480,7 +1588,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
 
 static int fill_note_info(struct elfhdr *elf, int phdrs,
                           struct elf_note_info *info,
-                          long signr, struct pt_regs *regs)
+                          siginfo_t *siginfo, struct pt_regs *regs)
 {
         struct task_struct *dump_task = current;
         const struct user_regset_view *view = task_user_regset_view(dump_task);
@@ -1550,7 +1658,7 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
          * Now fill in each thread's information.
          */
         for (t = info->thread; t != NULL; t = t->next)
-                if (!fill_thread_core_info(t, view, signr, &info->size))
+                if (!fill_thread_core_info(t, view, siginfo->si_signo, &info->size))
                         return 0;
 
         /*
@@ -1559,9 +1667,15 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
         fill_psinfo(psinfo, dump_task->group_leader, dump_task->mm);
         info->size += notesize(&info->psinfo);
 
+        fill_siginfo_note(&info->signote, &info->csigdata, siginfo);
+        info->size += notesize(&info->signote);
+
         fill_auxv_note(&info->auxv, current->mm);
         info->size += notesize(&info->auxv);
 
+        fill_files_note(&info->files);
+        info->size += notesize(&info->files);
+
         return 1;
 }
 
@@ -1588,8 +1702,12 @@ static int write_note_info(struct elf_note_info *info,
 
                 if (first && !writenote(&info->psinfo, file, foffset))
                         return 0;
+                if (first && !writenote(&info->signote, file, foffset))
+                        return 0;
                 if (first && !writenote(&info->auxv, file, foffset))
                         return 0;
+                if (first && !writenote(&info->files, file, foffset))
+                        return 0;
 
                 for (i = 1; i < info->thread_notes; ++i)
                         if (t->notes[i].data &&
@@ -1616,6 +1734,7 @@ static void free_note_info(struct elf_note_info *info)
                 kfree(t);
         }
         kfree(info->psinfo.data);
+        vfree(info->files.data);
 }
 
 #else
@@ -1681,6 +1800,7 @@ struct elf_note_info {
 #ifdef ELF_CORE_COPY_XFPREGS
         elf_fpxregset_t *xfpu;
 #endif
+        user_siginfo_t csigdata;
         int thread_status_size;
         int numnote;
 };
@@ -1690,8 +1810,8 @@ static int elf_note_info_init(struct elf_note_info *info)
         memset(info, 0, sizeof(*info));
         INIT_LIST_HEAD(&info->thread_list);
 
-        /* Allocate space for six ELF notes */
-        info->notes = kmalloc(6 * sizeof(struct memelfnote), GFP_KERNEL);
+        /* Allocate space for ELF notes */
+        info->notes = kmalloc(8 * sizeof(struct memelfnote), GFP_KERNEL);
         if (!info->notes)
                 return 0;
         info->psinfo = kmalloc(sizeof(*info->psinfo), GFP_KERNEL);
@@ -1713,14 +1833,14 @@ static int elf_note_info_init(struct elf_note_info *info)
 
 static int fill_note_info(struct elfhdr *elf, int phdrs,
                           struct elf_note_info *info,
-                          long signr, struct pt_regs *regs)
+                          siginfo_t *siginfo, struct pt_regs *regs)
 {
         struct list_head *t;
 
         if (!elf_note_info_init(info))
                 return 0;
 
-        if (signr) {
+        if (siginfo->si_signo) {
                 struct core_thread *ct;
                 struct elf_thread_status *ets;
 
@@ -1738,13 +1858,13 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
                         int sz;
 
                         ets = list_entry(t, struct elf_thread_status, list);
-                        sz = elf_dump_thread_status(signr, ets);
+                        sz = elf_dump_thread_status(siginfo->si_signo, ets);
                         info->thread_status_size += sz;
                 }
         }
         /* now collect the dump for the current */
         memset(info->prstatus, 0, sizeof(*info->prstatus));
-        fill_prstatus(info->prstatus, current, signr);
+        fill_prstatus(info->prstatus, current, siginfo->si_signo);
         elf_core_copy_regs(&info->prstatus->pr_reg, regs);
 
         /* Set up header */
@@ -1761,9 +1881,11 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
         fill_note(info->notes + 1, "CORE", NT_PRPSINFO,
                   sizeof(*info->psinfo), info->psinfo);
 
-        info->numnote = 2;
+        fill_siginfo_note(info->notes + 2, &info->csigdata, siginfo);
+        fill_auxv_note(info->notes + 3, current->mm);
+        fill_files_note(info->notes + 4);
 
-        fill_auxv_note(&info->notes[info->numnote++], current->mm);
+        info->numnote = 5;
 
         /* Try to dump the FPU. */
         info->prstatus->pr_fpvalid = elf_core_copy_task_fpregs(current, regs,
@@ -1825,6 +1947,9 @@ static void free_note_info(struct elf_note_info *info)
                 kfree(list_entry(tmp, struct elf_thread_status, list));
         }
 
+        /* Free data allocated by fill_files_note(): */
+        vfree(info->notes[4].data);
+
         kfree(info->prstatus);
         kfree(info->psinfo);
         kfree(info->notes);
@@ -1951,7 +2076,7 @@ static int elf_core_dump(struct coredump_params *cprm)
          * Collect all the non-memory information about the process for the
          * notes.  This also sets up the file header.
          */
-        if (!fill_note_info(elf, e_phnum, &info, cprm->signr, cprm->regs))
+        if (!fill_note_info(elf, e_phnum, &info, cprm->siginfo, cprm->regs))
                 goto cleanup;
 
         has_dumped = 1;
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 3d77cf81ba3c..08d812b32282 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1642,7 +1642,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
                 goto cleanup;
 #endif
 
-        if (cprm->signr) {
+        if (cprm->siginfo->si_signo) {
                 struct core_thread *ct;
                 struct elf_thread_status *tmp;
 
@@ -1661,13 +1661,13 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm)
                         int sz;
 
                         tmp = list_entry(t, struct elf_thread_status, list);
-                        sz = elf_dump_thread_status(cprm->signr, tmp);
+                        sz = elf_dump_thread_status(cprm->siginfo->si_signo, tmp);
                         thread_status_size += sz;
                 }
         }
 
         /* now collect the dump for the current */
-        fill_prstatus(prstatus, current, cprm->signr);
+        fill_prstatus(prstatus, current, cprm->siginfo->si_signo);
         elf_core_copy_regs(&prstatus->pr_reg, cprm->regs);
 
         segs = current->mm->map_count;
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 178cb70acc26..e280352b28f9 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -107,7 +107,7 @@ static struct linux_binfmt flat_format = {
 static int flat_core_dump(struct coredump_params *cprm)
 {
         printk("Process %s:%d received signr %d and should have core dumped\n",
-                        current->comm, current->pid, (int) cprm->signr);
+                        current->comm, current->pid, (int) cprm->siginfo->si_signo);
         return(1);
 }
 
diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
index 112e45a17e99..a81147e2e4ef 100644
--- a/fs/compat_binfmt_elf.c
+++ b/fs/compat_binfmt_elf.c
@@ -38,6 +38,13 @@
 #define elf_addr_t      Elf32_Addr
 
 /*
+ * Some data types as stored in coredump.
+ */
+#define user_long_t             compat_long_t
+#define user_siginfo_t          compat_siginfo_t
+#define copy_siginfo_to_user    copy_siginfo_to_user32
+
+/*
  * The machine-dependent core note format types are defined in elfcore-compat.h,
  * which requires asm/elf.h to define compat_elf_gregset_t et al.
  */
diff --git a/fs/coredump.c b/fs/coredump.c
index f045bbad6822..fd37facac8dc 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -14,6 +14,7 @@
 #include <linux/key.h>
 #include <linux/personality.h>
 #include <linux/binfmts.h>
+#include <linux/coredump.h>
 #include <linux/utsname.h>
 #include <linux/pid_namespace.h>
 #include <linux/module.h>
@@ -39,6 +40,7 @@
 
 #include <trace/events/task.h>
 #include "internal.h"
+#include "coredump.h"
 
 #include <trace/events/sched.h>
 
@@ -147,7 +149,7 @@ put_exe_file:
  * name into corename, which must have space for at least
  * CORENAME_MAX_SIZE bytes plus one byte for the zero terminator.
  */
-static int format_corename(struct core_name *cn, long signr)
+static int format_corename(struct core_name *cn, struct coredump_params *cprm)
 {
         const struct cred *cred = current_cred();
         const char *pat_ptr = core_pattern;
@@ -192,9 +194,13 @@ static int format_corename(struct core_name *cn, long signr)
                         case 'g':
                                 err = cn_printf(cn, "%d", cred->gid);
                                 break;
+                        case 'd':
+                                err = cn_printf(cn, "%d",
+                                        __get_dumpable(cprm->mm_flags));
+                                break;
                         /* signal that caused the coredump */
                         case 's':
-                                err = cn_printf(cn, "%ld", signr);
+                                err = cn_printf(cn, "%ld", cprm->siginfo->si_signo);
                                 break;
                         /* UNIX time of coredump */
                         case 't': {
@@ -451,7 +457,7 @@ static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)
         return 0;
 }
 
-void do_coredump(long signr, int exit_code, struct pt_regs *regs)
+void do_coredump(siginfo_t *siginfo, struct pt_regs *regs)
 {
         struct core_state core_state;
         struct core_name cn;
@@ -466,7 +472,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
         bool need_nonrelative = false;
         static atomic_t core_dump_count = ATOMIC_INIT(0);
         struct coredump_params cprm = {
-                .signr = signr,
+                .siginfo = siginfo,
                 .regs = regs,
                 .limit = rlimit(RLIMIT_CORE),
                 /*
@@ -477,7 +483,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
                 .mm_flags = mm->flags,
         };
 
-        audit_core_dumps(signr);
+        audit_core_dumps(siginfo->si_signo);
 
         binfmt = mm->binfmt;
         if (!binfmt || !binfmt->core_dump)
@@ -501,7 +507,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
                 need_nonrelative = true;
         }
 
-        retval = coredump_wait(exit_code, &core_state);
+        retval = coredump_wait(siginfo->si_signo, &core_state);
         if (retval < 0)
                 goto fail_creds;
 
@@ -513,7 +519,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
          */
         clear_thread_flag(TIF_SIGPENDING);
 
-        ispipe = format_corename(&cn, signr);
+        ispipe = format_corename(&cn, &cprm);
 
         if (ispipe) {
                 int dump_count;
diff --git a/fs/coredump.h b/fs/coredump.h
new file mode 100644
index 000000000000..e39ff072110d
--- /dev/null
+++ b/fs/coredump.h
@@ -0,0 +1,6 @@
+#ifndef _FS_COREDUMP_H
+#define _FS_COREDUMP_H
+
+extern int __get_dumpable(unsigned long mm_flags);
+
+#endif
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index cd96649bfe62..da72250ddc1c 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -346,7 +346,7 @@ static inline struct epitem *ep_item_from_epqueue(poll_table *p)
 /* Tells if the epoll_ctl(2) operation needs an event copy from userspace */
 static inline int ep_op_has_event(int op)
 {
-        return op != EPOLL_CTL_DEL;
+        return op == EPOLL_CTL_ADD || op == EPOLL_CTL_MOD;
 }
 
 /* Initialize the poll safe wake up structure */
@@ -676,6 +676,34 @@ static int ep_remove(struct eventpoll *ep, struct epitem *epi)
         return 0;
 }
 
+/*
+ * Disables a "struct epitem" in the eventpoll set. Returns -EBUSY if the item
+ * had no event flags set, indicating that another thread may be currently
+ * handling that item's events (in the case that EPOLLONESHOT was being
+ * used). Otherwise a zero result indicates that the item has been disabled
+ * from receiving events. A disabled item may be re-enabled via
+ * EPOLL_CTL_MOD. Must be called with "mtx" held.
+ */
+static int ep_disable(struct eventpoll *ep, struct epitem *epi)
+{
+        int result = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ep->lock, flags);
+        if (epi->event.events & ~EP_PRIVATE_BITS) {
+                if (ep_is_linked(&epi->rdllink))
+                        list_del_init(&epi->rdllink);
+                /* Ensure ep_poll_callback will not add epi back onto ready
+                   list: */
+                epi->event.events &= EP_PRIVATE_BITS;
+                }
+        else
+                result = -EBUSY;
+        spin_unlock_irqrestore(&ep->lock, flags);
+
+        return result;
+}
+
 static void ep_free(struct eventpoll *ep)
 {
         struct rb_node *rbp;
@@ -1020,8 +1048,6 @@ static void ep_rbtree_insert(struct eventpoll *ep, struct epitem *epi)
         rb_insert_color(&epi->rbn, &ep->rbr);
 }
 
-
-
 #define PATH_ARR_SIZE 5
 /*
  * These are the number paths of length 1 to 5, that we are allowing to emanate
@@ -1787,6 +1813,12 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
                 } else
                         error = -ENOENT;
                 break;
+        case EPOLL_CTL_DISABLE:
+                if (epi)
+                        error = ep_disable(ep, epi);
+                else
+                        error = -ENOENT;
+                break;
         }
         mutex_unlock(&ep->mtx);
 
diff --git a/fs/exec.c b/fs/exec.c
index 48fb26ef8a1b..9824473a7ec1 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -63,6 +63,7 @@
 
 #include <trace/events/task.h>
 #include "internal.h"
+#include "coredump.h"
 
 #include <trace/events/sched.h>
 
@@ -1096,7 +1097,7 @@ void setup_new_exec(struct linux_binprm * bprm)
         current->sas_ss_sp = current->sas_ss_size = 0;
 
         if (uid_eq(current_euid(), current_uid()) && gid_eq(current_egid(), current_gid()))
-                set_dumpable(current->mm, 1);
+                set_dumpable(current->mm, SUID_DUMPABLE_ENABLED);
         else
                 set_dumpable(current->mm, suid_dumpable);
 
diff --git a/fs/fat/Makefile b/fs/fat/Makefile
index e06190322c1c..964b634f6667 100644
--- a/fs/fat/Makefile
+++ b/fs/fat/Makefile
@@ -6,6 +6,6 @@ obj-$(CONFIG_FAT_FS) += fat.o
 obj-$(CONFIG_VFAT_FS) += vfat.o
 obj-$(CONFIG_MSDOS_FS) += msdos.o
 
-fat-y := cache.o dir.o fatent.o file.o inode.o misc.o
+fat-y := cache.o dir.o fatent.o file.o inode.o misc.o nfs.o
 vfat-y := namei_vfat.o
 msdos-y := namei_msdos.o
diff --git a/fs/fat/cache.c b/fs/fat/cache.c
index 1cc7038e273d..91ad9e1c9441 100644
--- a/fs/fat/cache.c
+++ b/fs/fat/cache.c
@@ -190,7 +190,8 @@ static void __fat_cache_inval_inode(struct inode *inode)
         struct fat_cache *cache;
 
         while (!list_empty(&i->cache_lru)) {
-                cache = list_entry(i->cache_lru.next, struct fat_cache, cache_list);
+                cache = list_entry(i->cache_lru.next,
+                                   struct fat_cache, cache_list);
                 list_del_init(&cache->cache_list);
                 i->nr_caches--;
                 fat_cache_free(cache);
@@ -261,9 +262,10 @@ int fat_get_cluster(struct inode *inode, int cluster, int *fclus, int *dclus)
                 if (nr < 0)
                         goto out;
                 else if (nr == FAT_ENT_FREE) {
-                        fat_fs_error_ratelimit(sb, "%s: invalid cluster chain"
-                                               " (i_pos %lld)", __func__,
-                                               MSDOS_I(inode)->i_pos);
+                        fat_fs_error_ratelimit(sb,
+                                       "%s: invalid cluster chain (i_pos %lld)",
+                                       __func__,
+                                       MSDOS_I(inode)->i_pos);
                         nr = -EIO;
                         goto out;
                 } else if (nr == FAT_ENT_EOF) {
diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index dc49ed2cbffa..bca6d0a1255e 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -18,7 +18,7 @@
 #include <linux/time.h>
 #include <linux/buffer_head.h>
 #include <linux/compat.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/kernel.h>
 #include "fat.h"
 
@@ -123,7 +123,8 @@ static inline int fat_get_entry(struct inode *dir, loff_t *pos,
 {
         /* Fast stuff first */
         if (*bh && *de &&
-            (*de - (struct msdos_dir_entry *)(*bh)->b_data) < MSDOS_SB(dir->i_sb)->dir_per_block - 1) {
+           (*de - (struct msdos_dir_entry *)(*bh)->b_data) <
+                                MSDOS_SB(dir->i_sb)->dir_per_block - 1) {
                 *pos += sizeof(struct msdos_dir_entry);
                 (*de)++;
                 return 0;
@@ -155,7 +156,8 @@ static int uni16_to_x8(struct super_block *sb, unsigned char *ascii,
 
         while (*ip && ((len - NLS_MAX_CHARSET_SIZE) > 0)) {
                 ec = *ip++;
-                if ((charlen = nls->uni2char(ec, op, NLS_MAX_CHARSET_SIZE)) > 0) {
+                charlen = nls->uni2char(ec, op, NLS_MAX_CHARSET_SIZE);
+                if (charlen > 0) {
                         op += charlen;
                         len -= charlen;
                 } else {
@@ -172,12 +174,12 @@ static int uni16_to_x8(struct super_block *sb, unsigned char *ascii,
         }
 
         if (unlikely(*ip)) {
-                fat_msg(sb, KERN_WARNING, "filename was truncated while "
-                        "converting.");
+                fat_msg(sb, KERN_WARNING,
+                        "filename was truncated while converting.");
         }
 
         *op = 0;
-        return (op - ascii);
+        return op - ascii;
 }
 
 static inline int fat_uni_to_x8(struct super_block *sb, const wchar_t *uni,
@@ -205,7 +207,8 @@ fat_short2uni(struct nls_table *t, unsigned char *c, int clen, wchar_t *uni)
 }
 
 static inline int
-fat_short2lower_uni(struct nls_table *t, unsigned char *c, int clen, wchar_t *uni)
+fat_short2lower_uni(struct nls_table *t, unsigned char *c,
+                    int clen, wchar_t *uni)
 {
         int charlen;
         wchar_t wc;
@@ -220,7 +223,8 @@ fat_short2lower_uni(struct nls_table *t, unsigned char *c, int clen, wchar_t *un
                 if (!nc)
                         nc = *c;
 
-                if ( (charlen = t->char2uni(&nc, 1, uni)) < 0) {
+                charlen = t->char2uni(&nc, 1, uni);
+                if (charlen < 0) {
                         *uni = 0x003f;  /* a question mark */
                         charlen = 1;
                 }
@@ -537,7 +541,6 @@ end_of_dir:
 
         return err;
 }
-
 EXPORT_SYMBOL_GPL(fat_search_long);
 
 struct fat_ioctl_filldir_callback {
@@ -574,7 +577,8 @@ static int __fat_readdir(struct inode *inode, struct file *filp, void *dirent,
         /* Fake . and .. for the root directory. */
         if (inode->i_ino == MSDOS_ROOT_INO) {
                 while (cpos < 2) {
-                        if (filldir(dirent, "..", cpos+1, cpos, MSDOS_ROOT_INO, DT_DIR) < 0)
+                        if (filldir(dirent, "..", cpos+1, cpos,
+                                    MSDOS_ROOT_INO, DT_DIR) < 0)
                                 goto out;
                         cpos++;
                         filp->f_pos++;
@@ -872,25 +876,26 @@ static int fat_get_short_entry(struct inode *dir, loff_t *pos,
 }
 
 /*
- * The ".." entry can not provide the "struct fat_slot_info" informations
- * for inode. So, this function provide the some informations only.
+ * The ".." entry can not provide the "struct fat_slot_info" information
+ * for inode, nor a usable i_pos. So, this function provides some information
+ * only.
+ *
+ * Since this function walks through the on-disk inodes within a directory,
+ * callers are responsible for taking any locks necessary to prevent the
+ * directory from changing.
  */
 int fat_get_dotdot_entry(struct inode *dir, struct buffer_head **bh,
-                         struct msdos_dir_entry **de, loff_t *i_pos)
+                         struct msdos_dir_entry **de)
 {
-        loff_t offset;
+        loff_t offset = 0;
 
-        offset = 0;
-        *bh = NULL;
+        *de = NULL;
         while (fat_get_short_entry(dir, &offset, bh, de) >= 0) {
-                if (!strncmp((*de)->name, MSDOS_DOTDOT, MSDOS_NAME)) {
-                        *i_pos = fat_make_i_pos(dir->i_sb, *bh, *de);
+                if (!strncmp((*de)->name, MSDOS_DOTDOT, MSDOS_NAME))
                         return 0;
-                }
         }
         return -ENOENT;
 }
-
 EXPORT_SYMBOL_GPL(fat_get_dotdot_entry);
 
 /* See if directory is empty */
@@ -913,7 +918,6 @@ int fat_dir_empty(struct inode *dir)
         brelse(bh);
         return result;
 }
-
 EXPORT_SYMBOL_GPL(fat_dir_empty);
 
 /*
@@ -959,7 +963,6 @@ int fat_scan(struct inode *dir, const unsigned char *name,
         }
         return -ENOENT;
 }
-
 EXPORT_SYMBOL_GPL(fat_scan);
 
 static int __fat_remove_entries(struct inode *dir, loff_t pos, int nr_slots)
@@ -1047,7 +1050,6 @@ int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo)
 
         return 0;
 }
-
 EXPORT_SYMBOL_GPL(fat_remove_entries);
 
 static int fat_zeroed_cluster(struct inode *dir, sector_t blknr, int nr_used,
@@ -1141,10 +1143,8 @@ int fat_alloc_new_dir(struct inode *dir, struct timespec *ts)
                 de[0].ctime_cs = de[1].ctime_cs = 0;
                 de[0].adate = de[0].cdate = de[1].adate = de[1].cdate = 0;
         }
-        de[0].start = cpu_to_le16(cluster);
-        de[0].starthi = cpu_to_le16(cluster >> 16);
-        de[1].start = cpu_to_le16(MSDOS_I(dir)->i_logstart);
-        de[1].starthi = cpu_to_le16(MSDOS_I(dir)->i_logstart >> 16);
+        fat_set_start(&de[0], cluster);
+        fat_set_start(&de[1], MSDOS_I(dir)->i_logstart);
         de[0].size = de[1].size = 0;
         memset(de + 2, 0, sb->s_blocksize - 2 * sizeof(*de));
         set_buffer_uptodate(bhs[0]);
@@ -1161,7 +1161,6 @@ error_free:
 error:
         return err;
 }
-
 EXPORT_SYMBOL_GPL(fat_alloc_new_dir);
 
 static int fat_add_new_entries(struct inode *dir, void *slots, int nr_slots,
@@ -1377,5 +1376,4 @@ error_remove:
                 __fat_remove_entries(dir, pos, free_slots);
         return err;
 }
-
 EXPORT_SYMBOL_GPL(fat_add_entries);
diff --git a/fs/fat/fat.h b/fs/fat/fat.h
index 7d8e0dcac5d5..ca7e8f8bad7c 100644
--- a/fs/fat/fat.h
+++ b/fs/fat/fat.h
@@ -5,6 +5,7 @@
 #include <linux/string.h>
 #include <linux/nls.h>
 #include <linux/fs.h>
+#include <linux/hash.h>
 #include <linux/mutex.h>
 #include <linux/ratelimit.h>
 #include <linux/msdos_fs.h>
@@ -27,26 +28,27 @@ struct fat_mount_options {
         kgid_t fs_gid;
         unsigned short fs_fmask;
         unsigned short fs_dmask;
-        unsigned short codepage;  /* Codepage for shortname conversions */
-        char *iocharset;          /* Charset used for filename input/display */
-        unsigned short shortname; /* flags for shortname display/create rule */
-        unsigned char name_check; /* r = relaxed, n = normal, s = strict */
-        unsigned char errors;     /* On error: continue, panic, remount-ro */
+        unsigned short codepage;   /* Codepage for shortname conversions */
+        char *iocharset;           /* Charset used for filename input/display */
+        unsigned short shortname;  /* flags for shortname display/create rule */
+        unsigned char name_check;  /* r = relaxed, n = normal, s = strict */
+        unsigned char errors;      /* On error: continue, panic, remount-ro */
         unsigned short allow_utime;/* permission for setting the [am]time */
-        unsigned quiet:1,         /* set = fake successful chmods and chowns */
-                 showexec:1,      /* set = only set x bit for com/exe/bat */
-                 sys_immutable:1, /* set = system files are immutable */
-                 dotsOK:1,        /* set = hidden and system files are named '.filename' */
-                 isvfat:1,        /* 0=no vfat long filename support, 1=vfat support */
-                 utf8:1,          /* Use of UTF-8 character set (Default) */
-                 unicode_xlate:1, /* create escape sequences for unhandled Unicode */
-                 numtail:1,       /* Does first alias have a numeric '~1' type tail? */
-                 flush:1,         /* write things quickly */
-                 nocase:1,        /* Does this need case conversion? 0=need case conversion*/
-                 usefree:1,       /* Use free_clusters for FAT32 */
-                 tz_utc:1,        /* Filesystem timestamps are in UTC */
-                 rodir:1,         /* allow ATTR_RO for directory */
-                 discard:1;       /* Issue discard requests on deletions */
+        unsigned quiet:1,          /* set = fake successful chmods and chowns */
+                 showexec:1,       /* set = only set x bit for com/exe/bat */
+                 sys_immutable:1,  /* set = system files are immutable */
+                 dotsOK:1,         /* set = hidden and system files are named '.filename' */
+                 isvfat:1,         /* 0=no vfat long filename support, 1=vfat support */
+                 utf8:1,           /* Use of UTF-8 character set (Default) */
+                 unicode_xlate:1,  /* create escape sequences for unhandled Unicode */
+                 numtail:1,        /* Does first alias have a numeric '~1' type tail? */
+                 flush:1,          /* write things quickly */
+                 nocase:1,         /* Does this need case conversion? 0=need case conversion*/
+                 usefree:1,        /* Use free_clusters for FAT32 */
+                 tz_utc:1,         /* Filesystem timestamps are in UTC */
+                 rodir:1,          /* allow ATTR_RO for directory */
+                 discard:1,        /* Issue discard requests on deletions */
+                 nfs:1;            /* Do extra work needed for NFS export */
 };
 
 #define FAT_HASH_BITS   8
@@ -56,28 +58,28 @@ struct fat_mount_options {
  * MS-DOS file system in-core superblock data
  */
 struct msdos_sb_info {
-        unsigned short sec_per_clus; /* sectors/cluster */
-        unsigned short cluster_bits; /* log2(cluster_size) */
-        unsigned int cluster_size;   /* cluster size */
-        unsigned char fats,fat_bits; /* number of FATs, FAT bits (12 or 16) */
+        unsigned short sec_per_clus;  /* sectors/cluster */
+        unsigned short cluster_bits;  /* log2(cluster_size) */
+        unsigned int cluster_size;    /* cluster size */
+        unsigned char fats, fat_bits; /* number of FATs, FAT bits (12 or 16) */
         unsigned short fat_start;
-        unsigned long fat_length;    /* FAT start & length (sec.) */
+        unsigned long fat_length;     /* FAT start & length (sec.) */
         unsigned long dir_start;
-        unsigned short dir_entries;  /* root dir start & entries */
-        unsigned long data_start;    /* first data sector */
-        unsigned long max_cluster;   /* maximum cluster number */
-        unsigned long root_cluster;  /* first cluster of the root directory */
-        unsigned long fsinfo_sector; /* sector number of FAT32 fsinfo */
+        unsigned short dir_entries;   /* root dir start & entries */
+        unsigned long data_start;     /* first data sector */
+        unsigned long max_cluster;    /* maximum cluster number */
+        unsigned long root_cluster;   /* first cluster of the root directory */
+        unsigned long fsinfo_sector;  /* sector number of FAT32 fsinfo */
         struct mutex fat_lock;
-        unsigned int prev_free;      /* previously allocated cluster number */
-        unsigned int free_clusters;  /* -1 if undefined */
+        unsigned int prev_free;       /* previously allocated cluster number */
+        unsigned int free_clusters;   /* -1 if undefined */
         unsigned int free_clus_valid; /* is free_clusters valid? */
         struct fat_mount_options options;
-        struct nls_table *nls_disk;  /* Codepage used on disk */
-        struct nls_table *nls_io;    /* Charset used for input and display */
-        const void *dir_ops;                 /* Opaque; default directory operations */
-        int dir_per_block;           /* dir entries per block */
-        int dir_per_block_bits;      /* log2(dir_per_block) */
+        struct nls_table *nls_disk;   /* Codepage used on disk */
+        struct nls_table *nls_io;     /* Charset used for input and display */
+        const void *dir_ops;          /* Opaque; default directory operations */
+        int dir_per_block;            /* dir entries per block */
+        int dir_per_block_bits;       /* log2(dir_per_block) */
 
         int fatent_shift;
         struct fatent_operations *fatent_ops;
@@ -88,6 +90,9 @@ struct msdos_sb_info {
 
         spinlock_t inode_hash_lock;
         struct hlist_head inode_hashtable[FAT_HASH_SIZE];
+
+        spinlock_t dir_hash_lock;
+        struct hlist_head dir_hashtable[FAT_HASH_SIZE];
 };
 
 #define FAT_CACHE_VALID 0       /* special case for valid cache */
@@ -110,6 +115,7 @@ struct msdos_inode_info {
         int i_attrs;            /* unused attribute bits */
         loff_t i_pos;           /* on-disk position of directory entry or 0 */
         struct hlist_node i_fat_hash;   /* hash by i_location */
+        struct hlist_node i_dir_hash;   /* hash by i_logstart */
         struct rw_semaphore truncate_lock; /* protect bmap against truncate */
         struct inode vfs_inode;
 };
@@ -262,7 +268,7 @@ extern int fat_subdirs(struct inode *dir);
 extern int fat_scan(struct inode *dir, const unsigned char *name,
                     struct fat_slot_info *sinfo);
 extern int fat_get_dotdot_entry(struct inode *dir, struct buffer_head **bh,
-                                struct msdos_dir_entry **de, loff_t *i_pos);
+                                struct msdos_dir_entry **de);
 extern int fat_alloc_new_dir(struct inode *dir, struct timespec *ts);
 extern int fat_add_entries(struct inode *dir, void *slots, int nr_slots,
                            struct fat_slot_info *sinfo);
@@ -322,7 +328,7 @@ extern long fat_generic_ioctl(struct file *filp, unsigned int cmd,
                               unsigned long arg);
 extern const struct file_operations fat_file_operations;
 extern const struct inode_operations fat_file_inode_operations;
-extern int fat_setattr(struct dentry * dentry, struct iattr * attr);
+extern int fat_setattr(struct dentry *dentry, struct iattr *attr);
 extern void fat_truncate_blocks(struct inode *inode, loff_t offset);
 extern int fat_getattr(struct vfsmount *mnt, struct dentry *dentry,
                        struct kstat *stat);
@@ -340,7 +346,12 @@ extern int fat_fill_super(struct super_block *sb, void *data, int silent,
                           int isvfat, void (*setup)(struct super_block *));
 
 extern int fat_flush_inodes(struct super_block *sb, struct inode *i1,
-                            struct inode *i2);
+                            struct inode *i2);
+static inline unsigned long fat_dir_hash(int logstart)
+{
+        return hash_32(logstart, FAT_HASH_BITS);
+}
+
 /* fat/misc.c */
 extern __printf(3, 4) __cold
 void __fat_fs_error(struct super_block *sb, int report, const char *fmt, ...);
@@ -366,6 +377,14 @@ extern int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs);
 int fat_cache_init(void);
 void fat_cache_destroy(void);
 
+/* fat/nfs.c */
+struct fid;
+extern struct dentry *fat_fh_to_dentry(struct super_block *sb, struct fid *fid,
+                                       int fh_len, int fh_type);
+extern struct dentry *fat_fh_to_parent(struct super_block *sb, struct fid *fid,
+                                       int fh_len, int fh_type);
+extern struct dentry *fat_get_parent(struct dentry *child_dir);
+
 /* helper for printk */
 typedef unsigned long long      llu;
 
diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
index 31f08ab62c56..260705c58062 100644
--- a/fs/fat/fatent.c
+++ b/fs/fat/fatent.c
@@ -186,9 +186,6 @@ static void fat16_ent_put(struct fat_entry *fatent, int new)
 
 static void fat32_ent_put(struct fat_entry *fatent, int new)
 {
-        if (new == FAT_ENT_EOF)
-                new = EOF_FAT32;
-
         WARN_ON(new & 0xf0000000);
         new |= le32_to_cpu(*fatent->u.ent32_p) & ~0x0fffffff;
         *fatent->u.ent32_p = cpu_to_le32(new);
@@ -203,15 +200,18 @@ static int fat12_ent_next(struct fat_entry *fatent)
 
         fatent->entry++;
         if (fatent->nr_bhs == 1) {
-                WARN_ON(ent12_p[0] > (u8 *)(bhs[0]->b_data + (bhs[0]->b_size - 2)));
-                WARN_ON(ent12_p[1] > (u8 *)(bhs[0]->b_data + (bhs[0]->b_size - 1)));
+                WARN_ON(ent12_p[0] > (u8 *)(bhs[0]->b_data +
+                                                        (bhs[0]->b_size - 2)));
+                WARN_ON(ent12_p[1] > (u8 *)(bhs[0]->b_data +
+                                                        (bhs[0]->b_size - 1)));
                 if (nextp < (u8 *)(bhs[0]->b_data + (bhs[0]->b_size - 1))) {
                         ent12_p[0] = nextp - 1;
                         ent12_p[1] = nextp;
                         return 1;
                 }
         } else {
-                WARN_ON(ent12_p[0] != (u8 *)(bhs[0]->b_data + (bhs[0]->b_size - 1)));
+                WARN_ON(ent12_p[0] != (u8 *)(bhs[0]->b_data +
+                                                        (bhs[0]->b_size - 1)));
                 WARN_ON(ent12_p[1] != (u8 *)bhs[1]->b_data);
                 ent12_p[0] = nextp - 1;
                 ent12_p[1] = nextp;
@@ -631,7 +631,6 @@ error:
 
         return err;
 }
-
 EXPORT_SYMBOL_GPL(fat_free_clusters);
 
 /* 128kb is the whole sectors for FAT12 and FAT16 */
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 4e5a6ac54ebd..76f60c642c06 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -281,15 +281,42 @@ static inline unsigned long fat_hash(loff_t i_pos)
         return hash_32(i_pos, FAT_HASH_BITS);
 }
 
+static void dir_hash_init(struct super_block *sb)
+{
+        struct msdos_sb_info *sbi = MSDOS_SB(sb);
+        int i;
+
+        spin_lock_init(&sbi->dir_hash_lock);
+        for (i = 0; i < FAT_HASH_SIZE; i++)
+                INIT_HLIST_HEAD(&sbi->dir_hashtable[i]);
+}
+
 void fat_attach(struct inode *inode, loff_t i_pos)
 {
         struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb);
-        struct hlist_head *head = sbi->inode_hashtable + fat_hash(i_pos);
 
-        spin_lock(&sbi->inode_hash_lock);
-        MSDOS_I(inode)->i_pos = i_pos;
-        hlist_add_head(&MSDOS_I(inode)->i_fat_hash, head);
-        spin_unlock(&sbi->inode_hash_lock);
+        if (inode->i_ino != MSDOS_ROOT_INO) {
+                struct hlist_head *head =   sbi->inode_hashtable
+                                          + fat_hash(i_pos);
+
+                spin_lock(&sbi->inode_hash_lock);
+                MSDOS_I(inode)->i_pos = i_pos;
+                hlist_add_head(&MSDOS_I(inode)->i_fat_hash, head);
+                spin_unlock(&sbi->inode_hash_lock);
+        }
+
+        /* If NFS support is enabled, cache the mapping of start cluster
+         * to directory inode. This is used during reconnection of
+         * dentries to the filesystem root.
+         */
+        if (S_ISDIR(inode->i_mode) && sbi->options.nfs) {
+                struct hlist_head *d_head = sbi->dir_hashtable;
+                d_head += fat_dir_hash(MSDOS_I(inode)->i_logstart);
+
+                spin_lock(&sbi->dir_hash_lock);
+                hlist_add_head(&MSDOS_I(inode)->i_dir_hash, d_head);
+                spin_unlock(&sbi->dir_hash_lock);
+        }
 }
 EXPORT_SYMBOL_GPL(fat_attach);
 
@@ -300,6 +327,12 @@ void fat_detach(struct inode *inode)
         MSDOS_I(inode)->i_pos = 0;
         hlist_del_init(&MSDOS_I(inode)->i_fat_hash);
         spin_unlock(&sbi->inode_hash_lock);
+
+        if (S_ISDIR(inode->i_mode) && sbi->options.nfs) {
+                spin_lock(&sbi->dir_hash_lock);
+                hlist_del_init(&MSDOS_I(inode)->i_dir_hash);
+                spin_unlock(&sbi->dir_hash_lock);
+        }
 }
 EXPORT_SYMBOL_GPL(fat_detach);
 
@@ -504,6 +537,7 @@ static void init_once(void *foo)
         ei->cache_valid_id = FAT_CACHE_VALID + 1;
         INIT_LIST_HEAD(&ei->cache_lru);
         INIT_HLIST_NODE(&ei->i_fat_hash);
+        INIT_HLIST_NODE(&ei->i_dir_hash);
         inode_init_once(&ei->vfs_inode);
 }
 
@@ -668,125 +702,9 @@ static const struct super_operations fat_sops = {
         .show_options   = fat_show_options,
 };
 
-/*
- * a FAT file handle with fhtype 3 is
- *  0/  i_ino - for fast, reliable lookup if still in the cache
- *  1/  i_generation - to see if i_ino is still valid
- *          bit 0 == 0 iff directory
- *  2/  i_pos(8-39) - if ino has changed, but still in cache
- *  3/  i_pos(4-7)|i_logstart - to semi-verify inode found at i_pos
- *  4/  i_pos(0-3)|parent->i_logstart - maybe used to hunt for the file on disc
- *
- * Hack for NFSv2: Maximum FAT entry number is 28bits and maximum
- * i_pos is 40bits (blocknr(32) + dir offset(8)), so two 4bits
- * of i_logstart is used to store the directory entry offset.
- */
-
-static struct dentry *fat_fh_to_dentry(struct super_block *sb,
-                struct fid *fid, int fh_len, int fh_type)
-{
-        struct inode *inode = NULL;
-        u32 *fh = fid->raw;
-
-        if (fh_len < 5 || fh_type != 3)
-                return NULL;
-
-        inode = ilookup(sb, fh[0]);
-        if (!inode || inode->i_generation != fh[1]) {
-                if (inode)
-                        iput(inode);
-                inode = NULL;
-        }
-        if (!inode) {
-                loff_t i_pos;
-                int i_logstart = fh[3] & 0x0fffffff;
-
-                i_pos = (loff_t)fh[2] << 8;
-                i_pos |= ((fh[3] >> 24) & 0xf0) | (fh[4] >> 28);
-
-                /* try 2 - see if i_pos is in F-d-c
-                 * require i_logstart to be the same
-                 * Will fail if you truncate and then re-write
-                 */
-
-                inode = fat_iget(sb, i_pos);
-                if (inode && MSDOS_I(inode)->i_logstart != i_logstart) {
-                        iput(inode);
-                        inode = NULL;
-                }
-        }
-
-        /*
-         * For now, do nothing if the inode is not found.
-         *
-         * What we could do is:
-         *
-         *      - follow the file starting at fh[4], and record the ".." entry,
-         *        and the name of the fh[2] entry.
-         *      - then follow the ".." file finding the next step up.
-         *
-         * This way we build a path to the root of the tree. If this works, we
-         * lookup the path and so get this inode into the cache.  Finally try
-         * the fat_iget lookup again.  If that fails, then we are totally out
-         * of luck.  But all that is for another day
-         */
-        return d_obtain_alias(inode);
-}
-
-static int
-fat_encode_fh(struct inode *inode, __u32 *fh, int *lenp, struct inode *parent)
-{
-        int len = *lenp;
-        struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb);
-        loff_t i_pos;
-
-        if (len < 5) {
-                *lenp = 5;
-                return 255; /* no room */
-        }
-
-        i_pos = fat_i_pos_read(sbi, inode);
-        *lenp = 5;
-        fh[0] = inode->i_ino;
-        fh[1] = inode->i_generation;
-        fh[2] = i_pos >> 8;
-        fh[3] = ((i_pos & 0xf0) << 24) | MSDOS_I(inode)->i_logstart;
-        fh[4] = (i_pos & 0x0f) << 28;
-        if (parent)
-                fh[4] |= MSDOS_I(parent)->i_logstart;
-        return 3;
-}
-
-static struct dentry *fat_get_parent(struct dentry *child)
-{
-        struct super_block *sb = child->d_sb;
-        struct buffer_head *bh;
-        struct msdos_dir_entry *de;
-        loff_t i_pos;
-        struct dentry *parent;
-        struct inode *inode;
-        int err;
-
-        lock_super(sb);
-
-        err = fat_get_dotdot_entry(child->d_inode, &bh, &de, &i_pos);
-        if (err) {
-                parent = ERR_PTR(err);
-                goto out;
-        }
-        inode = fat_build_inode(sb, de, i_pos);
-        brelse(bh);
-
-        parent = d_obtain_alias(inode);
-out:
-        unlock_super(sb);
-
-        return parent;
-}
-
 static const struct export_operations fat_export_ops = {
-        .encode_fh      = fat_encode_fh,
         .fh_to_dentry   = fat_fh_to_dentry,
+        .fh_to_parent   = fat_fh_to_parent,
         .get_parent     = fat_get_parent,
 };
 
@@ -836,6 +754,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root)
                 seq_puts(m, ",usefree");
         if (opts->quiet)
                 seq_puts(m, ",quiet");
+        if (opts->nfs)
+                seq_puts(m, ",nfs");
         if (opts->showexec)
                 seq_puts(m, ",showexec");
         if (opts->sys_immutable)
@@ -880,7 +800,7 @@ enum {
         Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes,
         Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes,
         Opt_obsolete, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err_cont,
-        Opt_err_panic, Opt_err_ro, Opt_discard, Opt_err,
+        Opt_err_panic, Opt_err_ro, Opt_discard, Opt_nfs, Opt_err,
 };
 
 static const match_table_t fat_tokens = {
@@ -909,6 +829,7 @@ static const match_table_t fat_tokens = {
         {Opt_err_panic, "errors=panic"},
         {Opt_err_ro, "errors=remount-ro"},
         {Opt_discard, "discard"},
+        {Opt_nfs, "nfs"},
         {Opt_obsolete, "conv=binary"},
         {Opt_obsolete, "conv=text"},
         {Opt_obsolete, "conv=auto"},
@@ -989,6 +910,7 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat,
         opts->numtail = 1;
         opts->usefree = opts->nocase = 0;
         opts->tz_utc = 0;
+        opts->nfs = 0;
         opts->errors = FAT_ERRORS_RO;
         *debug = 0;
 
@@ -1153,6 +1075,9 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat,
                 case Opt_discard:
                         opts->discard = 1;
                         break;
+                case Opt_nfs:
+                        opts->nfs = 1;
+                        break;
 
                 /* obsolete mount options */
                 case Opt_obsolete:
@@ -1443,6 +1368,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
 
         /* set up enough so that it can read an inode */
         fat_hash_init(sb);
+        dir_hash_init(sb);
         fat_ent_access_init(sb);
 
         /*
@@ -1497,6 +1423,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
         }
         error = -ENOMEM;
         insert_inode_hash(root_inode);
+        fat_attach(root_inode, 0);
         sb->s_root = d_make_root(root_inode);
         if (!sb->s_root) {
                 fat_msg(sb, KERN_ERR, "get root inode failed");
@@ -1536,18 +1463,14 @@ static int writeback_inode(struct inode *inode)
 {
 
         int ret;
-        struct address_space *mapping = inode->i_mapping;
-        struct writeback_control wbc = {
-               .sync_mode = WB_SYNC_NONE,
-              .nr_to_write = 0,
-        };
-        /* if we used WB_SYNC_ALL, sync_inode waits for the io for the
-        * inode to finish.  So WB_SYNC_NONE is sent down to sync_inode
+
+        /* if we used wait=1, sync_inode_metadata waits for the io for the
+        * inode to finish.  So wait=0 is sent down to sync_inode_metadata
         * and filemap_fdatawrite is used for the data blocks
         */
-        ret = sync_inode(inode, &wbc);
+        ret = sync_inode_metadata(inode, 0);
         if (!ret)
-               ret = filemap_fdatawrite(mapping);
+                ret = filemap_fdatawrite(inode->i_mapping);
         return ret;
 }
 
diff --git a/fs/fat/namei_msdos.c b/fs/fat/namei_msdos.c
index b0e12bf9f4a1..c1055e778fff 100644
--- a/fs/fat/namei_msdos.c
+++ b/fs/fat/namei_msdos.c
@@ -407,7 +407,7 @@ out:
 static int msdos_unlink(struct inode *dir, struct dentry *dentry)
 {
         struct inode *inode = dentry->d_inode;
-        struct super_block *sb= inode->i_sb;
+        struct super_block *sb = inode->i_sb;
         struct fat_slot_info sinfo;
         int err;
 
@@ -440,7 +440,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
         struct inode *old_inode, *new_inode;
         struct fat_slot_info old_sinfo, sinfo;
         struct timespec ts;
-        loff_t dotdot_i_pos, new_i_pos;
+        loff_t new_i_pos;
         int err, old_attrs, is_dir, update_dotdot, corrupt = 0;
 
         old_sinfo.bh = sinfo.bh = dotdot_bh = NULL;
@@ -456,8 +456,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
         is_dir = S_ISDIR(old_inode->i_mode);
         update_dotdot = (is_dir && old_dir != new_dir);
         if (update_dotdot) {
-                if (fat_get_dotdot_entry(old_inode, &dotdot_bh, &dotdot_de,
-                                         &dotdot_i_pos) < 0) {
+                if (fat_get_dotdot_entry(old_inode, &dotdot_bh, &dotdot_de)) {
                         err = -EIO;
                         goto out;
                 }
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index 6a6d8c0715a1..e535dd75b986 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -914,7 +914,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
         struct inode *old_inode, *new_inode;
         struct fat_slot_info old_sinfo, sinfo;
         struct timespec ts;
-        loff_t dotdot_i_pos, new_i_pos;
+        loff_t new_i_pos;
         int err, is_dir, update_dotdot, corrupt = 0;
         struct super_block *sb = old_dir->i_sb;
 
@@ -929,8 +929,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
         is_dir = S_ISDIR(old_inode->i_mode);
         update_dotdot = (is_dir && old_dir != new_dir);
         if (update_dotdot) {
-                if (fat_get_dotdot_entry(old_inode, &dotdot_bh, &dotdot_de,
-                                         &dotdot_i_pos) < 0) {
+                if (fat_get_dotdot_entry(old_inode, &dotdot_bh, &dotdot_de)) {
                         err = -EIO;
                         goto out;
                 }
diff --git a/fs/fat/nfs.c b/fs/fat/nfs.c
new file mode 100644
index 000000000000..ef4b5faba87b
--- /dev/null
+++ b/fs/fat/nfs.c
@@ -0,0 +1,101 @@
+/* fs/fat/nfs.c
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/exportfs.h>
+#include "fat.h"
+
+/**
+ * Look up a directory inode given its starting cluster.
+ */
+static struct inode *fat_dget(struct super_block *sb, int i_logstart)
+{
+        struct msdos_sb_info *sbi = MSDOS_SB(sb);
+        struct hlist_head *head;
+        struct hlist_node *_p;
+        struct msdos_inode_info *i;
+        struct inode *inode = NULL;
+
+        head = sbi->dir_hashtable + fat_dir_hash(i_logstart);
+        spin_lock(&sbi->dir_hash_lock);
+        hlist_for_each_entry(i, _p, head, i_dir_hash) {
+                BUG_ON(i->vfs_inode.i_sb != sb);
+                if (i->i_logstart != i_logstart)
+                        continue;
+                inode = igrab(&i->vfs_inode);
+                if (inode)
+                        break;
+        }
+        spin_unlock(&sbi->dir_hash_lock);
+        return inode;
+}
+
+static struct inode *fat_nfs_get_inode(struct super_block *sb,
+                                       u64 ino, u32 generation)
+{
+        struct inode *inode;
+
+        if ((ino < MSDOS_ROOT_INO) || (ino == MSDOS_FSINFO_INO))
+                return NULL;
+
+        inode = ilookup(sb, ino);
+        if (inode && generation && (inode->i_generation != generation)) {
+                iput(inode);
+                inode = NULL;
+        }
+
+        return inode;
+}
+
+/**
+ * Map a NFS file handle to a corresponding dentry.
+ * The dentry may or may not be connected to the filesystem root.
+ */
+struct dentry *fat_fh_to_dentry(struct super_block *sb, struct fid *fid,
+                                int fh_len, int fh_type)
+{
+        return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
+                                    fat_nfs_get_inode);
+}
+
+/*
+ * Find the parent for a file specified by NFS handle.
+ * This requires that the handle contain the i_ino of the parent.
+ */
+struct dentry *fat_fh_to_parent(struct super_block *sb, struct fid *fid,
+                                int fh_len, int fh_type)
+{
+        return generic_fh_to_parent(sb, fid, fh_len, fh_type,
+                                    fat_nfs_get_inode);
+}
+
+/*
+ * Find the parent for a directory that is not currently connected to
+ * the filesystem root.
+ *
+ * On entry, the caller holds child_dir->d_inode->i_mutex.
+ */
+struct dentry *fat_get_parent(struct dentry *child_dir)
+{
+        struct super_block *sb = child_dir->d_sb;
+        struct buffer_head *bh = NULL;
+        struct msdos_dir_entry *de;
+        struct inode *parent_inode = NULL;
+
+        if (!fat_get_dotdot_entry(child_dir->d_inode, &bh, &de)) {
+                int parent_logstart = fat_get_start(MSDOS_SB(sb), de);
+                parent_inode = fat_dget(sb, parent_logstart);
+        }
+        brelse(bh);
+
+        return d_obtain_alias(parent_inode);
+}
diff --git a/fs/hpfs/anode.c b/fs/hpfs/anode.c
index 4bae4a4a60b1..2d5b254ad9e2 100644
--- a/fs/hpfs/anode.c
+++ b/fs/hpfs/anode.c
@@ -102,7 +102,7 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi
                         return -1;
                 }
                 if (hpfs_alloc_if_possible(s, se = le32_to_cpu(btree->u.external[n].disk_secno) + le32_to_cpu(btree->u.external[n].length))) {
-                        btree->u.external[n].length = cpu_to_le32(le32_to_cpu(btree->u.external[n].length) + 1);
+                        le32_add_cpu(&btree->u.external[n].length, 1);
                         mark_buffer_dirty(bh);
                         brelse(bh);
                         return se;
@@ -153,7 +153,7 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi
                 btree = &anode->btree;
         }
         btree->n_free_nodes--; n = btree->n_used_nodes++;
-        btree->first_free = cpu_to_le16(le16_to_cpu(btree->first_free) + 12);
+        le16_add_cpu(&btree->first_free, 12);
         btree->u.external[n].disk_secno = cpu_to_le32(se);
         btree->u.external[n].file_secno = cpu_to_le32(fs);
         btree->u.external[n].length = cpu_to_le32(1);
@@ -174,7 +174,7 @@ secno hpfs_add_sector_to_btree(struct super_block *s, secno node, int fnod, unsi
                 }
                 if (btree->n_free_nodes) {
                         btree->n_free_nodes--; n = btree->n_used_nodes++;
-                        btree->first_free = cpu_to_le16(le16_to_cpu(btree->first_free) + 8);
+                        le16_add_cpu(&btree->first_free, 8);
                         btree->u.internal[n].file_secno = cpu_to_le32(-1);
                         btree->u.internal[n].down = cpu_to_le32(na);
                         btree->u.internal[n-1].file_secno = cpu_to_le32(fs);
diff --git a/fs/hpfs/dnode.c b/fs/hpfs/dnode.c
index 3228c524ebe5..4364b2a02c5d 100644
--- a/fs/hpfs/dnode.c
+++ b/fs/hpfs/dnode.c
@@ -145,10 +145,10 @@ static void set_last_pointer(struct super_block *s, struct dnode *d, dnode_secno
                 }
         }
         if (ptr) {
-                d->first_free = cpu_to_le32(le32_to_cpu(d->first_free) + 4);
+                le32_add_cpu(&d->first_free, 4);
                 if (le32_to_cpu(d->first_free) > 2048) {
                         hpfs_error(s, "set_last_pointer: too long dnode %08x", le32_to_cpu(d->self));
-                        d->first_free = cpu_to_le32(le32_to_cpu(d->first_free) - 4);
+                        le32_add_cpu(&d->first_free, -4);
                         return;
                 }
                 de->length = cpu_to_le16(36);
@@ -184,7 +184,7 @@ struct hpfs_dirent *hpfs_add_de(struct super_block *s, struct dnode *d,
         de->not_8x3 = hpfs_is_name_long(name, namelen);
         de->namelen = namelen;
         memcpy(de->name, name, namelen);
-        d->first_free = cpu_to_le32(le32_to_cpu(d->first_free) + d_size);
+        le32_add_cpu(&d->first_free, d_size);
         return de;
 }
 
@@ -314,7 +314,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno,
         set_last_pointer(i->i_sb, ad, de->down ? de_down_pointer(de) : 0);
         de = de_next_de(de);
         memmove((char *)nd + 20, de, le32_to_cpu(nd->first_free) + (char *)nd - (char *)de);
-        nd->first_free = cpu_to_le32(le32_to_cpu(nd->first_free) - ((char *)de - (char *)nd - 20));
+        le32_add_cpu(&nd->first_free, -((char *)de - (char *)nd - 20));
         memcpy(d, nd, le32_to_cpu(nd->first_free));
         for_all_poss(i, hpfs_pos_del, (loff_t)dno << 4, pos);
         fix_up_ptrs(i->i_sb, ad);
@@ -474,8 +474,8 @@ static secno move_to_top(struct inode *i, dnode_secno from, dnode_secno to)
                         hpfs_brelse4(&qbh);
                         return 0;
                 }
-                dnode->first_free = cpu_to_le32(le32_to_cpu(dnode->first_free) - 4);
-                de->length = cpu_to_le16(le16_to_cpu(de->length) - 4);
+                le32_add_cpu(&dnode->first_free, -4);
+                le16_add_cpu(&de->length, -4);
                 de->down = 0;
                 hpfs_mark_4buffers_dirty(&qbh);
                 dno = up;
@@ -570,8 +570,8 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
                 for_all_poss(i, hpfs_pos_subst, ((loff_t)dno << 4) | 1, ((loff_t)up << 4) | p);
                 if (!down) {
                         de->down = 0;
-                        de->length = cpu_to_le16(le16_to_cpu(de->length) - 4);
-                        dnode->first_free = cpu_to_le32(le32_to_cpu(dnode->first_free) - 4);
+                        le16_add_cpu(&de->length, -4);
+                        le32_add_cpu(&dnode->first_free, -4);
                         memmove(de_next_de(de), (char *)de_next_de(de) + 4,
                                 (char *)dnode + le32_to_cpu(dnode->first_free) - (char *)de_next_de(de));
                 } else {
@@ -647,14 +647,14 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
                                         printk("HPFS: warning: unbalanced dnode tree, see hpfs.txt 4 more info\n");
                                         printk("HPFS: warning: goin'on\n");
                                 }
-                                del->length = cpu_to_le16(le16_to_cpu(del->length) + 4);
+                                le16_add_cpu(&del->length, 4);
                                 del->down = 1;
-                                d1->first_free = cpu_to_le32(le32_to_cpu(d1->first_free) + 4);
+                                le32_add_cpu(&d1->first_free, 4);
                         }
                         if (dlp && !down) {
-                                del->length = cpu_to_le16(le16_to_cpu(del->length) - 4);
+                                le16_add_cpu(&del->length, -4);
                                 del->down = 0;
-                                d1->first_free = cpu_to_le32(le32_to_cpu(d1->first_free) - 4);
+                                le32_add_cpu(&d1->first_free, -4);
                         } else if (down)
                                 *(__le32 *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down);
                 } else goto endm;
@@ -668,9 +668,9 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
                 memcpy(de_cp, de_prev, le16_to_cpu(de_prev->length));
                 hpfs_delete_de(i->i_sb, dnode, de_prev);
                 if (!de_prev->down) {
-                        de_prev->length = cpu_to_le16(le16_to_cpu(de_prev->length) + 4);
+                        le16_add_cpu(&de_prev->length, 4);
                         de_prev->down = 1;
-                        dnode->first_free = cpu_to_le32(le32_to_cpu(dnode->first_free) + 4);
+                        le32_add_cpu(&dnode->first_free, 4);
                 }
                 *(__le32 *) ((void *) de_prev + le16_to_cpu(de_prev->length) - 4) = cpu_to_le32(ndown);
                 hpfs_mark_4buffers_dirty(&qbh);
diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index 2c6d95257a4d..77e3cb2962b4 100644
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -146,8 +146,7 @@ static int omfs_grow_extent(struct inode *inode, struct omfs_extent *oe,
                         be64_to_cpu(entry->e_blocks);
 
                 if (omfs_allocate_block(inode->i_sb, new_block)) {
-                        entry->e_blocks =
-                                cpu_to_be64(be64_to_cpu(entry->e_blocks) + 1);
+                        be64_add_cpu(&entry->e_blocks, 1);
                         terminator->e_blocks = ~(cpu_to_be64(
                                 be64_to_cpu(~terminator->e_blocks) + 1));
                         goto out;
@@ -177,7 +176,7 @@ static int omfs_grow_extent(struct inode *inode, struct omfs_extent *oe,
                 be64_to_cpu(~terminator->e_blocks) + (u64) new_count));
 
         /* write in new entry */
-        oe->e_extent_count = cpu_to_be32(1 + be32_to_cpu(oe->e_extent_count));
+        be32_add_cpu(&oe->e_extent_count, 1);
 
 out:
         *ret_block = new_block;
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index b3647fe6a608..0d80cef4cfb9 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -427,7 +427,7 @@ struct dentry *proc_lookup_de(struct proc_dir_entry *de, struct inode *dir,
                 if (!memcmp(dentry->d_name.name, de->name, de->namelen)) {
                         pde_get(de);
                         spin_unlock(&proc_subdir_lock);
-                        error = -EINVAL;
+                        error = -ENOMEM;
                         inode = proc_get_inode(dir->i_sb, de);
                         goto out_unlock;
                 }
@@ -605,7 +605,8 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent,
         unsigned int len;
 
         /* make sure name is valid */
-        if (!name || !strlen(name)) goto out;
+        if (!name || !strlen(name))
+                goto out;
 
         if (xlate_proc_name(name, parent, &fn) != 0)
                 goto out;
@@ -616,20 +617,18 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent,
 
         len = strlen(fn);
 
-        ent = kmalloc(sizeof(struct proc_dir_entry) + len + 1, GFP_KERNEL);
-        if (!ent) goto out;
+        ent = kzalloc(sizeof(struct proc_dir_entry) + len + 1, GFP_KERNEL);
+        if (!ent)
+                goto out;
 
-        memset(ent, 0, sizeof(struct proc_dir_entry));
         memcpy(ent->name, fn, len + 1);
         ent->namelen = len;
         ent->mode = mode;
         ent->nlink = nlink;
         atomic_set(&ent->count, 1);
-        ent->pde_users = 0;
         spin_lock_init(&ent->pde_unload_lock);
-        ent->pde_unload_completion = NULL;
         INIT_LIST_HEAD(&ent->pde_openers);
- out:
+out:
         return ent;
 }
 
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 7ac817b64a71..3b22bbdee9ec 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -450,7 +450,6 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
                 return NULL;
         if (inode->i_state & I_NEW) {
                 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-                PROC_I(inode)->fd = 0;
                 PROC_I(inode)->pde = de;
 
                 if (de->mode) {
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 67925a7bd8cb..cceaab07ad54 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -103,7 +103,7 @@ static inline int task_dumpable(struct task_struct *task)
         if (mm)
                 dumpable = get_dumpable(mm);
         task_unlock(task);
-        if(dumpable == 1)
+        if (dumpable == SUID_DUMPABLE_ENABLED)
                 return 1;
         return 0;
 }
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index eb7cc91b7258..dcd56f84db7e 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -266,8 +266,7 @@ void sysctl_head_put(struct ctl_table_header *head)
 
 static struct ctl_table_header *sysctl_head_grab(struct ctl_table_header *head)
 {
-        if (!head)
-                BUG();
+        BUG_ON(!head);
         spin_lock(&sysctl_lock);
         if (!use_table(head))
                 head = ERR_PTR(-ENOENT);
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 9a2d9fd7cadd..9889a92d2e01 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -61,7 +61,7 @@ static int proc_parse_options(char *options, struct pid_namespace *pid)
                 if (!*p)
                         continue;
 
-                args[0].to = args[0].from = 0;
+                args[0].to = args[0].from = NULL;
                 token = match_token(p, tokens, args);
                 switch (token) {
                 case Opt_gid:
diff --git a/fs/super.c b/fs/super.c
index 5fdf7ff32c4e..a3bc935069d9 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -865,7 +865,7 @@ int get_anon_bdev(dev_t *p)
         else if (error)
                 return -EAGAIN;
 
-        if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) {
+        if ((dev & MAX_IDR_MASK) == (1 << MINORBITS)) {
                 spin_lock(&unnamed_dev_lock);
                 ida_remove(&unnamed_dev_ida, dev);
                 if (unnamed_dev_start > dev)
diff --git a/include/asm-generic/bitops/le.h b/include/asm-generic/bitops/le.h
index f95c663a6a41..61731543c00e 100644
--- a/include/asm-generic/bitops/le.h
+++ b/include/asm-generic/bitops/le.h
@@ -54,6 +54,16 @@ static inline int test_bit_le(int nr, const void *addr)
         return test_bit(nr ^ BITOP_LE_SWIZZLE, addr);
 }
 
+static inline void set_bit_le(int nr, void *addr)
+{
+        set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline void clear_bit_le(int nr, void *addr)
+{
+        clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
 static inline void __set_bit_le(int nr, void *addr)
 {
         __set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
diff --git a/include/linux/audit.h b/include/linux/audit.h
index e7c836d961ea..2c83e5f7edb1 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -527,9 +527,18 @@ static inline void audit_ptrace(struct task_struct *t)
 extern unsigned int audit_serial(void);
 extern int auditsc_get_stamp(struct audit_context *ctx,
                               struct timespec *t, unsigned int *serial);
-extern int  audit_set_loginuid(kuid_t loginuid);
-#define audit_get_loginuid(t) ((t)->loginuid)
-#define audit_get_sessionid(t) ((t)->sessionid)
+extern int audit_set_loginuid(kuid_t loginuid);
+
+static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
+{
+        return tsk->loginuid;
+}
+
+static inline int audit_get_sessionid(struct task_struct *tsk)
+{
+        return tsk->sessionid;
+}
+
 extern void audit_log_task_context(struct audit_buffer *ab);
 extern void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk);
 extern void __audit_ipc_obj(struct kern_ipc_perm *ipcp);
@@ -626,38 +635,101 @@ static inline void audit_mmap_fd(int fd, int flags)
 extern int audit_n_rules;
 extern int audit_signals;
 #else /* CONFIG_AUDITSYSCALL */
-#define audit_alloc(t) ({ 0; })
-#define audit_free(t) do { ; } while (0)
-#define audit_syscall_entry(ta,a,b,c,d,e) do { ; } while (0)
-#define audit_syscall_exit(r) do { ; } while (0)
-#define audit_dummy_context() 1
-#define audit_getname(n) do { ; } while (0)
-#define audit_putname(n) do { ; } while (0)
-#define __audit_inode(n,d) do { ; } while (0)
-#define __audit_inode_child(i,p) do { ; } while (0)
-#define audit_inode(n,d) do { (void)(d); } while (0)
-#define audit_inode_child(i,p) do { ; } while (0)
-#define audit_core_dumps(i) do { ; } while (0)
-#define audit_seccomp(i,s,c) do { ; } while (0)
-#define auditsc_get_stamp(c,t,s) (0)
-#define audit_get_loginuid(t) (INVALID_UID)
-#define audit_get_sessionid(t) (-1)
-#define audit_log_task_context(b) do { ; } while (0)
-#define audit_log_task_info(b, t) do { ; } while (0)
-#define audit_ipc_obj(i) ((void)0)
-#define audit_ipc_set_perm(q,u,g,m) ((void)0)
-#define audit_bprm(p) ({ 0; })
-#define audit_socketcall(n,a) ((void)0)
-#define audit_fd_pair(n,a) ((void)0)
-#define audit_sockaddr(len, addr) ({ 0; })
-#define audit_mq_open(o,m,a) ((void)0)
-#define audit_mq_sendrecv(d,l,p,t) ((void)0)
-#define audit_mq_notify(d,n) ((void)0)
-#define audit_mq_getsetattr(d,s) ((void)0)
-#define audit_log_bprm_fcaps(b, ncr, ocr) ({ 0; })
-#define audit_log_capset(pid, ncr, ocr) ((void)0)
-#define audit_mmap_fd(fd, flags) ((void)0)
-#define audit_ptrace(t) ((void)0)
+static inline int audit_alloc(struct task_struct *task)
+{
+        return 0;
+}
+static inline void audit_free(struct task_struct *task)
+{ }
+static inline void audit_syscall_entry(int arch, int major, unsigned long a0,
+                                       unsigned long a1, unsigned long a2,
+                                       unsigned long a3)
+{ }
+static inline void audit_syscall_exit(void *pt_regs)
+{ }
+static inline int audit_dummy_context(void)
+{
+        return 1;
+}
+static inline void audit_getname(const char *name)
+{ }
+static inline void audit_putname(const char *name)
+{ }
+static inline void __audit_inode(const char *name, const struct dentry *dentry)
+{ }
+static inline void __audit_inode_child(const struct dentry *dentry,
+                                        const struct inode *parent)
+{ }
+static inline void audit_inode(const char *name, const struct dentry *dentry)
+{ }
+static inline void audit_inode_child(const struct dentry *dentry,
+                                     const struct inode *parent)
+{ }
+static inline void audit_core_dumps(long signr)
+{ }
+static inline void __audit_seccomp(unsigned long syscall, long signr, int code)
+{ }
+static inline void audit_seccomp(unsigned long syscall, long signr, int code)
+{ }
+static inline int auditsc_get_stamp(struct audit_context *ctx,
+                              struct timespec *t, unsigned int *serial)
+{
+        return 0;
+}
+static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
+{
+        return INVALID_UID;
+}
+static inline int audit_get_sessionid(struct task_struct *tsk)
+{
+        return -1;
+}
+static inline void audit_log_task_context(struct audit_buffer *ab)
+{ }
+static inline void audit_log_task_info(struct audit_buffer *ab,
+                                       struct task_struct *tsk)
+{ }
+static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp)
+{ }
+static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid,
+                                        gid_t gid, umode_t mode)
+{ }
+static inline int audit_bprm(struct linux_binprm *bprm)
+{
+        return 0;
+}
+static inline void audit_socketcall(int nargs, unsigned long *args)
+{ }
+static inline void audit_fd_pair(int fd1, int fd2)
+{ }
+static inline int audit_sockaddr(int len, void *addr)
+{
+        return 0;
+}
+static inline void audit_mq_open(int oflag, umode_t mode, struct mq_attr *attr)
+{ }
+static inline void audit_mq_sendrecv(mqd_t mqdes, size_t msg_len,
+                                     unsigned int msg_prio,
+                                     const struct timespec *abs_timeout)
+{ }
+static inline void audit_mq_notify(mqd_t mqdes,
+                                   const struct sigevent *notification)
+{ }
+static inline void audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)
+{ }
+static inline int audit_log_bprm_fcaps(struct linux_binprm *bprm,
+                                       const struct cred *new,
+                                       const struct cred *old)
+{
+        return 0;
+}
+static inline void audit_log_capset(pid_t pid, const struct cred *new,
+                                   const struct cred *old)
+{ }
+static inline void audit_mmap_fd(int fd, int flags)
+{ }
+static inline void audit_ptrace(struct task_struct *t)
+{ }
 #define audit_n_rules 0
 #define audit_signals 0
 #endif /* CONFIG_AUDITSYSCALL */
@@ -681,7 +753,6 @@ extern void		    audit_log_n_hex(struct audit_buffer *ab,
 extern void                 audit_log_n_string(struct audit_buffer *ab,
                                                const char *buf,
                                                size_t n);
-#define audit_log_string(a,b) audit_log_n_string(a, b, strlen(b));
 extern void                 audit_log_n_untrustedstring(struct audit_buffer *ab,
                                                         const char *string,
                                                         size_t n);
@@ -698,7 +769,8 @@ extern void		    audit_log_lost(const char *message);
 #ifdef CONFIG_SECURITY
 extern void                 audit_log_secctx(struct audit_buffer *ab, u32 secid);
 #else
-#define audit_log_secctx(b,s) do { ; } while (0)
+static inline void          audit_log_secctx(struct audit_buffer *ab, u32 secid)
+{ }
 #endif
 
 extern int                  audit_update_lsm_rules(void);
@@ -710,22 +782,50 @@ extern int  audit_receive_filter(int type, int pid, int seq,
                                 void *data, size_t datasz, kuid_t loginuid,
                                 u32 sessionid, u32 sid);
 extern int audit_enabled;
-#else
-#define audit_log(c,g,t,f,...) do { ; } while (0)
-#define audit_log_start(c,g,t) ({ NULL; })
-#define audit_log_vformat(b,f,a) do { ; } while (0)
-#define audit_log_format(b,f,...) do { ; } while (0)
-#define audit_log_end(b) do { ; } while (0)
-#define audit_log_n_hex(a,b,l) do { ; } while (0)
-#define audit_log_n_string(a,c,l) do { ; } while (0)
-#define audit_log_string(a,c) do { ; } while (0)
-#define audit_log_n_untrustedstring(a,n,s) do { ; } while (0)
-#define audit_log_untrustedstring(a,s) do { ; } while (0)
-#define audit_log_d_path(b, p, d) do { ; } while (0)
-#define audit_log_key(b, k) do { ; } while (0)
-#define audit_log_link_denied(o, l) do { ; } while (0)
-#define audit_log_secctx(b,s) do { ; } while (0)
+#else /* CONFIG_AUDIT */
+static inline __printf(4, 5)
+void audit_log(struct audit_context *ctx, gfp_t gfp_mask, int type,
+               const char *fmt, ...)
+{ }
+static inline struct audit_buffer *audit_log_start(struct audit_context *ctx,
+                                                   gfp_t gfp_mask, int type)
+{
+        return NULL;
+}
+static inline __printf(2, 3)
+void audit_log_format(struct audit_buffer *ab, const char *fmt, ...)
+{ }
+static inline void audit_log_end(struct audit_buffer *ab)
+{ }
+static inline void audit_log_n_hex(struct audit_buffer *ab,
+                                   const unsigned char *buf, size_t len)
+{ }
+static inline void audit_log_n_string(struct audit_buffer *ab,
+                                      const char *buf, size_t n)
+{ }
+static inline void  audit_log_n_untrustedstring(struct audit_buffer *ab,
+                                                const char *string, size_t n)
+{ }
+static inline void audit_log_untrustedstring(struct audit_buffer *ab,
+                                             const char *string)
+{ }
+static inline void audit_log_d_path(struct audit_buffer *ab,
+                                    const char *prefix,
+                                    const struct path *path)
+{ }
+static inline void audit_log_key(struct audit_buffer *ab, char *key)
+{ }
+static inline void audit_log_link_denied(const char *string,
+                                         const struct path *link)
+{ }
+static inline void audit_log_secctx(struct audit_buffer *ab, u32 secid)
+{ }
 #define audit_enabled 0
-#endif
+#endif /* CONFIG_AUDIT */
+static inline void audit_log_string(struct audit_buffer *ab, const char *buf)
+{
+        audit_log_n_string(ab, buf, strlen(buf));
+}
+
 #endif
 #endif
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 366422bc1633..37935c2d2e8f 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -72,7 +72,7 @@ struct linux_binprm {
 
 /* Function parameter for binfmt->coredump */
 struct coredump_params {
-        long signr;
+        siginfo_t *siginfo;
         struct pt_regs *regs;
         struct file *file;
         unsigned long limit;
@@ -132,7 +132,6 @@ extern int copy_strings_kernel(int argc, const char *const *argv,
                                struct linux_binprm *bprm);
 extern int prepare_bprm_creds(struct linux_binprm *bprm);
 extern void install_exec_creds(struct linux_binprm *bprm);
-extern void do_coredump(long signr, int exit_code, struct pt_regs *regs);
 extern void set_binfmt(struct linux_binfmt *new);
 extern void free_bprm(struct linux_binprm *);
 
diff --git a/include/linux/compat.h b/include/linux/compat.h
index fd4e29956d1c..3f53d002c7c5 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -160,11 +160,6 @@ struct compat_ustat {
         char                    f_fpack[6];
 };
 
-typedef union compat_sigval {
-        compat_int_t    sival_int;
-        compat_uptr_t   sival_ptr;
-} compat_sigval_t;
-
 #define COMPAT_SIGEV_PAD_SIZE   ((SIGEV_MAX_SIZE/sizeof(int)) - 3)
 
 typedef struct compat_sigevent {
diff --git a/include/linux/coredump.h b/include/linux/coredump.h
index ba4b85a6d9b8..1775eb8acc03 100644
--- a/include/linux/coredump.h
+++ b/include/linux/coredump.h
@@ -11,5 +11,10 @@
  */
 extern int dump_write(struct file *file, const void *addr, int nr);
 extern int dump_seek(struct file *file, loff_t off);
+#ifdef CONFIG_COREDUMP
+extern void do_coredump(siginfo_t *siginfo, struct pt_regs *regs);
+#else
+static inline void do_coredump(siginfo_t *siginfo, struct pt_regs *regs) {}
+#endif
 
 #endif /* _LINUX_COREDUMP_H */
diff --git a/include/linux/elf.h b/include/linux/elf.h
index 0a05051a8924..59ef40650e1e 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -372,6 +372,12 @@ typedef struct elf64_shdr {
 #define NT_PRPSINFO     3
 #define NT_TASKSTRUCT   4
 #define NT_AUXV         6
+/*
+ * Note to userspace developers: size of NT_SIGINFO note may increase
+ * in the future to accomodate more fields, don't assume it is fixed!
+ */
+#define NT_SIGINFO      0x53494749
+#define NT_FILE         0x46494c45
 #define NT_PRXFPREG     0x46e62b7f      /* copied from gdb5.1/include/elf/common.h */
 #define NT_PPC_VMX      0x100           /* PowerPC Altivec/VMX registers */
 #define NT_PPC_SPE      0x101           /* PowerPC SPE/EVR registers */
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index f4bb378ccf6a..41085d0f3955 100644
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -25,6 +25,7 @@
 #define EPOLL_CTL_ADD 1
 #define EPOLL_CTL_DEL 2
 #define EPOLL_CTL_MOD 3
+#define EPOLL_CTL_DISABLE 4
 
 /*
  * Request the handling of system wakeup events so as to prevent system suspends
diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
index 5e98eeb2af3b..dd7c569aacad 100644
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
@@ -29,6 +29,20 @@
 
 #ifndef __GENALLOC_H__
 #define __GENALLOC_H__
+/**
+ * Allocation callback function type definition
+ * @map: Pointer to bitmap
+ * @size: The bitmap size in bits
+ * @start: The bitnumber to start searching at
+ * @nr: The number of zeroed bits we're looking for
+ * @data: optional additional data used by @genpool_algo_t
+ */
+typedef unsigned long (*genpool_algo_t)(unsigned long *map,
+                        unsigned long size,
+                        unsigned long start,
+                        unsigned int nr,
+                        void *data);
+
 /*
  *  General purpose special memory pool descriptor.
  */
@@ -36,6 +50,9 @@ struct gen_pool {
         spinlock_t lock;
         struct list_head chunks;        /* list of chunks in this pool */
         int min_alloc_order;            /* minimum allocation order */
+
+        genpool_algo_t algo;            /* allocation function */
+        void *data;
 };
 
 /*
@@ -78,4 +95,14 @@ extern void gen_pool_for_each_chunk(struct gen_pool *,
         void (*)(struct gen_pool *, struct gen_pool_chunk *, void *), void *);
 extern size_t gen_pool_avail(struct gen_pool *);
 extern size_t gen_pool_size(struct gen_pool *);
+
+extern void gen_pool_set_algo(struct gen_pool *pool, genpool_algo_t algo,
+                void *data);
+
+extern unsigned long gen_pool_first_fit(unsigned long *map, unsigned long size,
+                unsigned long start, unsigned int nr, void *data);
+
+extern unsigned long gen_pool_best_fit(unsigned long *map, unsigned long size,
+                unsigned long start, unsigned int nr, void *data);
+
 #endif /* __GENALLOC_H__ */
diff --git a/include/linux/idr.h b/include/linux/idr.h
index 255491cf522e..87259a44c251 100644
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -38,15 +38,15 @@
 #define IDR_SIZE (1 << IDR_BITS)
 #define IDR_MASK ((1 << IDR_BITS)-1)
 
-#define MAX_ID_SHIFT (sizeof(int)*8 - 1)
-#define MAX_ID_BIT (1U << MAX_ID_SHIFT)
-#define MAX_ID_MASK (MAX_ID_BIT - 1)
+#define MAX_IDR_SHIFT (sizeof(int)*8 - 1)
+#define MAX_IDR_BIT (1U << MAX_IDR_SHIFT)
+#define MAX_IDR_MASK (MAX_IDR_BIT - 1)
 
 /* Leave the possibility of an incomplete final layer */
-#define MAX_LEVEL (MAX_ID_SHIFT + IDR_BITS - 1) / IDR_BITS
+#define MAX_IDR_LEVEL ((MAX_IDR_SHIFT + IDR_BITS - 1) / IDR_BITS)
 
 /* Number of id_layer structs to leave in free list */
-#define IDR_FREE_MAX MAX_LEVEL + MAX_LEVEL
+#define MAX_IDR_FREE (MAX_IDR_LEVEL * 2)
 
 struct idr_layer {
         unsigned long            bitmap; /* A zero bit means "space here" */
diff --git a/include/linux/init.h b/include/linux/init.h
index 5e664f671615..e59041e21df3 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -43,11 +43,22 @@
    discard it in modules) */
 #define __init          __section(.init.text) __cold notrace
 #define __initdata      __section(.init.data)
-#define __initconst     __section(.init.rodata)
+#define __initconst     __constsection(.init.rodata)
 #define __exitdata      __section(.exit.data)
 #define __exit_call     __used __section(.exitcall.exit)
 
 /*
+ * Some architecture have tool chains which do not handle rodata attributes
+ * correctly. For those disable special sections for const, so that other
+ * architectures can annotate correctly.
+ */
+#ifdef CONFIG_BROKEN_RODATA
+#define __constsection(x)
+#else
+#define __constsection(x) __section(x)
+#endif
+
+/*
  * modpost check for section mismatches during the kernel build.
  * A section mismatch happens when there are references from a
  * code or data section to an init section (both code or data).
@@ -66,7 +77,7 @@
  */
 #define __ref            __section(.ref.text) noinline
 #define __refdata        __section(.ref.data)
-#define __refconst       __section(.ref.rodata)
+#define __refconst       __constsection(.ref.rodata)
 
 /* compatibility defines */
 #define __init_refok     __ref
@@ -85,26 +96,26 @@
 /* Used for HOTPLUG */
 #define __devinit        __section(.devinit.text) __cold notrace
 #define __devinitdata    __section(.devinit.data)
-#define __devinitconst   __section(.devinit.rodata)
+#define __devinitconst   __constsection(.devinit.rodata)
 #define __devexit        __section(.devexit.text) __exitused __cold notrace
 #define __devexitdata    __section(.devexit.data)
-#define __devexitconst   __section(.devexit.rodata)
+#define __devexitconst   __constsection(.devexit.rodata)
 
 /* Used for HOTPLUG_CPU */
 #define __cpuinit        __section(.cpuinit.text) __cold notrace
 #define __cpuinitdata    __section(.cpuinit.data)
-#define __cpuinitconst   __section(.cpuinit.rodata)
+#define __cpuinitconst   __constsection(.cpuinit.rodata)
 #define __cpuexit        __section(.cpuexit.text) __exitused __cold notrace
 #define __cpuexitdata    __section(.cpuexit.data)
-#define __cpuexitconst   __section(.cpuexit.rodata)
+#define __cpuexitconst   __constsection(.cpuexit.rodata)
 
 /* Used for MEMORY_HOTPLUG */
 #define __meminit        __section(.meminit.text) __cold notrace
 #define __meminitdata    __section(.meminit.data)
-#define __meminitconst   __section(.meminit.rodata)
+#define __meminitconst   __constsection(.meminit.rodata)
 #define __memexit        __section(.memexit.text) __exitused __cold notrace
 #define __memexitdata    __section(.memexit.data)
-#define __memexitconst   __section(.memexit.rodata)
+#define __memexitconst   __constsection(.memexit.rodata)
 
 /* For assembly routines */
 #define __HEAD          .section        ".head.text","ax"
diff --git a/include/linux/mfd/rc5t583.h b/include/linux/mfd/rc5t583.h
index 3661c59aa1e9..36c242e52ef1 100644
--- a/include/linux/mfd/rc5t583.h
+++ b/include/linux/mfd/rc5t583.h
@@ -146,6 +146,28 @@
 #define RC5T583_GPIO_MON_IOIN   0xAB
 #define RC5T583_GPIO_GPOFUNC    0xAC
 
+/* RTC registers */
+#define RC5T583_RTC_SEC         0xE0
+#define RC5T583_RTC_MIN         0xE1
+#define RC5T583_RTC_HOUR        0xE2
+#define RC5T583_RTC_WDAY        0xE3
+#define RC5T583_RTC_DAY         0xE4
+#define RC5T583_RTC_MONTH       0xE5
+#define RC5T583_RTC_YEAR        0xE6
+#define RC5T583_RTC_ADJ         0xE7
+#define RC5T583_RTC_AW_MIN      0xE8
+#define RC5T583_RTC_AW_HOUR     0xE9
+#define RC5T583_RTC_AW_WEEK     0xEA
+#define RC5T583_RTC_AD_MIN      0xEB
+#define RC5T583_RTC_AD_HOUR     0xEC
+#define RC5T583_RTC_CTL1        0xED
+#define RC5T583_RTC_CTL2        0xEE
+#define RC5T583_RTC_AY_MIN      0xF0
+#define RC5T583_RTC_AY_HOUR     0xF1
+#define RC5T583_RTC_AY_DAY      0xF2
+#define RC5T583_RTC_AY_MONTH 0xF3
+#define RC5T583_RTC_AY_YEAR     0xF4
+
 /* RICOH_RC5T583 IRQ definitions */
 enum {
         RC5T583_IRQ_ONKEY,
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h
index ac772b36a1b1..02e894f3ff45 100644
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
@@ -132,6 +132,16 @@
  *
  */
 
+/* RTC_CTRL_REG bitfields */
+#define TPS65910_RTC_CTRL_STOP_RTC                      0x01 /*0=stop, 1=run */
+#define TPS65910_RTC_CTRL_GET_TIME                      0x40
+
+/* RTC_STATUS_REG bitfields */
+#define TPS65910_RTC_STATUS_ALARM               0x40
+
+/* RTC_INTERRUPTS_REG bitfields */
+#define TPS65910_RTC_INTERRUPTS_EVERY           0x03
+#define TPS65910_RTC_INTERRUPTS_IT_ALARM        0x08
 
 /*Register BCK1  (0x80) register.RegisterDescription */
 #define BCK1_BCKUP_MASK                                 0xFF
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index d146ca10c0f5..5c86e2b33e2d 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -27,13 +27,22 @@
 #define NBD_SET_SIZE_BLOCKS     _IO( 0xab, 7 )
 #define NBD_DISCONNECT  _IO( 0xab, 8 )
 #define NBD_SET_TIMEOUT _IO( 0xab, 9 )
+#define NBD_SET_FLAGS   _IO( 0xab, 10)
 
 enum {
         NBD_CMD_READ = 0,
         NBD_CMD_WRITE = 1,
-        NBD_CMD_DISC = 2
+        NBD_CMD_DISC = 2,
+        /* there is a gap here to match userspace */
+        NBD_CMD_TRIM = 4
 };
 
+/* values for flags field */
+#define NBD_FLAG_HAS_FLAGS    (1 << 0) /* nbd-server supports flags */
+#define NBD_FLAG_READ_ONLY    (1 << 1) /* device is read-only */
+/* there is a gap here to match userspace */
+#define NBD_FLAG_SEND_TRIM    (1 << 5) /* send trim/discard */
+
 #define nbd_cmd(req) ((req)->cmd[0])
 
 /* userspace doesn't need the nbd_device structure */
@@ -42,10 +51,6 @@ enum {
 #include <linux/wait.h>
 #include <linux/mutex.h>
 
-/* values for flags field */
-#define NBD_READ_ONLY 0x0001
-#define NBD_WRITE_NOCHK 0x0002
-
 struct request;
 
 struct nbd_device {
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 2b9f82c037c9..cc88172c7d9a 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -107,7 +107,7 @@ enum pcpu_fc {
 
         PCPU_FC_NR,
 };
-extern const char *pcpu_fc_names[PCPU_FC_NR];
+extern const char * const pcpu_fc_names[PCPU_FC_NR];
 
 extern enum pcpu_fc pcpu_chosen_fc;
 
diff --git a/include/linux/platform_data/lm3630_bl.h b/include/linux/platform_data/lm3630_bl.h
new file mode 100644
index 000000000000..9176dd3f2d63
--- /dev/null
+++ b/include/linux/platform_data/lm3630_bl.h
@@ -0,0 +1,57 @@
+/*
+* Simple driver for Texas Instruments LM3630 LED Flash driver chip
+* Copyright (C) 2012 Texas Instruments
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+*/
+
+#ifndef __LINUX_LM3630_H
+#define __LINUX_LM3630_H
+
+#define LM3630_NAME "lm3630_bl"
+
+enum lm3630_pwm_ctrl {
+        PWM_CTRL_DISABLE = 0,
+        PWM_CTRL_BANK_A,
+        PWM_CTRL_BANK_B,
+        PWM_CTRL_BANK_ALL,
+};
+
+enum lm3630_pwm_active {
+        PWM_ACTIVE_HIGH = 0,
+        PWM_ACTIVE_LOW,
+};
+
+enum lm3630_bank_a_ctrl {
+        BANK_A_CTRL_DISABLE = 0x0,
+        BANK_A_CTRL_LED1 = 0x4,
+        BANK_A_CTRL_LED2 = 0x1,
+        BANK_A_CTRL_ALL = 0x5,
+};
+
+enum lm3630_bank_b_ctrl {
+        BANK_B_CTRL_DISABLE = 0,
+        BANK_B_CTRL_LED2,
+};
+
+struct lm3630_platform_data {
+
+        /* maximum brightness */
+        int max_brt_led1;
+        int max_brt_led2;
+
+        /* initial on brightness */
+        int init_brt_led1;
+        int init_brt_led2;
+        enum lm3630_pwm_ctrl pwm_ctrl;
+        enum lm3630_pwm_active pwm_active;
+        enum lm3630_bank_a_ctrl bank_a_ctrl;
+        enum lm3630_bank_b_ctrl bank_b_ctrl;
+        unsigned int pwm_period;
+        void (*pwm_set_intensity) (int brightness, int max_brightness);
+};
+
+#endif /* __LINUX_LM3630_H */
diff --git a/include/linux/platform_data/lm3639_bl.h b/include/linux/platform_data/lm3639_bl.h
new file mode 100644
index 000000000000..5234cd5ed166
--- /dev/null
+++ b/include/linux/platform_data/lm3639_bl.h
@@ -0,0 +1,69 @@
+/*
+* Simple driver for Texas Instruments LM3630 LED Flash driver chip
+* Copyright (C) 2012 Texas Instruments
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+*/
+
+#ifndef __LINUX_LM3639_H
+#define __LINUX_LM3639_H
+
+#define LM3639_NAME "lm3639_bl"
+
+enum lm3639_pwm {
+        LM3639_PWM_DISABLE = 0x00,
+        LM3639_PWM_EN_ACTLOW = 0x48,
+        LM3639_PWM_EN_ACTHIGH = 0x40,
+};
+
+enum lm3639_strobe {
+        LM3639_STROBE_DISABLE = 0x00,
+        LM3639_STROBE_EN_ACTLOW = 0x10,
+        LM3639_STROBE_EN_ACTHIGH = 0x30,
+};
+
+enum lm3639_txpin {
+        LM3639_TXPIN_DISABLE = 0x00,
+        LM3639_TXPIN_EN_ACTLOW = 0x04,
+        LM3639_TXPIN_EN_ACTHIGH = 0x0C,
+};
+
+enum lm3639_fleds {
+        LM3639_FLED_DIASBLE_ALL = 0x00,
+        LM3639_FLED_EN_1 = 0x40,
+        LM3639_FLED_EN_2 = 0x20,
+        LM3639_FLED_EN_ALL = 0x60,
+};
+
+enum lm3639_bleds {
+        LM3639_BLED_DIASBLE_ALL = 0x00,
+        LM3639_BLED_EN_1 = 0x10,
+        LM3639_BLED_EN_2 = 0x08,
+        LM3639_BLED_EN_ALL = 0x18,
+};
+enum lm3639_bled_mode {
+        LM3639_BLED_MODE_EXPONETIAL = 0x00,
+        LM3639_BLED_MODE_LINEAR = 0x10,
+};
+
+struct lm3639_platform_data {
+        unsigned int max_brt_led;
+        unsigned int init_brt_led;
+
+        /* input pins */
+        enum lm3639_pwm pin_pwm;
+        enum lm3639_strobe pin_strobe;
+        enum lm3639_txpin pin_tx;
+
+        /* output pins */
+        enum lm3639_fleds fled_pins;
+        enum lm3639_bleds bled_pins;
+        enum lm3639_bled_mode bled_mode;
+
+        void (*pwm_set_intensity) (int brightness, int max_brightness);
+        int (*pwm_get_intensity) (void);
+};
+#endif /* __LINUX_LM3639_H */
diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h
index cc76f1f18f18..761f31752367 100644
--- a/include/linux/platform_data/lp855x.h
+++ b/include/linux/platform_data/lp855x.h
@@ -46,6 +46,8 @@
 #define LP8556_I2C_CONFIG       ((ENABLE_BL << BL_CTL_SHFT) | \
                                 (LP8556_I2C_ONLY << BRT_MODE_SHFT))
 #define LP8556_COMB2_CONFIG     (LP8556_COMBINED2 << BRT_MODE_SHFT)
+#define LP8556_FAST_CONFIG      BIT(7) /* use it if EPROMs should be maintained
+                                          when exiting the low power mode */
 
 enum lp855x_chip_id {
         LP8550,
diff --git a/include/linux/rio.h b/include/linux/rio.h
index a90ebadd9da0..d2dff22cf681 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -30,6 +30,7 @@
 #define RIO_MAX_MPORTS          8
 #define RIO_MAX_MPORT_RESOURCES 16
 #define RIO_MAX_DEV_RESOURCES   16
+#define RIO_MAX_MPORT_NAME      40
 
 #define RIO_GLOBAL_TABLE        0xff    /* Indicates access of a switch's
                                            global routing table if it
@@ -235,6 +236,7 @@ enum rio_phy_type {
  * @phys_efptr: RIO port extended features pointer
  * @name: Port name string
  * @priv: Master port private data
+ * @dma: DMA device associated with mport
  */
 struct rio_mport {
         struct list_head dbells;        /* list of doorbell events */
@@ -255,13 +257,21 @@ struct rio_mport {
                                  */
         enum rio_phy_type phy_type;     /* RapidIO phy type */
         u32 phys_efptr;
-        unsigned char name[40];
+        unsigned char name[RIO_MAX_MPORT_NAME];
         void *priv;             /* Master port private data */
 #ifdef CONFIG_RAPIDIO_DMA_ENGINE
         struct dma_device       dma;
 #endif
 };
 
+struct rio_id_table {
+        u16 start;      /* logical minimal id */
+        u16 next;       /* hint for find */
+        u32 max;        /* max number of IDs in table */
+        spinlock_t lock;
+        unsigned long *table;
+};
+
 /**
  * struct rio_net - RIO network info
  * @node: Node in global list of RIO networks
@@ -273,9 +283,11 @@ struct rio_mport {
 struct rio_net {
         struct list_head node;  /* node in list of networks */
         struct list_head devices;       /* list of devices in this net */
+        struct list_head switches;      /* list of switches in this net */
         struct list_head mports;        /* list of ports accessing net */
         struct rio_mport *hport;        /* primary port for accessing net */
         unsigned char id;       /* RIO network ID */
+        struct rio_id_table destid_table;  /* destID allocation table */
 };
 
 /* Definitions used by switch sysfs initialization callback */
@@ -299,6 +311,8 @@ struct rio_net {
  * @add_outb_message: Callback to add a message to an outbound mailbox queue.
  * @add_inb_buffer: Callback to add a buffer to an inbound mailbox queue.
  * @get_inb_message: Callback to get a message from an inbound mailbox queue.
+ * @map_inb: Callback to map RapidIO address region into local memory space.
+ * @unmap_inb: Callback to unmap RapidIO address region mapped with map_inb().
  */
 struct rio_ops {
         int (*lcread) (struct rio_mport *mport, int index, u32 offset, int len,
@@ -321,6 +335,9 @@ struct rio_ops {
                                  int mbox, void *buffer, size_t len);
         int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
         void *(*get_inb_message)(struct rio_mport *mport, int mbox);
+        int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
+                        u64 rstart, u32 size, u32 flags);
+        void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
 };
 
 #define RIO_RESOURCE_MEM        0x00000100
@@ -403,7 +420,7 @@ union rio_pw_msg {
 
 #ifdef CONFIG_RAPIDIO_DMA_ENGINE
 
-/**
+/*
  * enum rio_write_type - RIO write transaction types used in DMA transfers
  *
  * Note: RapidIO specification defines write (NWRITE) and
diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h
index 31ad146be316..b75c05920ab5 100644
--- a/include/linux/rio_drv.h
+++ b/include/linux/rio_drv.h
@@ -365,6 +365,11 @@ void rio_release_regions(struct rio_dev *);
 int rio_request_region(struct rio_dev *, int, char *);
 void rio_release_region(struct rio_dev *, int);
 
+/* Memory mapping functions */
+extern int rio_map_inb_region(struct rio_mport *mport, dma_addr_t local,
+                        u64 rbase, u32 size, u32 rflags);
+extern void rio_unmap_inb_region(struct rio_mport *mport, dma_addr_t lstart);
+
 /* Port-Write management */
 extern int rio_request_inb_pwrite(struct rio_dev *,
                         int (*)(struct rio_dev *, union rio_pw_msg*, int));
diff --git a/include/linux/rtc-ds2404.h b/include/linux/rtc-ds2404.h
new file mode 100644
index 000000000000..22c53825528f
--- /dev/null
+++ b/include/linux/rtc-ds2404.h
@@ -0,0 +1,20 @@
+/*
+ * ds2404.h - platform data structure for the DS2404 RTC.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2012 Sven Schnelle <svens@stackframe.org>
+ */
+
+#ifndef __LINUX_DS2404_H
+#define __LINUX_DS2404_H
+
+struct ds2404_platform_data {
+
+        unsigned int gpio_rst;
+        unsigned int gpio_clk;
+        unsigned int gpio_dq;
+};
+#endif
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index f071b3922c67..20ec4d3bed73 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -276,7 +276,7 @@ static inline bool is_leap_year(unsigned int year)
         return (!(year % 4) && (year % 100)) || !(year % 400);
 }
 
-#ifdef CONFIG_RTC_HCTOSYS
+#ifdef CONFIG_RTC_HCTOSYS_DEVICE
 extern int rtc_hctosys_ret;
 #else
 #define rtc_hctosys_ret -ENODEV
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9d51e260bde0..9c5612f0374b 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -405,7 +405,6 @@ static inline void arch_pick_mmap_layout(struct mm_struct *mm) {}
 
 extern void set_dumpable(struct mm_struct *mm, int value);
 extern int get_dumpable(struct mm_struct *mm);
-extern int __get_dumpable(unsigned long mm_flags);
 
 /* get/set_dumpable() values */
 #define SUID_DUMPABLE_DISABLED  0
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 4faf6612ecac..95e646641184 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -257,10 +257,12 @@ static inline struct net *read_pnet(struct net * const *pnet)
 #define __net_init
 #define __net_exit
 #define __net_initdata
+#define __net_initconst
 #else
 #define __net_init      __init
 #define __net_exit      __exit_refok
 #define __net_initdata  __initdata
+#define __net_initconst __initconst
 #endif
 
 struct pernet_operations {
diff --git a/init/Kconfig b/init/Kconfig
index cb003a3c9122..ed6334dd5e71 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1199,6 +1199,7 @@ config BUG
           Just say Y.
 
 config ELF_CORE
+        depends on COREDUMP
         default y
         bool "Enable ELF core dumps" if EXPERT
         help
@@ -1581,4 +1582,10 @@ config PADATA
         depends on SMP
         bool
 
+# Can be selected by architectures with broken toolchains
+# that get confused by correct const<->read_only section
+# mappings
+config BROKEN_RODATA
+        bool
+
 source "kernel/Kconfig.locks"
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 0668d58d6413..5e4bd7864c5d 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -21,7 +21,6 @@
 #include <linux/hardirq.h>
 #include <linux/elf.h>
 #include <linux/elfcore.h>
-#include <generated/utsrelease.h>
 #include <linux/utsname.h>
 #include <linux/numa.h>
 #include <linux/suspend.h>
diff --git a/kernel/resource.c b/kernel/resource.c
index 34d45886ee84..73f35d4b30b9 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -763,6 +763,7 @@ static void __init __reserve_region_with_split(struct resource *root,
         struct resource *parent = root;
         struct resource *conflict;
         struct resource *res = kzalloc(sizeof(*res), GFP_ATOMIC);
+        struct resource *next_res = NULL;
 
         if (!res)
                 return;
@@ -772,21 +773,46 @@ static void __init __reserve_region_with_split(struct resource *root,
         res->end = end;
         res->flags = IORESOURCE_BUSY;
 
-        conflict = __request_resource(parent, res);
-        if (!conflict)
-                return;
+        while (1) {
 
-        /* failed, split and try again */
-        kfree(res);
+                conflict = __request_resource(parent, res);
+                if (!conflict) {
+                        if (!next_res)
+                                break;
+                        res = next_res;
+                        next_res = NULL;
+                        continue;
+                }
 
-        /* conflict covered whole area */
-        if (conflict->start <= start && conflict->end >= end)
-                return;
+                /* conflict covered whole area */
+                if (conflict->start <= res->start &&
+                                conflict->end >= res->end) {
+                        kfree(res);
+                        WARN_ON(next_res);
+                        break;
+                }
+
+                /* failed, split and try again */
+                if (conflict->start > res->start) {
+                        end = res->end;
+                        res->end = conflict->start - 1;
+                        if (conflict->end < end) {
+                                next_res = kzalloc(sizeof(*next_res),
+                                                GFP_ATOMIC);
+                                if (!next_res) {
+                                        kfree(res);
+                                        break;
+                                }
+                                next_res->name = name;
+                                next_res->start = conflict->end + 1;
+                                next_res->end = end;
+                                next_res->flags = IORESOURCE_BUSY;
+                        }
+                } else {
+                        res->start = conflict->end + 1;
+                }
+        }
 
-        if (conflict->start > start)
-                __reserve_region_with_split(root, start, conflict->start-1, name);
-        if (conflict->end < end)
-                __reserve_region_with_split(root, conflict->end+1, end, name);
 }
 
 void __init reserve_region_with_split(struct resource *root,
diff --git a/kernel/signal.c b/kernel/signal.c
index 2c681f11b7d2..0af8868525d6 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -17,6 +17,7 @@
 #include <linux/fs.h>
 #include <linux/tty.h>
 #include <linux/binfmts.h>
+#include <linux/coredump.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/ptrace.h>
@@ -2359,7 +2360,7 @@ relock:
                          * first and our do_group_exit call below will use
                          * that value and ignore the one we pass it.
                          */
-                        do_coredump(info->si_signo, info->si_signo, regs);
+                        do_coredump(info, regs);
                 }
 
                 /*
diff --git a/kernel/sys.c b/kernel/sys.c
index f9492284e5d2..c5cb5b99cb81 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -368,6 +368,7 @@ EXPORT_SYMBOL(unregister_reboot_notifier);
 void kernel_restart(char *cmd)
 {
         kernel_restart_prepare(cmd);
+        disable_nonboot_cpus();
         if (!cmd)
                 printk(KERN_EMERG "Restarting system.\n");
         else
@@ -2204,7 +2205,7 @@ static int __orderly_poweroff(void)
                 return -ENOMEM;
         }
 
-        ret = call_usermodehelper_fns(argv[0], argv, envp, UMH_NO_WAIT,
+        ret = call_usermodehelper_fns(argv[0], argv, envp, UMH_WAIT_EXEC,
                                       NULL, argv_cleanup, NULL);
         if (ret == -ENOMEM)
                 argv_free(argv);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 84c76a34e41c..c2a2f8084bad 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -97,10 +97,12 @@
 extern int sysctl_overcommit_memory;
 extern int sysctl_overcommit_ratio;
 extern int max_threads;
-extern int core_uses_pid;
 extern int suid_dumpable;
+#ifdef CONFIG_COREDUMP
+extern int core_uses_pid;
 extern char core_pattern[];
 extern unsigned int core_pipe_limit;
+#endif
 extern int pid_max;
 extern int min_free_kbytes;
 extern int pid_max_min, pid_max_max;
@@ -177,8 +179,10 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
 
 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
                 void __user *buffer, size_t *lenp, loff_t *ppos);
+#ifdef CONFIG_COREDUMP
 static int proc_dostring_coredump(struct ctl_table *table, int write,
                 void __user *buffer, size_t *lenp, loff_t *ppos);
+#endif
 
 #ifdef CONFIG_MAGIC_SYSRQ
 /* Note: sysrq code uses it's own private copy */
@@ -404,6 +408,7 @@ static struct ctl_table kern_table[] = {
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
+#ifdef CONFIG_COREDUMP
         {
                 .procname       = "core_uses_pid",
                 .data           = &core_uses_pid,
@@ -425,6 +430,7 @@ static struct ctl_table kern_table[] = {
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
+#endif
 #ifdef CONFIG_PROC_SYSCTL
         {
                 .procname       = "tainted",
@@ -2036,12 +2042,14 @@ int proc_dointvec_minmax(struct ctl_table *table, int write,
 
 static void validate_coredump_safety(void)
 {
+#ifdef CONFIG_COREDUMP
         if (suid_dumpable == SUID_DUMPABLE_SAFE &&
             core_pattern[0] != '/' && core_pattern[0] != '|') {
                 printk(KERN_WARNING "Unsafe core_pattern used with "\
                         "suid_dumpable=2. Pipe handler or fully qualified "\
                         "core dump path required.\n");
         }
+#endif
 }
 
 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
@@ -2053,6 +2061,7 @@ static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
         return error;
 }
 
+#ifdef CONFIG_COREDUMP
 static int proc_dostring_coredump(struct ctl_table *table, int write,
                   void __user *buffer, size_t *lenp, loff_t *ppos)
 {
@@ -2061,6 +2070,7 @@ static int proc_dostring_coredump(struct ctl_table *table, int write,
                 validate_coredump_safety();
         return error;
 }
+#endif
 
 static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int write,
                                      void __user *buffer,
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index 610f0838d555..145bb4d3bd4d 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -445,6 +445,7 @@ static int cgroupstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
         na = nla_reserve(rep_skb, CGROUPSTATS_TYPE_CGROUP_STATS,
                                 sizeof(struct cgroupstats));
         if (na == NULL) {
+                nlmsg_free(rep_skb);
                 rc = -EMSGSIZE;
                 goto err;
         }
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 35c4565ee8fa..7fba3a98967f 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -196,12 +196,13 @@ config LOCKUP_DETECTOR
           thresholds can be controlled through the sysctl watchdog_thresh.
 
 config HARDLOCKUP_DETECTOR
-        def_bool LOCKUP_DETECTOR && PERF_EVENTS && HAVE_PERF_EVENTS_NMI && \
-                 !HAVE_NMI_WATCHDOG
+        def_bool y
+        depends on LOCKUP_DETECTOR && !HAVE_NMI_WATCHDOG
+        depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI
 
 config BOOTPARAM_HARDLOCKUP_PANIC
         bool "Panic (Reboot) On Hard Lockups"
-        depends on LOCKUP_DETECTOR
+        depends on HARDLOCKUP_DETECTOR
         help
           Say Y here to enable the kernel to panic on "hard lockups",
           which are bugs that cause the kernel to loop in kernel
@@ -212,7 +213,7 @@ config BOOTPARAM_HARDLOCKUP_PANIC
 
 config BOOTPARAM_HARDLOCKUP_PANIC_VALUE
         int
-        depends on LOCKUP_DETECTOR
+        depends on HARDLOCKUP_DETECTOR
         range 0 1
         default 0 if !BOOTPARAM_HARDLOCKUP_PANIC
         default 1 if BOOTPARAM_HARDLOCKUP_PANIC
diff --git a/lib/crc32.c b/lib/crc32.c
index 61774b8db4de..072fbd8234d5 100644
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -188,11 +188,13 @@ u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)
 #else
 u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
 {
-        return crc32_le_generic(crc, p, len, crc32table_le, CRCPOLY_LE);
+        return crc32_le_generic(crc, p, len,
+                        (const u32 (*)[256])crc32table_le, CRCPOLY_LE);
 }
 u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)
 {
-        return crc32_le_generic(crc, p, len, crc32ctable_le, CRC32C_POLY_LE);
+        return crc32_le_generic(crc, p, len,
+                        (const u32 (*)[256])crc32ctable_le, CRC32C_POLY_LE);
 }
 #endif
 EXPORT_SYMBOL(crc32_le);
@@ -253,7 +255,8 @@ u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
 #else
 u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
 {
-        return crc32_be_generic(crc, p, len, crc32table_be, CRCPOLY_BE);
+        return crc32_be_generic(crc, p, len,
+                        (const u32 (*)[256])crc32table_be, CRCPOLY_BE);
 }
 #endif
 EXPORT_SYMBOL(crc32_be);
diff --git a/lib/decompress.c b/lib/decompress.c
index 3d766b7f60ab..31a804277282 100644
--- a/lib/decompress.c
+++ b/lib/decompress.c
@@ -14,6 +14,7 @@
 
 #include <linux/types.h>
 #include <linux/string.h>
+#include <linux/init.h>
 
 #ifndef CONFIG_DECOMPRESS_GZIP
 # define gunzip NULL
@@ -31,11 +32,13 @@
 # define unlzo NULL
 #endif
 
-static const struct compress_format {
+struct compress_format {
         unsigned char magic[2];
         const char *name;
         decompress_fn decompressor;
-} compressed_formats[] = {
+};
+
+static const struct compress_format compressed_formats[] __initdata = {
         { {037, 0213}, "gzip", gunzip },
         { {037, 0236}, "gzip", gunzip },
         { {0x42, 0x5a}, "bzip2", bunzip2 },
@@ -45,7 +48,7 @@ static const struct compress_format {
         { {0, 0}, NULL, NULL }
 };
 
-decompress_fn decompress_method(const unsigned char *inbuf, int len,
+decompress_fn __init decompress_method(const unsigned char *inbuf, int len,
                                 const char **name)
 {
         const struct compress_format *cf;
diff --git a/lib/gcd.c b/lib/gcd.c
index cce4f3cd14b3..3657f129d7b8 100644
--- a/lib/gcd.c
+++ b/lib/gcd.c
@@ -9,6 +9,9 @@ unsigned long gcd(unsigned long a, unsigned long b)
 
         if (a < b)
                 swap(a, b);
+
+        if (!b)
+                return a;
         while ((r = a % b) != 0) {
                 a = b;
                 b = r;
diff --git a/lib/gen_crc32table.c b/lib/gen_crc32table.c
index 8f8d5439e2d9..71fcfcd96410 100644
--- a/lib/gen_crc32table.c
+++ b/lib/gen_crc32table.c
@@ -109,7 +109,7 @@ int main(int argc, char** argv)
 
         if (CRC_LE_BITS > 1) {
                 crc32init_le();
-                printf("static const u32 __cacheline_aligned "
+                printf("static u32 __cacheline_aligned "
                        "crc32table_le[%d][%d] = {",
                        LE_TABLE_ROWS, LE_TABLE_SIZE);
                 output_table(crc32table_le, LE_TABLE_ROWS,
@@ -119,7 +119,7 @@ int main(int argc, char** argv)
 
         if (CRC_BE_BITS > 1) {
                 crc32init_be();
-                printf("static const u32 __cacheline_aligned "
+                printf("static u32 __cacheline_aligned "
                        "crc32table_be[%d][%d] = {",
                        BE_TABLE_ROWS, BE_TABLE_SIZE);
                 output_table(crc32table_be, LE_TABLE_ROWS,
@@ -128,7 +128,7 @@ int main(int argc, char** argv)
         }
         if (CRC_LE_BITS > 1) {
                 crc32cinit_le();
-                printf("static const u32 __cacheline_aligned "
+                printf("static u32 __cacheline_aligned "
                        "crc32ctable_le[%d][%d] = {",
                        LE_TABLE_ROWS, LE_TABLE_SIZE);
                 output_table(crc32ctable_le, LE_TABLE_ROWS,
diff --git a/lib/genalloc.c b/lib/genalloc.c
index 6bc04aab6ec7..ca208a92628c 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -152,6 +152,8 @@ struct gen_pool *gen_pool_create(int min_alloc_order, int nid)
                 spin_lock_init(&pool->lock);
                 INIT_LIST_HEAD(&pool->chunks);
                 pool->min_alloc_order = min_alloc_order;
+                pool->algo = gen_pool_first_fit;
+                pool->data = NULL;
         }
         return pool;
 }
@@ -255,8 +257,9 @@ EXPORT_SYMBOL(gen_pool_destroy);
  * @size: number of bytes to allocate from the pool
  *
  * Allocate the requested number of bytes from the specified pool.
- * Uses a first-fit algorithm. Can not be used in NMI handler on
- * architectures without NMI-safe cmpxchg implementation.
+ * Uses the pool allocation function (with first-fit algorithm by default).
+ * Can not be used in NMI handler on architectures without
+ * NMI-safe cmpxchg implementation.
  */
 unsigned long gen_pool_alloc(struct gen_pool *pool, size_t size)
 {
@@ -280,8 +283,8 @@ unsigned long gen_pool_alloc(struct gen_pool *pool, size_t size)
 
                 end_bit = (chunk->end_addr - chunk->start_addr) >> order;
 retry:
-                start_bit = bitmap_find_next_zero_area(chunk->bits, end_bit,
-                                                       start_bit, nbits, 0);
+                start_bit = pool->algo(chunk->bits, end_bit, start_bit, nbits,
+                                pool->data);
                 if (start_bit >= end_bit)
                         continue;
                 remain = bitmap_set_ll(chunk->bits, start_bit, nbits);
@@ -400,3 +403,80 @@ size_t gen_pool_size(struct gen_pool *pool)
         return size;
 }
 EXPORT_SYMBOL_GPL(gen_pool_size);
+
+/**
+ * gen_pool_set_algo - set the allocation algorithm
+ * @pool: pool to change allocation algorithm
+ * @algo: custom algorithm function
+ * @data: additional data used by @algo
+ *
+ * Call @algo for each memory allocation in the pool.
+ * If @algo is NULL use gen_pool_first_fit as default
+ * memory allocation function.
+ */
+void gen_pool_set_algo(struct gen_pool *pool, genpool_algo_t algo, void *data)
+{
+        rcu_read_lock();
+
+        pool->algo = algo;
+        if (!pool->algo)
+                pool->algo = gen_pool_first_fit;
+
+        pool->data = data;
+
+        rcu_read_unlock();
+}
+EXPORT_SYMBOL(gen_pool_set_algo);
+
+/**
+ * gen_pool_first_fit - find the first available region
+ * of memory matching the size requirement (no alignment constraint)
+ * @map: The address to base the search on
+ * @size: The bitmap size in bits
+ * @start: The bitnumber to start searching at
+ * @nr: The number of zeroed bits we're looking for
+ * @data: additional data - unused
+ */
+unsigned long gen_pool_first_fit(unsigned long *map, unsigned long size,
+                unsigned long start, unsigned int nr, void *data)
+{
+        return bitmap_find_next_zero_area(map, size, start, nr, 0);
+}
+EXPORT_SYMBOL(gen_pool_first_fit);
+
+/**
+ * gen_pool_best_fit - find the best fitting region of memory
+ * macthing the size requirement (no alignment constraint)
+ * @map: The address to base the search on
+ * @size: The bitmap size in bits
+ * @start: The bitnumber to start searching at
+ * @nr: The number of zeroed bits we're looking for
+ * @data: additional data - unused
+ *
+ * Iterate over the bitmap to find the smallest free region
+ * which we can allocate the memory.
+ */
+unsigned long gen_pool_best_fit(unsigned long *map, unsigned long size,
+                unsigned long start, unsigned int nr, void *data)
+{
+        unsigned long start_bit = size;
+        unsigned long len = size + 1;
+        unsigned long index;
+
+        index = bitmap_find_next_zero_area(map, size, start, nr, 0);
+
+        while (index < size) {
+                int next_bit = find_next_bit(map, size, index + nr);
+                if ((next_bit - index) < len) {
+                        len = next_bit - index;
+                        start_bit = index;
+                        if (len == nr)
+                                return start_bit;
+                }
+                index = bitmap_find_next_zero_area(map, size,
+                                                   next_bit + 1, nr, 0);
+        }
+
+        return start_bit;
+}
+EXPORT_SYMBOL(gen_pool_best_fit);
diff --git a/lib/idr.c b/lib/idr.c
index 4046e29c0a99..648239079dd2 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -20,7 +20,7 @@
  * that id to this code and it returns your pointer.
 
  * You can release ids at any time. When all ids are released, most of
- * the memory is returned (we keep IDR_FREE_MAX) in a local pool so we
+ * the memory is returned (we keep MAX_IDR_FREE) in a local pool so we
  * don't need to go to the memory "store" during an id allocate, just
  * so you don't need to be too concerned about locking and conflicts
  * with the slab allocator.
@@ -122,7 +122,7 @@ static void idr_mark_full(struct idr_layer **pa, int id)
  */
 int idr_pre_get(struct idr *idp, gfp_t gfp_mask)
 {
-        while (idp->id_free_cnt < IDR_FREE_MAX) {
+        while (idp->id_free_cnt < MAX_IDR_FREE) {
                 struct idr_layer *new;
                 new = kmem_cache_zalloc(idr_layer_cache, gfp_mask);
                 if (new == NULL)
@@ -179,7 +179,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
                         sh = IDR_BITS*l;
                         id = ((id >> sh) ^ n ^ m) << sh;
                 }
-                if ((id >= MAX_ID_BIT) || (id < 0))
+                if ((id >= MAX_IDR_BIT) || (id < 0))
                         return IDR_NOMORE_SPACE;
                 if (l == 0)
                         break;
@@ -223,7 +223,7 @@ build_up:
          * Add a new layer to the top of the tree if the requested
          * id is larger than the currently allocated space.
          */
-        while ((layers < (MAX_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) {
+        while ((layers < (MAX_IDR_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) {
                 layers++;
                 if (!p->count) {
                         /* special case: if the tree is currently empty,
@@ -265,7 +265,7 @@ build_up:
 
 static int idr_get_new_above_int(struct idr *idp, void *ptr, int starting_id)
 {
-        struct idr_layer *pa[MAX_LEVEL];
+        struct idr_layer *pa[MAX_IDR_LEVEL];
         int id;
 
         id = idr_get_empty_slot(idp, starting_id, pa);
@@ -357,7 +357,7 @@ static void idr_remove_warning(int id)
 static void sub_remove(struct idr *idp, int shift, int id)
 {
         struct idr_layer *p = idp->top;
-        struct idr_layer **pa[MAX_LEVEL];
+        struct idr_layer **pa[MAX_IDR_LEVEL];
         struct idr_layer ***paa = &pa[0];
         struct idr_layer *to_free;
         int n;
@@ -402,7 +402,7 @@ void idr_remove(struct idr *idp, int id)
         struct idr_layer *to_free;
 
         /* Mask off upper bits we don't use for the search. */
-        id &= MAX_ID_MASK;
+        id &= MAX_IDR_MASK;
 
         sub_remove(idp, (idp->layers - 1) * IDR_BITS, id);
         if (idp->top && idp->top->count == 1 && (idp->layers > 1) &&
@@ -420,7 +420,7 @@ void idr_remove(struct idr *idp, int id)
                 to_free->bitmap = to_free->count = 0;
                 free_layer(to_free);
         }
-        while (idp->id_free_cnt >= IDR_FREE_MAX) {
+        while (idp->id_free_cnt >= MAX_IDR_FREE) {
                 p = get_from_free_list(idp);
                 /*
                  * Note: we don't call the rcu callback here, since the only
@@ -451,7 +451,7 @@ void idr_remove_all(struct idr *idp)
         int n, id, max;
         int bt_mask;
         struct idr_layer *p;
-        struct idr_layer *pa[MAX_LEVEL];
+        struct idr_layer *pa[MAX_IDR_LEVEL];
         struct idr_layer **paa = &pa[0];
 
         n = idp->layers * IDR_BITS;
@@ -517,7 +517,7 @@ void *idr_find(struct idr *idp, int id)
         n = (p->layer+1) * IDR_BITS;
 
         /* Mask off upper bits we don't use for the search. */
-        id &= MAX_ID_MASK;
+        id &= MAX_IDR_MASK;
 
         if (id >= (1 << n))
                 return NULL;
@@ -555,7 +555,7 @@ int idr_for_each(struct idr *idp,
 {
         int n, id, max, error = 0;
         struct idr_layer *p;
-        struct idr_layer *pa[MAX_LEVEL];
+        struct idr_layer *pa[MAX_IDR_LEVEL];
         struct idr_layer **paa = &pa[0];
 
         n = idp->layers * IDR_BITS;
@@ -601,7 +601,7 @@ EXPORT_SYMBOL(idr_for_each);
  */
 void *idr_get_next(struct idr *idp, int *nextidp)
 {
-        struct idr_layer *p, *pa[MAX_LEVEL];
+        struct idr_layer *p, *pa[MAX_IDR_LEVEL];
         struct idr_layer **paa = &pa[0];
         int id = *nextidp;
         int n, max;
@@ -659,7 +659,7 @@ void *idr_replace(struct idr *idp, void *ptr, int id)
 
         n = (p->layer+1) * IDR_BITS;
 
-        id &= MAX_ID_MASK;
+        id &= MAX_IDR_MASK;
 
         if (id >= (1 << n))
                 return ERR_PTR(-EINVAL);
@@ -780,7 +780,7 @@ EXPORT_SYMBOL(ida_pre_get);
  */
 int ida_get_new_above(struct ida *ida, int starting_id, int *p_id)
 {
-        struct idr_layer *pa[MAX_LEVEL];
+        struct idr_layer *pa[MAX_IDR_LEVEL];
         struct ida_bitmap *bitmap;
         unsigned long flags;
         int idr_id = starting_id / IDA_BITMAP_BITS;
@@ -793,7 +793,7 @@ int ida_get_new_above(struct ida *ida, int starting_id, int *p_id)
         if (t < 0)
                 return _idr_rc_to_errno(t);
 
-        if (t * IDA_BITMAP_BITS >= MAX_ID_BIT)
+        if (t * IDA_BITMAP_BITS >= MAX_IDR_BIT)
                 return -ENOSPC;
 
         if (t != idr_id)
@@ -827,7 +827,7 @@ int ida_get_new_above(struct ida *ida, int starting_id, int *p_id)
         }
 
         id = idr_id * IDA_BITMAP_BITS + t;
-        if (id >= MAX_ID_BIT)
+        if (id >= MAX_IDR_BIT)
                 return -ENOSPC;
 
         __set_bit(t, bitmap->bitmap);
diff --git a/lib/parser.c b/lib/parser.c
index c43410084838..52cfa69f73df 100644
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -122,13 +122,14 @@ int match_token(char *s, const match_table_t table, substring_t args[])
  *
  * Description: Given a &substring_t and a base, attempts to parse the substring
  * as a number in that base. On success, sets @result to the integer represented
- * by the string and returns 0. Returns either -ENOMEM or -EINVAL on failure.
+ * by the string and returns 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure.
  */
 static int match_number(substring_t *s, int *result, int base)
 {
         char *endp;
         char *buf;
         int ret;
+        long val;
         size_t len = s->to - s->from;
 
         buf = kmalloc(len + 1, GFP_KERNEL);
@@ -136,10 +137,15 @@ static int match_number(substring_t *s, int *result, int base)
                 return -ENOMEM;
         memcpy(buf, s->from, len);
         buf[len] = '\0';
-        *result = simple_strtol(buf, &endp, base);
+
         ret = 0;
+        val = simple_strtol(buf, &endp, base);
         if (endp == buf)
                 ret = -EINVAL;
+        else if (val < (long)INT_MIN || val > (long)INT_MAX)
+                ret = -ERANGE;
+        else
+                *result = (int) val;
         kfree(buf);
         return ret;
 }
diff --git a/lib/plist.c b/lib/plist.c
index 6ab0e521c48b..1ebc95f7a46f 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -175,7 +175,7 @@ static int  __init plist_test(void)
         int nr_expect = 0, i, loop;
         unsigned int r = local_clock();
 
-        printk(KERN_INFO "start plist test\n");
+        pr_debug("start plist test\n");
         plist_head_init(&test_head);
         for (i = 0; i < ARRAY_SIZE(test_node); i++)
                 plist_node_init(test_node + i, 0);
@@ -203,7 +203,7 @@ static int  __init plist_test(void)
                 plist_test_check(nr_expect);
         }
 
-        printk(KERN_INFO "end plist test\n");
+        pr_debug("end plist test\n");
         return 0;
 }
 
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index fadae774a20c..e76d85cf3175 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -404,14 +404,13 @@ EXPORT_SYMBOL(sg_miter_start);
  * @miter: sg mapping iter to proceed
  *
  * Description:
- *   Proceeds @miter@ to the next mapping.  @miter@ should have been
- *   started using sg_miter_start().  On successful return,
- *   @miter@->page, @miter@->addr and @miter@->length point to the
- *   current mapping.
+ *   Proceeds @miter to the next mapping.  @miter should have been started
+ *   using sg_miter_start().  On successful return, @miter->page,
+ *   @miter->addr and @miter->length point to the current mapping.
  *
  * Context:
- *   IRQ disabled if SG_MITER_ATOMIC.  IRQ must stay disabled till
- *   @miter@ is stopped.  May sleep if !SG_MITER_ATOMIC.
+ *   Preemption disabled if SG_MITER_ATOMIC.  Preemption must stay disabled
+ *   till @miter is stopped.  May sleep if !SG_MITER_ATOMIC.
  *
  * Returns:
  *   true if @miter contains the next mapping.  false if end of sg
@@ -465,7 +464,8 @@ EXPORT_SYMBOL(sg_miter_next);
  *   resources (kmap) need to be released during iteration.
  *
  * Context:
- *   IRQ disabled if the SG_MITER_ATOMIC is set.  Don't care otherwise.
+ *   Preemption disabled if the SG_MITER_ATOMIC is set.  Don't care
+ *   otherwise.
  */
 void sg_miter_stop(struct sg_mapping_iter *miter)
 {
@@ -479,7 +479,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
                         flush_kernel_dcache_page(miter->page);
 
                 if (miter->__flags & SG_MITER_ATOMIC) {
-                        WARN_ON(!irqs_disabled());
+                        WARN_ON_ONCE(preemptible());
                         kunmap_atomic(miter->addr);
                 } else
                         kunmap(miter->page);
diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index eb10578ae055..0374a596cffa 100644
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -107,23 +107,27 @@ static void __spin_lock_debug(raw_spinlock_t *lock)
 {
         u64 i;
         u64 loops = loops_per_jiffy * HZ;
-        int print_once = 1;
 
-        for (;;) {
-                for (i = 0; i < loops; i++) {
-                        if (arch_spin_trylock(&lock->raw_lock))
-                                return;
-                        __delay(1);
-                }
-                /* lockup suspected: */
-                if (print_once) {
-                        print_once = 0;
-                        spin_dump(lock, "lockup suspected");
+        for (i = 0; i < loops; i++) {
+                if (arch_spin_trylock(&lock->raw_lock))
+                        return;
+                __delay(1);
+        }
+        /* lockup suspected: */
+        spin_dump(lock, "lockup suspected");
 #ifdef CONFIG_SMP
-                        trigger_all_cpu_backtrace();
+        trigger_all_cpu_backtrace();
 #endif
-                }
-        }
+
+        /*
+         * The trylock above was causing a livelock.  Give the lower level arch
+         * specific lock code a chance to acquire the lock. We have already
+         * printed a warning/backtrace at this point. The non-debug arch
+         * specific code might actually succeed in acquiring the lock.  If it is
+         * not successful, the end-result is the same - there is no forward
+         * progress.
+         */
+        arch_spin_lock(&lock->raw_lock);
 }
 
 void do_raw_spin_lock(raw_spinlock_t *lock)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 0e337541f005..39c99fea7c03 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -174,35 +174,25 @@ char *put_dec_trunc8(char *buf, unsigned r)
         unsigned q;
 
         /* Copy of previous function's body with added early returns */
-        q      = (r * (uint64_t)0x1999999a) >> 32;
-        *buf++ = (r - 10 * q) + '0'; /* 2 */
-        if (q == 0)
-                return buf;
-        r      = (q * (uint64_t)0x1999999a) >> 32;
-        *buf++ = (q - 10 * r) + '0'; /* 3 */
-        if (r == 0)
-                return buf;
-        q      = (r * (uint64_t)0x1999999a) >> 32;
-        *buf++ = (r - 10 * q) + '0'; /* 4 */
-        if (q == 0)
-                return buf;
-        r      = (q * (uint64_t)0x1999999a) >> 32;
-        *buf++ = (q - 10 * r) + '0'; /* 5 */
-        if (r == 0)
-                return buf;
-        q      = (r * 0x199a) >> 16;
-        *buf++ = (r - 10 * q)  + '0'; /* 6 */
+        while (r >= 10000) {
+                q = r + '0';
+                r  = (r * (uint64_t)0x1999999a) >> 32;
+                *buf++ = q - 10*r;
+        }
+
+        q      = (r * 0x199a) >> 16;    /* r <= 9999 */
+        *buf++ = (r - 10 * q)  + '0';
         if (q == 0)
                 return buf;
-        r      = (q * 0xcd) >> 11;
-        *buf++ = (q - 10 * r)  + '0'; /* 7 */
+        r      = (q * 0xcd) >> 11;      /* q <= 999 */
+        *buf++ = (q - 10 * r)  + '0';
         if (r == 0)
                 return buf;
-        q      = (r * 0xcd) >> 11;
-        *buf++ = (r - 10 * q) + '0'; /* 8 */
+        q      = (r * 0xcd) >> 11;      /* r <= 99 */
+        *buf++ = (r - 10 * q) + '0';
         if (q == 0)
                 return buf;
-        *buf++ = q + '0'; /* 9 */
+        *buf++ = q + '0';                /* q <= 9 */
         return buf;
 }
 
@@ -243,18 +233,34 @@ char *put_dec(char *buf, unsigned long long n)
 
 /* Second algorithm: valid only for 64-bit long longs */
 
+/* See comment in put_dec_full9 for choice of constants */
 static noinline_for_stack
-char *put_dec_full4(char *buf, unsigned q)
+void put_dec_full4(char *buf, unsigned q)
 {
         unsigned r;
-        r      = (q * 0xcccd) >> 19;
-        *buf++ = (q - 10 * r) + '0';
-        q      = (r * 0x199a) >> 16;
-        *buf++ = (r - 10 * q)  + '0';
+        r      = (q * 0xccd) >> 15;
+        buf[0] = (q - 10 * r) + '0';
+        q      = (r * 0xcd) >> 11;
+        buf[1] = (r - 10 * q)  + '0';
         r      = (q * 0xcd) >> 11;
-        *buf++ = (q - 10 * r)  + '0';
-        *buf++ = r + '0';
-        return buf;
+        buf[2] = (q - 10 * r)  + '0';
+        buf[3] = r + '0';
+}
+
+/*
+ * Call put_dec_full4 on x % 10000, return x / 10000.
+ * The approximation x/10000 == (x * 0x346DC5D7) >> 43
+ * holds for all x < 1,128,869,999.  The largest value this
+ * helper will ever be asked to convert is 1,125,520,955.
+ * (d1 in the put_dec code, assuming n is all-ones).
+ */
+static
+unsigned put_dec_helper4(char *buf, unsigned x)
+{
+        uint32_t q = (x * (uint64_t)0x346DC5D7) >> 43;
+
+        put_dec_full4(buf, x - q * 10000);
+        return q;
 }
 
 /* Based on code by Douglas W. Jones found at
@@ -276,28 +282,19 @@ char *put_dec(char *buf, unsigned long long n)
         d3  = (h >> 16); /* implicit "& 0xffff" */
 
         q   = 656 * d3 + 7296 * d2 + 5536 * d1 + ((uint32_t)n & 0xffff);
+        q = put_dec_helper4(buf, q);
+
+        q += 7671 * d3 + 9496 * d2 + 6 * d1;
+        q = put_dec_helper4(buf+4, q);
+
+        q += 4749 * d3 + 42 * d2;
+        q = put_dec_helper4(buf+8, q);
 
-        buf = put_dec_full4(buf, q % 10000);
-        q   = q / 10000;
-
-        d1  = q + 7671 * d3 + 9496 * d2 + 6 * d1;
-        buf = put_dec_full4(buf, d1 % 10000);
-        q   = d1 / 10000;
-
-        d2  = q + 4749 * d3 + 42 * d2;
-        buf = put_dec_full4(buf, d2 % 10000);
-        q   = d2 / 10000;
-
-        d3  = q + 281 * d3;
-        if (!d3)
-                goto done;
-        buf = put_dec_full4(buf, d3 % 10000);
-        q   = d3 / 10000;
-        if (!q)
-                goto done;
-        buf = put_dec_full4(buf, q);
- done:
-        while (buf[-1] == '0')
+        q += 281 * d3;
+        buf += 12;
+        if (q)
+                buf = put_dec_trunc8(buf, q);
+        else while (buf[-1] == '0')
                 --buf;
 
         return buf;
@@ -990,7 +987,7 @@ int kptr_restrict __read_mostly;
  * - 'm' For a 6-byte MAC address, it prints the hex address without colons
  * - 'MF' For a 6-byte MAC FDDI address, it prints the address
  *       with a dash-separated hex notation
- * - '[mM]R For a 6-byte MAC address, Reverse order (Bluetooth)
+ * - '[mM]R' For a 6-byte MAC address, Reverse order (Bluetooth)
  * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way
  *       IPv4 uses dot-separated decimal without leading 0's (1.2.3.4)
  *       IPv6 uses colon separated network-order 16 bit hex with leading 0's
@@ -1341,7 +1338,10 @@ qualifier:
  * %pR output the address range in a struct resource with decoded flags
  * %pr output the address range in a struct resource with raw flags
  * %pM output a 6-byte MAC address with colons
+ * %pMR output a 6-byte MAC address with colons in reversed order
+ * %pMF output a 6-byte MAC address with dashes
  * %pm output a 6-byte MAC address without colons
+ * %pmR output a 6-byte MAC address without colons in reversed order
  * %pI4 print an IPv4 address without leading zeros
  * %pi4 print an IPv4 address with leading zeros
  * %pI6 print an IPv6 address with colons
@@ -2017,7 +2017,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
         s16 field_width;
         bool is_sign;
 
-        while (*fmt && *str) {
+        while (*fmt) {
                 /* skip any white space in format */
                 /* white space in format matchs any amount of
                  * white space, including none, in the input.
@@ -2042,6 +2042,8 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                  * advance both strings to next white space
                  */
                 if (*fmt == '*') {
+                        if (!*str)
+                                break;
                         while (!isspace(*fmt) && *fmt != '%' && *fmt)
                                 fmt++;
                         while (!isspace(*str) && *str)
@@ -2070,7 +2072,17 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                         }
                 }
 
-                if (!*fmt || !*str)
+                if (!*fmt)
+                        break;
+
+                if (*fmt == 'n') {
+                        /* return number of characters read so far */
+                        *va_arg(args, int *) = str - buf;
+                        ++fmt;
+                        continue;
+                }
+
+                if (!*str)
                         break;
 
                 base = 10;
@@ -2103,13 +2115,6 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                         num++;
                 }
                 continue;
-                case 'n':
-                        /* return number of characters read so far */
-                {
-                        int *i = (int *)va_arg(args, int*);
-                        *i = str - buf;
-                }
-                continue;
                 case 'o':
                         base = 8;
                         break;
@@ -2210,16 +2215,6 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                 str = next;
         }
 
-        /*
-         * Now we've come all the way through so either the input string or the
-         * format ended. In the former case, there can be a %n at the current
-         * position in the format that needs to be filled.
-         */
-        if (*fmt == '%' && *(fmt + 1) == 'n') {
-                int *p = (int *)va_arg(args, int *);
-                *p = str - buf;
-        }
-
         return num;
 }
 EXPORT_SYMBOL(vsscanf);
diff --git a/mm/percpu.c b/mm/percpu.c
index bb4be7435ce3..ddc5efb9c5bb 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1370,7 +1370,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
 
 #ifdef CONFIG_SMP
 
-const char *pcpu_fc_names[PCPU_FC_NR] __initdata = {
+const char * const pcpu_fc_names[PCPU_FC_NR] __initconst = {
         [PCPU_FC_AUTO]  = "auto",
         [PCPU_FC_EMBED] = "embed",
         [PCPU_FC_PAGE]  = "page",
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 821022a7214f..ddac1ee2ed20 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -63,7 +63,7 @@
 
 #include "af_can.h"
 
-static __initdata const char banner[] = KERN_INFO
+static __initconst const char banner[] = KERN_INFO
         "can: controller area network core (" CAN_VERSION_STRING ")\n";
 
 MODULE_DESCRIPTION("Controller Area Network PF_CAN core");
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 151b7730c12c..6f747582718e 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -77,7 +77,7 @@
                      (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))
 
 #define CAN_BCM_VERSION CAN_VERSION
-static __initdata const char banner[] = KERN_INFO
+static __initconst const char banner[] = KERN_INFO
         "can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n";
 
 MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");
diff --git a/net/can/gw.c b/net/can/gw.c
index 127879c55fb6..1f5c9785a262 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -58,7 +58,7 @@
 #include <net/sock.h>
 
 #define CAN_GW_VERSION "20101209"
-static __initdata const char banner[] =
+static __initconst const char banner[] =
         KERN_INFO "can: netlink gateway (rev " CAN_GW_VERSION ")\n";
 
 MODULE_DESCRIPTION("PF_CAN netlink gateway");
diff --git a/net/can/raw.c b/net/can/raw.c
index 3e9c89356a93..5b0e3e330d97 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -55,7 +55,7 @@
 #include <net/net_namespace.h>
 
 #define CAN_RAW_VERSION CAN_VERSION
-static __initdata const char banner[] =
+static __initconst const char banner[] =
         KERN_INFO "can: raw protocol (rev " CAN_RAW_VERSION ")\n";
 
 MODULE_DESCRIPTION("PF_CAN raw protocol");
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index e65f2c856e06..faf7cc3483fe 100644
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -220,7 +220,7 @@ static void dn_fib_rule_flush_cache(struct fib_rules_ops *ops)
         dn_rt_cache_flush(-1);
 }
 
-static const struct fib_rules_ops __net_initdata dn_fib_rules_ops_template = {
+static const struct fib_rules_ops __net_initconst dn_fib_rules_ops_template = {
         .family         = AF_DECnet,
         .rule_size      = sizeof(struct dn_fib_rule),
         .addr_size      = sizeof(u16),
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 274309d3aded..26aa65d1fce4 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -262,7 +262,7 @@ static void fib4_rule_flush_cache(struct fib_rules_ops *ops)
         rt_cache_flush(ops->fro_net);
 }
 
-static const struct fib_rules_ops __net_initdata fib4_rules_ops_template = {
+static const struct fib_rules_ops __net_initconst fib4_rules_ops_template = {
         .family         = AF_INET,
         .rule_size      = sizeof(struct fib4_rule),
         .addr_size      = sizeof(u32),
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 1daa95c2a0ba..6168c4dc58b1 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -221,7 +221,7 @@ static int ipmr_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
         return 0;
 }
 
-static const struct fib_rules_ops __net_initdata ipmr_rules_ops_template = {
+static const struct fib_rules_ops __net_initconst ipmr_rules_ops_template = {
         .family         = RTNL_FAMILY_IPMR,
         .rule_size      = sizeof(struct ipmr_rule),
         .addr_size      = sizeof(u32),
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index 4be23da32b89..ff76eecfd622 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -79,7 +79,7 @@ struct net *ip6addrlbl_net(const struct ip6addrlbl_entry *lbl)
 
 #define IPV6_ADDR_LABEL_DEFAULT 0xffffffffUL
 
-static const __net_initdata struct ip6addrlbl_init_table
+static const __net_initconst struct ip6addrlbl_init_table
 {
         const struct in6_addr *prefix;
         int prefixlen;
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 0ff1cfd55bc4..d9fb9110f607 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -238,7 +238,7 @@ static size_t fib6_rule_nlmsg_payload(struct fib_rule *rule)
                + nla_total_size(16); /* src */
 }
 
-static const struct fib_rules_ops __net_initdata fib6_rules_ops_template = {
+static const struct fib_rules_ops __net_initconst fib6_rules_ops_template = {
         .family                 = AF_INET6,
         .rule_size              = sizeof(struct fib6_rule),
         .addr_size              = sizeof(struct in6_addr),
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 08ea3f0b6e55..f7c7c6319720 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -205,7 +205,7 @@ static int ip6mr_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
         return 0;
 }
 
-static const struct fib_rules_ops __net_initdata ip6mr_rules_ops_template = {
+static const struct fib_rules_ops __net_initconst ip6mr_rules_ops_template = {
         .family         = RTNL_FAMILY_IP6MR,
         .rule_size      = sizeof(struct ip6mr_rule),
         .addr_size      = sizeof(struct in6_addr),
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 6a3ee981931d..afa44595f348 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -209,7 +209,7 @@ endif
 # >$< substitution to preserve $ when reloading .cmd file
 # note: when using inline perl scripts [perl -e '...$$t=1;...']
 # in $(cmd_xxx) double $$ your perl vars
-make-cmd = $(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1)))))
+make-cmd = $(subst \\,\\\\,$(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1))))))
 
 # Find any prerequisites that is newer than target or that does not exist.
 # PHONY targets skipped in both cases.
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index ca05ba217f5f..21a9f5de0a21 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -421,7 +421,7 @@ sub top_of_kernel_tree {
                 }
         }
         return 1;
-    }
+}
 
 sub parse_email {
         my ($formatted_email) = @_;
@@ -1386,6 +1386,8 @@ sub process {
         my $in_header_lines = 1;
         my $in_commit_log = 0;          #Scanning lines before patch
 
+        my $non_utf8_charset = 0;
+
         our @report = ();
         our $cnt_lines = 0;
         our $cnt_error = 0;
@@ -1686,10 +1688,17 @@ sub process {
                         $in_commit_log = 1;
                 }
 
-# Still not yet in a patch, check for any UTF-8
-                if ($in_commit_log && $realfile =~ /^$/ &&
+# Check if there is UTF-8 in a commit log when a mail header has explicitly
+# declined it, i.e defined some charset where it is missing.
+                if ($in_header_lines &&
+                    $rawline =~ /^Content-Type:.+charset="(.+)".*$/ &&
+                    $1 !~ /utf-8/i) {
+                        $non_utf8_charset = 1;
+                }
+
+                if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ &&
                     $rawline =~ /$NON_ASCII_UTF8/) {
-                        CHK("UTF8_BEFORE_PATCH",
+                        WARN("UTF8_BEFORE_PATCH",
                             "8-bit UTF-8 used in possible commit log\n" . $herecurr);
                 }
 
@@ -1873,6 +1882,20 @@ sub process {
                             "No space is necessary after a cast\n" . $hereprev);
                 }
 
+                if ($realfile =~ m@^(drivers/net/|net/)@ &&
+                    $rawline =~ /^\+[ \t]*\/\*[ \t]*$/ &&
+                    $prevrawline =~ /^\+[ \t]*$/) {
+                        WARN("NETWORKING_BLOCK_COMMENT_STYLE",
+                             "networking block comments don't use an empty /* line, use /* Comment...\n" . $hereprev);
+                }
+
+                if ($realfile =~ m@^(drivers/net/|net/)@ &&
+                    $rawline !~ m@^\+[ \t]*(\/\*|\*\/)@ &&
+                    $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) {
+                        WARN("NETWORKING_BLOCK_COMMENT_STYLE",
+                             "networking block comments put the trailing */ on a separate line\n" . $herecurr);
+                }
+
 # check for spaces at the beginning of a line.
 # Exceptions:
 #  1) within comments
@@ -2390,8 +2413,10 @@ sub process {
                         my $orig = $1;
                         my $level = lc($orig);
                         $level = "warn" if ($level eq "warning");
+                        my $level2 = $level;
+                        $level2 = "dbg" if ($level eq "debug");
                         WARN("PREFER_PR_LEVEL",
-                             "Prefer pr_$level(... to printk(KERN_$1, ...\n" . $herecurr);
+                             "Prefer netdev_$level2(netdev, ... then dev_$level2(dev, ... then pr_$level(...  to printk(KERN_$orig ...\n" . $herecurr);
                 }
 
                 if ($line =~ /\bpr_warning\s*\(/) {
@@ -2947,7 +2972,7 @@ sub process {
                         my $exceptions = qr{
                                 $Declare|
                                 module_param_named|
-                                MODULE_PARAM_DESC|
+                                MODULE_PARM_DESC|
                                 DECLARE_PER_CPU|
                                 DEFINE_PER_CPU|
                                 __typeof__\(|
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 8fd107a3fac4..01e8a8e22602 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -230,6 +230,7 @@ my $dohighlight = "";
 
 my $verbose = 0;
 my $output_mode = "man";
+my $output_preformatted = 0;
 my $no_doc_sections = 0;
 my %highlights = %highlights_man;
 my $blankline = $blankline_man;
@@ -280,9 +281,10 @@ my $doc_special = "\@\%\$\&";
 my $doc_start = '^/\*\*\s*$'; # Allow whitespace at end of comment start.
 my $doc_end = '\*/';
 my $doc_com = '\s*\*\s*';
+my $doc_com_body = '\s*\* ?';
 my $doc_decl = $doc_com . '(\w+)';
 my $doc_sect = $doc_com . '([' . $doc_special . ']?[\w\s]+):(.*)';
-my $doc_content = $doc_com . '(.*)';
+my $doc_content = $doc_com_body . '(.*)';
 my $doc_block = $doc_com . 'DOC:\s*(.*)?';
 
 my %constants;
@@ -459,8 +461,13 @@ sub output_highlight {
 #   print STDERR "contents af:$contents\n";
 
     foreach $line (split "\n", $contents) {
+        if (! $output_preformatted) {
+            $line =~ s/^\s*//;
+        }
         if ($line eq ""){
-            print $lineprefix, local_unescape($blankline);
+            if (! $output_preformatted) {
+                print $lineprefix, local_unescape($blankline);
+            }
         } else {
             $line =~ s/\\\\\\/\&/g;
             if ($output_mode eq "man" && substr($line, 0, 1) eq ".") {
@@ -643,10 +650,12 @@ sub output_section_xml(%) {
         print "<title>$section</title>\n";
         if ($section =~ m/EXAMPLE/i) {
             print "<informalexample><programlisting>\n";
+            $output_preformatted = 1;
         } else {
             print "<para>\n";
         }
         output_highlight($args{'sections'}{$section});
+        $output_preformatted = 0;
         if ($section =~ m/EXAMPLE/i) {
             print "</programlisting></informalexample>\n";
         } else {
@@ -949,10 +958,12 @@ sub output_blockhead_xml(%) {
         }
         if ($section =~ m/EXAMPLE/i) {
             print "<example><para>\n";
+            $output_preformatted = 1;
         } else {
             print "<para>\n";
         }
         output_highlight($args{'sections'}{$section});
+        $output_preformatted = 0;
         if ($section =~ m/EXAMPLE/i) {
             print "</para></example>\n";
         } else {
@@ -1028,10 +1039,12 @@ sub output_function_gnome {
         print "<simplesect>\n <title>$section</title>\n";
         if ($section =~ m/EXAMPLE/i) {
             print "<example><programlisting>\n";
+            $output_preformatted = 1;
         } else {
         }
         print "<para>\n";
         output_highlight($args{'sections'}{$section});
+        $output_preformatted = 0;
         print "</para>\n";
         if ($section =~ m/EXAMPLE/i) {
             print "</programlisting></example>\n";
@@ -2046,6 +2059,9 @@ sub process_file($) {
 
     $section_counter = 0;
     while (<IN>) {
+        while (s/\\\s*$//) {
+            $_ .= <IN>;
+        }
         if ($state == 0) {
             if (/$doc_start/o) {
                 $state = 1;             # next line is always the function name
@@ -2073,7 +2089,7 @@ sub process_file($) {
                     $descr= $1;
                     $descr =~ s/^\s*//;
                     $descr =~ s/\s*$//;
-                    $descr =~ s/\s+/ /;
+                    $descr =~ s/\s+/ /g;
                     $declaration_purpose = xml_escape($descr);
                     $in_purpose = 1;
                 } else {
@@ -2165,6 +2181,7 @@ sub process_file($) {
                     # Continued declaration purpose
                     chomp($declaration_purpose);
                     $declaration_purpose .= " " . xml_escape($1);
+                    $declaration_purpose =~ s/\s+/ /g;
                 } else {
                     $contents .= $1 . "\n";
                 }
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 4b877a92a7ea..44dfc415a379 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -26,12 +26,12 @@
 static DEFINE_MUTEX(devcgroup_mutex);
 
 /*
- * whitelist locking rules:
+ * exception list locking rules:
  * hold devcgroup_mutex for update/read.
  * hold rcu_read_lock() for read.
  */
 
-struct dev_whitelist_item {
+struct dev_exception_item {
         u32 major, minor;
         short type;
         short access;
@@ -41,7 +41,8 @@ struct dev_whitelist_item {
 
 struct dev_cgroup {
         struct cgroup_subsys_state css;
-        struct list_head whitelist;
+        struct list_head exceptions;
+        bool deny_all;
 };
 
 static inline struct dev_cgroup *css_to_devcgroup(struct cgroup_subsys_state *s)
@@ -74,12 +75,12 @@ static int devcgroup_can_attach(struct cgroup *new_cgrp,
 /*
  * called under devcgroup_mutex
  */
-static int dev_whitelist_copy(struct list_head *dest, struct list_head *orig)
+static int dev_exceptions_copy(struct list_head *dest, struct list_head *orig)
 {
-        struct dev_whitelist_item *wh, *tmp, *new;
+        struct dev_exception_item *ex, *tmp, *new;
 
-        list_for_each_entry(wh, orig, list) {
-                new = kmemdup(wh, sizeof(*wh), GFP_KERNEL);
+        list_for_each_entry(ex, orig, list) {
+                new = kmemdup(ex, sizeof(*ex), GFP_KERNEL);
                 if (!new)
                         goto free_and_exit;
                 list_add_tail(&new->list, dest);
@@ -88,64 +89,60 @@ static int dev_whitelist_copy(struct list_head *dest, struct list_head *orig)
         return 0;
 
 free_and_exit:
-        list_for_each_entry_safe(wh, tmp, dest, list) {
-                list_del(&wh->list);
-                kfree(wh);
+        list_for_each_entry_safe(ex, tmp, dest, list) {
+                list_del(&ex->list);
+                kfree(ex);
         }
         return -ENOMEM;
 }
 
-/* Stupid prototype - don't bother combining existing entries */
 /*
  * called under devcgroup_mutex
  */
-static int dev_whitelist_add(struct dev_cgroup *dev_cgroup,
-                        struct dev_whitelist_item *wh)
+static int dev_exception_add(struct dev_cgroup *dev_cgroup,
+                             struct dev_exception_item *ex)
 {
-        struct dev_whitelist_item *whcopy, *walk;
+        struct dev_exception_item *excopy, *walk;
 
-        whcopy = kmemdup(wh, sizeof(*wh), GFP_KERNEL);
-        if (!whcopy)
+        excopy = kmemdup(ex, sizeof(*ex), GFP_KERNEL);
+        if (!excopy)
                 return -ENOMEM;
 
-        list_for_each_entry(walk, &dev_cgroup->whitelist, list) {
-                if (walk->type != wh->type)
+        list_for_each_entry(walk, &dev_cgroup->exceptions, list) {
+                if (walk->type != ex->type)
                         continue;
-                if (walk->major != wh->major)
+                if (walk->major != ex->major)
                         continue;
-                if (walk->minor != wh->minor)
+                if (walk->minor != ex->minor)
                         continue;
 
-                walk->access |= wh->access;
-                kfree(whcopy);
-                whcopy = NULL;
+                walk->access |= ex->access;
+                kfree(excopy);
+                excopy = NULL;
         }
 
-        if (whcopy != NULL)
-                list_add_tail_rcu(&whcopy->list, &dev_cgroup->whitelist);
+        if (excopy != NULL)
+                list_add_tail_rcu(&excopy->list, &dev_cgroup->exceptions);
         return 0;
 }
 
 /*
  * called under devcgroup_mutex
  */
-static void dev_whitelist_rm(struct dev_cgroup *dev_cgroup,
-                        struct dev_whitelist_item *wh)
+static void dev_exception_rm(struct dev_cgroup *dev_cgroup,
+                             struct dev_exception_item *ex)
 {
-        struct dev_whitelist_item *walk, *tmp;
+        struct dev_exception_item *walk, *tmp;
 
-        list_for_each_entry_safe(walk, tmp, &dev_cgroup->whitelist, list) {
-                if (walk->type == DEV_ALL)
-                        goto remove;
-                if (walk->type != wh->type)
+        list_for_each_entry_safe(walk, tmp, &dev_cgroup->exceptions, list) {
+                if (walk->type != ex->type)
                         continue;
-                if (walk->major != ~0 && walk->major != wh->major)
+                if (walk->major != ex->major)
                         continue;
-                if (walk->minor != ~0 && walk->minor != wh->minor)
+                if (walk->minor != ex->minor)
                         continue;
 
-remove:
-                walk->access &= ~wh->access;
+                walk->access &= ~ex->access;
                 if (!walk->access) {
                         list_del_rcu(&walk->list);
                         kfree_rcu(walk, rcu);
@@ -153,6 +150,22 @@ remove:
         }
 }
 
+/**
+ * dev_exception_clean - frees all entries of the exception list
+ * @dev_cgroup: dev_cgroup with the exception list to be cleaned
+ *
+ * called under devcgroup_mutex
+ */
+static void dev_exception_clean(struct dev_cgroup *dev_cgroup)
+{
+        struct dev_exception_item *ex, *tmp;
+
+        list_for_each_entry_safe(ex, tmp, &dev_cgroup->exceptions, list) {
+                list_del(&ex->list);
+                kfree(ex);
+        }
+}
+
 /*
  * called from kernel/cgroup.c with cgroup_lock() held.
  */
@@ -165,25 +178,17 @@ static struct cgroup_subsys_state *devcgroup_create(struct cgroup *cgroup)
         dev_cgroup = kzalloc(sizeof(*dev_cgroup), GFP_KERNEL);
         if (!dev_cgroup)
                 return ERR_PTR(-ENOMEM);
-        INIT_LIST_HEAD(&dev_cgroup->whitelist);
+        INIT_LIST_HEAD(&dev_cgroup->exceptions);
         parent_cgroup = cgroup->parent;
 
-        if (parent_cgroup == NULL) {
-                struct dev_whitelist_item *wh;
-                wh = kmalloc(sizeof(*wh), GFP_KERNEL);
-                if (!wh) {
-                        kfree(dev_cgroup);
-                        return ERR_PTR(-ENOMEM);
-                }
-                wh->minor = wh->major = ~0;
-                wh->type = DEV_ALL;
-                wh->access = ACC_MASK;
-                list_add(&wh->list, &dev_cgroup->whitelist);
-        } else {
+        if (parent_cgroup == NULL)
+                dev_cgroup->deny_all = false;
+        else {
                 parent_dev_cgroup = cgroup_to_devcgroup(parent_cgroup);
                 mutex_lock(&devcgroup_mutex);
-                ret = dev_whitelist_copy(&dev_cgroup->whitelist,
-                                &parent_dev_cgroup->whitelist);
+                ret = dev_exceptions_copy(&dev_cgroup->exceptions,
+                                          &parent_dev_cgroup->exceptions);
+                dev_cgroup->deny_all = parent_dev_cgroup->deny_all;
                 mutex_unlock(&devcgroup_mutex);
                 if (ret) {
                         kfree(dev_cgroup);
@@ -197,13 +202,9 @@ static struct cgroup_subsys_state *devcgroup_create(struct cgroup *cgroup)
 static void devcgroup_destroy(struct cgroup *cgroup)
 {
         struct dev_cgroup *dev_cgroup;
-        struct dev_whitelist_item *wh, *tmp;
 
         dev_cgroup = cgroup_to_devcgroup(cgroup);
-        list_for_each_entry_safe(wh, tmp, &dev_cgroup->whitelist, list) {
-                list_del(&wh->list);
-                kfree(wh);
-        }
+        dev_exception_clean(dev_cgroup);
         kfree(dev_cgroup);
 }
 
@@ -249,59 +250,87 @@ static int devcgroup_seq_read(struct cgroup *cgroup, struct cftype *cft,
                                 struct seq_file *m)
 {
         struct dev_cgroup *devcgroup = cgroup_to_devcgroup(cgroup);
-        struct dev_whitelist_item *wh;
+        struct dev_exception_item *ex;
         char maj[MAJMINLEN], min[MAJMINLEN], acc[ACCLEN];
 
         rcu_read_lock();
-        list_for_each_entry_rcu(wh, &devcgroup->whitelist, list) {
-                set_access(acc, wh->access);
-                set_majmin(maj, wh->major);
-                set_majmin(min, wh->minor);
-                seq_printf(m, "%c %s:%s %s\n", type_to_char(wh->type),
+        /*
+         * To preserve the compatibility:
+         * - Only show the "all devices" when the default policy is to allow
+         * - List the exceptions in case the default policy is to deny
+         * This way, the file remains as a "whitelist of devices"
+         */
+        if (devcgroup->deny_all == false) {
+                set_access(acc, ACC_MASK);
+                set_majmin(maj, ~0);
+                set_majmin(min, ~0);
+                seq_printf(m, "%c %s:%s %s\n", type_to_char(DEV_ALL),
                            maj, min, acc);
+        } else {
+                list_for_each_entry_rcu(ex, &devcgroup->exceptions, list) {
+                        set_access(acc, ex->access);
+                        set_majmin(maj, ex->major);
+                        set_majmin(min, ex->minor);
+                        seq_printf(m, "%c %s:%s %s\n", type_to_char(ex->type),
+                                   maj, min, acc);
+                }
         }
         rcu_read_unlock();
 
         return 0;
 }
 
-/*
- * may_access_whitelist:
- * does the access granted to dev_cgroup c contain the access
- * requested in whitelist item refwh.
- * return 1 if yes, 0 if no.
- * call with devcgroup_mutex held
+/**
+ * may_access - verifies if a new exception is part of what is allowed
+ *              by a dev cgroup based on the default policy +
+ *              exceptions. This is used to make sure a child cgroup
+ *              won't have more privileges than its parent or to
+ *              verify if a certain access is allowed.
+ * @dev_cgroup: dev cgroup to be tested against
+ * @refex: new exception
  */
-static int may_access_whitelist(struct dev_cgroup *c,
-                                       struct dev_whitelist_item *refwh)
+static int may_access(struct dev_cgroup *dev_cgroup,
+                      struct dev_exception_item *refex)
 {
-        struct dev_whitelist_item *whitem;
+        struct dev_exception_item *ex;
+        bool match = false;
 
-        list_for_each_entry(whitem, &c->whitelist, list) {
-                if (whitem->type & DEV_ALL)
-                        return 1;
-                if ((refwh->type & DEV_BLOCK) && !(whitem->type & DEV_BLOCK))
+        list_for_each_entry(ex, &dev_cgroup->exceptions, list) {
+                if ((refex->type & DEV_BLOCK) && !(ex->type & DEV_BLOCK))
                         continue;
-                if ((refwh->type & DEV_CHAR) && !(whitem->type & DEV_CHAR))
+                if ((refex->type & DEV_CHAR) && !(ex->type & DEV_CHAR))
                         continue;
-                if (whitem->major != ~0 && whitem->major != refwh->major)
+                if (ex->major != ~0 && ex->major != refex->major)
                         continue;
-                if (whitem->minor != ~0 && whitem->minor != refwh->minor)
+                if (ex->minor != ~0 && ex->minor != refex->minor)
                         continue;
-                if (refwh->access & (~whitem->access))
+                if (refex->access & (~ex->access))
                         continue;
-                return 1;
+                match = true;
+                break;
         }
+
+        /*
+         * In two cases we'll consider this new exception valid:
+         * - the dev cgroup has its default policy to allow + exception list:
+         *   the new exception should *not* match any of the exceptions
+         *   (!deny_all, !match)
+         * - the dev cgroup has its default policy to deny + exception list:
+         *   the new exception *should* match the exceptions
+         *   (deny_all, match)
+         */
+        if (dev_cgroup->deny_all == match)
+                return 1;
         return 0;
 }
 
 /*
  * parent_has_perm:
- * when adding a new allow rule to a device whitelist, the rule
+ * when adding a new allow rule to a device exception list, the rule
  * must be allowed in the parent device
  */
 static int parent_has_perm(struct dev_cgroup *childcg,
-                                  struct dev_whitelist_item *wh)
+                                  struct dev_exception_item *ex)
 {
         struct cgroup *pcg = childcg->css.cgroup->parent;
         struct dev_cgroup *parent;
@@ -309,17 +338,17 @@ static int parent_has_perm(struct dev_cgroup *childcg,
         if (!pcg)
                 return 1;
         parent = cgroup_to_devcgroup(pcg);
-        return may_access_whitelist(parent, wh);
+        return may_access(parent, ex);
 }
 
 /*
- * Modify the whitelist using allow/deny rules.
+ * Modify the exception list using allow/deny rules.
  * CAP_SYS_ADMIN is needed for this.  It's at least separate from CAP_MKNOD
  * so we can give a container CAP_MKNOD to let it create devices but not
- * modify the whitelist.
+ * modify the exception list.
  * It seems likely we'll want to add a CAP_CONTAINER capability to allow
  * us to also grant CAP_SYS_ADMIN to containers without giving away the
- * device whitelist controls, but for now we'll stick with CAP_SYS_ADMIN
+ * device exception list controls, but for now we'll stick with CAP_SYS_ADMIN
  *
  * Taking rules away is always allowed (given CAP_SYS_ADMIN).  Granting
  * new access is only allowed if you're in the top-level cgroup, or your
@@ -331,26 +360,36 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
         const char *b;
         char *endp;
         int count;
-        struct dev_whitelist_item wh;
+        struct dev_exception_item ex;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        memset(&wh, 0, sizeof(wh));
+        memset(&ex, 0, sizeof(ex));
         b = buffer;
 
         switch (*b) {
         case 'a':
-                wh.type = DEV_ALL;
-                wh.access = ACC_MASK;
-                wh.major = ~0;
-                wh.minor = ~0;
-                goto handle;
+                switch (filetype) {
+                case DEVCG_ALLOW:
+                        if (!parent_has_perm(devcgroup, &ex))
+                                return -EPERM;
+                        dev_exception_clean(devcgroup);
+                        devcgroup->deny_all = false;
+                        break;
+                case DEVCG_DENY:
+                        dev_exception_clean(devcgroup);
+                        devcgroup->deny_all = true;
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                return 0;
         case 'b':
-                wh.type = DEV_BLOCK;
+                ex.type = DEV_BLOCK;
                 break;
         case 'c':
-                wh.type = DEV_CHAR;
+                ex.type = DEV_CHAR;
                 break;
         default:
                 return -EINVAL;
@@ -360,10 +399,10 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
                 return -EINVAL;
         b++;
         if (*b == '*') {
-                wh.major = ~0;
+                ex.major = ~0;
                 b++;
         } else if (isdigit(*b)) {
-                wh.major = simple_strtoul(b, &endp, 10);
+                ex.major = simple_strtoul(b, &endp, 10);
                 b = endp;
         } else {
                 return -EINVAL;
@@ -374,10 +413,10 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
 
         /* read minor */
         if (*b == '*') {
-                wh.minor = ~0;
+                ex.minor = ~0;
                 b++;
         } else if (isdigit(*b)) {
-                wh.minor = simple_strtoul(b, &endp, 10);
+                ex.minor = simple_strtoul(b, &endp, 10);
                 b = endp;
         } else {
                 return -EINVAL;
@@ -387,13 +426,13 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
         for (b++, count = 0; count < 3; count++, b++) {
                 switch (*b) {
                 case 'r':
-                        wh.access |= ACC_READ;
+                        ex.access |= ACC_READ;
                         break;
                 case 'w':
-                        wh.access |= ACC_WRITE;
+                        ex.access |= ACC_WRITE;
                         break;
                 case 'm':
-                        wh.access |= ACC_MKNOD;
+                        ex.access |= ACC_MKNOD;
                         break;
                 case '\n':
                 case '\0':
@@ -404,15 +443,31 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
                 }
         }
 
-handle:
         switch (filetype) {
         case DEVCG_ALLOW:
-                if (!parent_has_perm(devcgroup, &wh))
+                if (!parent_has_perm(devcgroup, &ex))
                         return -EPERM;
-                return dev_whitelist_add(devcgroup, &wh);
+                /*
+                 * If the default policy is to allow by default, try to remove
+                 * an matching exception instead. And be silent about it: we
+                 * don't want to break compatibility
+                 */
+                if (devcgroup->deny_all == false) {
+                        dev_exception_rm(devcgroup, &ex);
+                        return 0;
+                }
+                return dev_exception_add(devcgroup, &ex);
         case DEVCG_DENY:
-                dev_whitelist_rm(devcgroup, &wh);
-                break;
+                /*
+                 * If the default policy is to deny by default, try to remove
+                 * an matching exception instead. And be silent about it: we
+                 * don't want to break compatibility
+                 */
+                if (devcgroup->deny_all == true) {
+                        dev_exception_rm(devcgroup, &ex);
+                        return 0;
+                }
+                return dev_exception_add(devcgroup, &ex);
         default:
                 return -EINVAL;
         }
@@ -468,73 +523,71 @@ struct cgroup_subsys devices_subsys = {
         .broken_hierarchy = true,
 };
 
-int __devcgroup_inode_permission(struct inode *inode, int mask)
+/**
+ * __devcgroup_check_permission - checks if an inode operation is permitted
+ * @dev_cgroup: the dev cgroup to be tested against
+ * @type: device type
+ * @major: device major number
+ * @minor: device minor number
+ * @access: combination of ACC_WRITE, ACC_READ and ACC_MKNOD
+ *
+ * returns 0 on success, -EPERM case the operation is not permitted
+ */
+static int __devcgroup_check_permission(struct dev_cgroup *dev_cgroup,
+                                        short type, u32 major, u32 minor,
+                                        short access)
 {
-        struct dev_cgroup *dev_cgroup;
-        struct dev_whitelist_item *wh;
-
-        rcu_read_lock();
+        struct dev_exception_item ex;
+        int rc;
 
-        dev_cgroup = task_devcgroup(current);
+        memset(&ex, 0, sizeof(ex));
+        ex.type = type;
+        ex.major = major;
+        ex.minor = minor;
+        ex.access = access;
 
-        list_for_each_entry_rcu(wh, &dev_cgroup->whitelist, list) {
-                if (wh->type & DEV_ALL)
-                        goto found;
-                if ((wh->type & DEV_BLOCK) && !S_ISBLK(inode->i_mode))
-                        continue;
-                if ((wh->type & DEV_CHAR) && !S_ISCHR(inode->i_mode))
-                        continue;
-                if (wh->major != ~0 && wh->major != imajor(inode))
-                        continue;
-                if (wh->minor != ~0 && wh->minor != iminor(inode))
-                        continue;
+        rcu_read_lock();
+        rc = may_access(dev_cgroup, &ex);
+        rcu_read_unlock();
 
-                if ((mask & MAY_WRITE) && !(wh->access & ACC_WRITE))
-                        continue;
-                if ((mask & MAY_READ) && !(wh->access & ACC_READ))
-                        continue;
-found:
-                rcu_read_unlock();
-                return 0;
-        }
+        if (!rc)
+                return -EPERM;
 
-        rcu_read_unlock();
+        return 0;
+}
 
-        return -EPERM;
+int __devcgroup_inode_permission(struct inode *inode, int mask)
+{
+        struct dev_cgroup *dev_cgroup = task_devcgroup(current);
+        short type, access = 0;
+
+        if (S_ISBLK(inode->i_mode))
+                type = DEV_BLOCK;
+        if (S_ISCHR(inode->i_mode))
+                type = DEV_CHAR;
+        if (mask & MAY_WRITE)
+                access |= ACC_WRITE;
+        if (mask & MAY_READ)
+                access |= ACC_READ;
+
+        return __devcgroup_check_permission(dev_cgroup, type, imajor(inode),
+                                            iminor(inode), access);
 }
 
 int devcgroup_inode_mknod(int mode, dev_t dev)
 {
-        struct dev_cgroup *dev_cgroup;
-        struct dev_whitelist_item *wh;
+        struct dev_cgroup *dev_cgroup = task_devcgroup(current);
+        short type;
 
         if (!S_ISBLK(mode) && !S_ISCHR(mode))
                 return 0;
 
-        rcu_read_lock();
-
-        dev_cgroup = task_devcgroup(current);
-
-        list_for_each_entry_rcu(wh, &dev_cgroup->whitelist, list) {
-                if (wh->type & DEV_ALL)
-                        goto found;
-                if ((wh->type & DEV_BLOCK) && !S_ISBLK(mode))
-                        continue;
-                if ((wh->type & DEV_CHAR) && !S_ISCHR(mode))
-                        continue;
-                if (wh->major != ~0 && wh->major != MAJOR(dev))
-                        continue;
-                if (wh->minor != ~0 && wh->minor != MINOR(dev))
-                        continue;
-
-                if (!(wh->access & ACC_MKNOD))
-                        continue;
-found:
-                rcu_read_unlock();
-                return 0;
-        }
+        if (S_ISBLK(mode))
+                type = DEV_BLOCK;
+        else
+                type = DEV_CHAR;
 
-        rcu_read_unlock();
+        return __devcgroup_check_permission(dev_cgroup, type, MAJOR(dev),
+                                            MINOR(dev), ACC_MKNOD);
 
-        return -EPERM;
 }
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index f4817292ef45..aa62c0e44cb6 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -1233,7 +1233,7 @@ static const struct snd_soc_dapm_route wm5100_dapm_routes[] = {
         { "PWM2", NULL, "PWM2 Driver" },
 };
 
-static const __devinitdata struct reg_default wm5100_reva_patches[] = {
+static const __devinitconst struct reg_default wm5100_reva_patches[] = {
         { WM5100_AUDIO_IF_1_10, 0 },
         { WM5100_AUDIO_IF_1_11, 1 },
         { WM5100_AUDIO_IF_1_12, 2 },
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index 85baf11e2acd..43480149119e 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -1,4 +1,4 @@
-TARGETS = breakpoints kcmp mqueue vm cpu-hotplug memory-hotplug
+TARGETS = breakpoints kcmp mqueue vm cpu-hotplug memory-hotplug epoll
 
 all:
         for TARGET in $(TARGETS); do \
diff --git a/tools/testing/selftests/epoll/Makefile b/tools/testing/selftests/epoll/Makefile
new file mode 100644
index 000000000000..19806ed62f50
--- /dev/null
+++ b/tools/testing/selftests/epoll/Makefile
@@ -0,0 +1,11 @@
+# Makefile for epoll selftests
+
+all: test_epoll
+%: %.c
+        gcc -pthread -g -o $@ $^
+
+run_tests: all
+        ./test_epoll
+
+clean:
+        $(RM) test_epoll
diff --git a/tools/testing/selftests/epoll/test_epoll.c b/tools/testing/selftests/epoll/test_epoll.c
new file mode 100644
index 000000000000..e0fcff1e8331
--- /dev/null
+++ b/tools/testing/selftests/epoll/test_epoll.c
@@ -0,0 +1,344 @@
+/*
+ *  tools/testing/selftests/epoll/test_epoll.c
+ *
+ *  Copyright 2012 Adobe Systems Incorporated
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Paton J. Lewis <palewis@adobe.com>
+ *
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/epoll.h>
+#include <sys/socket.h>
+
+/*
+ * A pointer to an epoll_item_private structure will be stored in the epoll
+ * item's event structure so that we can get access to the epoll_item_private
+ * data after calling epoll_wait:
+ */
+struct epoll_item_private {
+        int index;  /* Position of this struct within the epoll_items array. */
+        int fd;
+        uint32_t events;
+        pthread_mutex_t mutex;  /* Guards the following variables... */
+        int stop;
+        int status;  /* Stores any error encountered while handling item. */
+        /* The following variable allows us to test whether we have encountered
+           a problem while attempting to cancel and delete the associated
+           event. When the test program exits, 'deleted' should be exactly
+           one. If it is greater than one, then the failed test reflects a real
+           world situation where we would have tried to access the epoll item's
+           private data after deleting it: */
+        int deleted;
+};
+
+struct epoll_item_private *epoll_items;
+
+/*
+ * Delete the specified item from the epoll set. In a real-world secneario this
+ * is where we would free the associated data structure, but in this testing
+ * environment we retain the structure so that we can test for double-deletion:
+ */
+void delete_item(int index)
+{
+        __sync_fetch_and_add(&epoll_items[index].deleted, 1);
+}
+
+/*
+ * A pointer to a read_thread_data structure will be passed as the argument to
+ * each read thread:
+ */
+struct read_thread_data {
+        int stop;
+        int status;  /* Indicates any error encountered by the read thread. */
+        int epoll_set;
+};
+
+/*
+ * The function executed by the read threads:
+ */
+void *read_thread_function(void *function_data)
+{
+        struct read_thread_data *thread_data =
+                (struct read_thread_data *)function_data;
+        struct epoll_event event_data;
+        struct epoll_item_private *item_data;
+        char socket_data;
+
+        /* Handle events until we encounter an error or this thread's 'stop'
+           condition is set: */
+        while (1) {
+                int result = epoll_wait(thread_data->epoll_set,
+                                        &event_data,
+                                        1,      /* Number of desired events */
+                                        1000);  /* Timeout in ms */
+                if (result < 0) {
+                        /* Breakpoints signal all threads. Ignore that while
+                           debugging: */
+                        if (errno == EINTR)
+                                continue;
+                        thread_data->status = errno;
+                        return 0;
+                } else if (thread_data->stop)
+                        return 0;
+                else if (result == 0)  /* Timeout */
+                        continue;
+
+                /* We need the mutex here because checking for the stop
+                   condition and re-enabling the epoll item need to be done
+                   together as one atomic operation when EPOLL_CTL_DISABLE is
+                   available: */
+                item_data = (struct epoll_item_private *)event_data.data.ptr;
+                pthread_mutex_lock(&item_data->mutex);
+
+                /* Remove the item from the epoll set if we want to stop
+                   handling that event: */
+                if (item_data->stop)
+                        delete_item(item_data->index);
+                else {
+                        /* Clear the data that was written to the other end of
+                           our non-blocking socket: */
+                        do {
+                                if (read(item_data->fd, &socket_data, 1) < 1) {
+                                        if ((errno == EAGAIN) ||
+                                            (errno == EWOULDBLOCK))
+                                                break;
+                                        else
+                                                goto error_unlock;
+                                }
+                        } while (item_data->events & EPOLLET);
+
+                        /* The item was one-shot, so re-enable it: */
+                        event_data.events = item_data->events;
+                        if (epoll_ctl(thread_data->epoll_set,
+                                                  EPOLL_CTL_MOD,
+                                                  item_data->fd,
+                                                  &event_data) < 0)
+                                goto error_unlock;
+                }
+
+                pthread_mutex_unlock(&item_data->mutex);
+        }
+
+error_unlock:
+        thread_data->status = item_data->status = errno;
+        pthread_mutex_unlock(&item_data->mutex);
+        return 0;
+}
+
+/*
+ * A pointer to a write_thread_data structure will be passed as the argument to
+ * the write thread:
+ */
+struct write_thread_data {
+        int stop;
+        int status;  /* Indicates any error encountered by the write thread. */
+        int n_fds;
+        int *fds;
+};
+
+/*
+ * The function executed by the write thread. It writes a single byte to each
+ * socket in turn until the stop condition for this thread is set. If writing to
+ * a socket would block (i.e. errno was EAGAIN), we leave that socket alone for
+ * the moment and just move on to the next socket in the list. We don't care
+ * about the order in which we deliver events to the epoll set. In fact we don't
+ * care about the data we're writing to the pipes at all; we just want to
+ * trigger epoll events:
+ */
+void *write_thread_function(void *function_data)
+{
+        const char data = 'X';
+        int index;
+        struct write_thread_data *thread_data =
+                (struct write_thread_data *)function_data;
+        while (!write_thread_data->stop)
+                for (index = 0;
+                     !thread_data->stop && (index < thread_data->n_fds);
+                     ++index)
+                        if ((write(thread_data->fds[index], &data, 1) < 1) &&
+                                (errno != EAGAIN) &&
+                                (errno != EWOULDBLOCK)) {
+                                write_thread_data->status = errno;
+                                return;
+                        }
+}
+
+/*
+ * Arguments are currently ignored:
+ */
+int main(int argc, char **argv)
+{
+        const int n_read_threads = 100;
+        const int n_epoll_items = 500;
+        int index;
+        int epoll_set = epoll_create1(0);
+        struct write_thread_data write_thread_data = {
+                0, 0, n_epoll_items, malloc(n_epoll_items * sizeof(int))
+        };
+        struct read_thread_data *read_thread_data =
+                malloc(n_read_threads * sizeof(struct read_thread_data));
+        pthread_t *read_threads = malloc(n_read_threads * sizeof(pthread_t));
+        pthread_t write_thread;
+
+        printf("-----------------\n");
+        printf("Runing test_epoll\n");
+        printf("-----------------\n");
+
+        epoll_items = malloc(n_epoll_items * sizeof(struct epoll_item_private));
+
+        if (epoll_set < 0 || epoll_items == 0 || write_thread_data.fds == 0 ||
+                read_thread_data == 0 || read_threads == 0)
+                goto error;
+
+        if (sysconf(_SC_NPROCESSORS_ONLN) < 2) {
+                printf("Error: please run this test on a multi-core system.\n");
+                goto error;
+        }
+
+        /* Create the socket pairs and epoll items: */
+        for (index = 0; index < n_epoll_items; ++index) {
+                int socket_pair[2];
+                struct epoll_event event_data;
+                if (socketpair(AF_UNIX,
+                               SOCK_STREAM | SOCK_NONBLOCK,
+                               0,
+                               socket_pair) < 0)
+                        goto error;
+                write_thread_data.fds[index] = socket_pair[0];
+                epoll_items[index].index = index;
+                epoll_items[index].fd = socket_pair[1];
+                if (pthread_mutex_init(&epoll_items[index].mutex, NULL) != 0)
+                        goto error;
+                /* We always use EPOLLONESHOT because this test is currently
+                   structured to demonstrate the need for EPOLL_CTL_DISABLE,
+                   which only produces useful information in the EPOLLONESHOT
+                   case (without EPOLLONESHOT, calling epoll_ctl with
+                   EPOLL_CTL_DISABLE will never return EBUSY). If support for
+                   testing events without EPOLLONESHOT is desired, it should
+                   probably be implemented in a separate unit test. */
+                epoll_items[index].events = EPOLLIN | EPOLLONESHOT;
+                if (index < n_epoll_items / 2)
+                        epoll_items[index].events |= EPOLLET;
+                epoll_items[index].stop = 0;
+                epoll_items[index].status = 0;
+                epoll_items[index].deleted = 0;
+                event_data.events = epoll_items[index].events;
+                event_data.data.ptr = &epoll_items[index];
+                if (epoll_ctl(epoll_set,
+                              EPOLL_CTL_ADD,
+                              epoll_items[index].fd,
+                              &event_data) < 0)
+                        goto error;
+        }
+
+        /* Create and start the read threads: */
+        for (index = 0; index < n_read_threads; ++index) {
+                read_thread_data[index].stop = 0;
+                read_thread_data[index].status = 0;
+                read_thread_data[index].epoll_set = epoll_set;
+                if (pthread_create(&read_threads[index],
+                                   NULL,
+                                   read_thread_function,
+                                   &read_thread_data[index]) != 0)
+                        goto error;
+        }
+
+        if (pthread_create(&write_thread,
+                           NULL,
+                           write_thread_function,
+                           &write_thread_data) != 0)
+                goto error;
+
+        /* Cancel all event pollers: */
+#ifdef EPOLL_CTL_DISABLE
+        for (index = 0; index < n_epoll_items; ++index) {
+                pthread_mutex_lock(&epoll_items[index].mutex);
+                ++epoll_items[index].stop;
+                if (epoll_ctl(epoll_set,
+                              EPOLL_CTL_DISABLE,
+                              epoll_items[index].fd,
+                              NULL) == 0)
+                        delete_item(index);
+                else if (errno != EBUSY) {
+                        pthread_mutex_unlock(&epoll_items[index].mutex);
+                        goto error;
+                }
+                /* EBUSY means events were being handled; allow the other thread
+                   to delete the item. */
+                pthread_mutex_unlock(&epoll_items[index].mutex);
+        }
+#else
+        for (index = 0; index < n_epoll_items; ++index) {
+                pthread_mutex_lock(&epoll_items[index].mutex);
+                ++epoll_items[index].stop;
+                pthread_mutex_unlock(&epoll_items[index].mutex);
+                /* Wait in case a thread running read_thread_function is
+                   currently executing code between epoll_wait and
+                   pthread_mutex_lock with this item. Note that a longer delay
+                   would make double-deletion less likely (at the expense of
+                   performance), but there is no guarantee that any delay would
+                   ever be sufficient. Note also that we delete all event
+                   pollers at once for testing purposes, but in a real-world
+                   environment we are likely to want to be able to cancel event
+                   pollers at arbitrary times. Therefore we can't improve this
+                   situation by just splitting this loop into two loops
+                   (i.e. signal 'stop' for all items, sleep, and then delete all
+                   items). We also can't fix the problem via EPOLL_CTL_DEL
+                   because that command can't prevent the case where some other
+                   thread is executing read_thread_function within the region
+                   mentioned above: */
+                usleep(1);
+                pthread_mutex_lock(&epoll_items[index].mutex);
+                if (!epoll_items[index].deleted)
+                        delete_item(index);
+                pthread_mutex_unlock(&epoll_items[index].mutex);
+        }
+#endif
+
+        /* Shut down the read threads: */
+        for (index = 0; index < n_read_threads; ++index)
+                __sync_fetch_and_add(&read_thread_data[index].stop, 1);
+        for (index = 0; index < n_read_threads; ++index) {
+                if (pthread_join(read_threads[index], NULL) != 0)
+                        goto error;
+                if (read_thread_data[index].status)
+                        goto error;
+        }
+
+        /* Shut down the write thread: */
+        __sync_fetch_and_add(&write_thread_data.stop, 1);
+        if ((pthread_join(write_thread, NULL) != 0) || write_thread_data.status)
+                goto error;
+
+        /* Check for final error conditions: */
+        for (index = 0; index < n_epoll_items; ++index) {
+                if (epoll_items[index].status != 0)
+                        goto error;
+                if (pthread_mutex_destroy(&epoll_items[index].mutex) < 0)
+                        goto error;
+        }
+        for (index = 0; index < n_epoll_items; ++index)
+                if (epoll_items[index].deleted != 1) {
+                        printf("Error: item data deleted %1d times.\n",
+                                   epoll_items[index].deleted);
+                        goto error;
+                }
+
+        printf("[PASS]\n");
+        return 0;
+
+ error:
+        printf("[FAIL]\n");
+        return errno;
+}
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index c353b4599cec..e59bb63cb089 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1568,8 +1568,7 @@ void mark_page_dirty_in_slot(struct kvm *kvm, struct kvm_memory_slot *memslot,
         if (memslot && memslot->dirty_bitmap) {
                 unsigned long rel_gfn = gfn - memslot->base_gfn;
 
-                /* TODO: introduce set_bit_le() and use it */
-                test_and_set_bit_le(rel_gfn, memslot->dirty_bitmap);
+                set_bit_le(rel_gfn, memslot->dirty_bitmap);
         }
 }