Merge branch 'akpm' (patches from Andrew)

Merge yet more updates from Andrew Morton:

 - a few MM remainders

 - misc things

 - autofs updates

 - signals

 - affs updates

 - ipc

 - nilfs2

 - spelling.txt updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (78 commits)
  mm, x86: fix HIGHMEM64 && PARAVIRT build config for native_pud_clear()
  mm: add arch-independent testcases for RODATA
  hfs: atomically read inode size
  mm: clarify mm_struct.mm_{users,count} documentation
  mm: use mmget_not_zero() helper
  mm: add new mmget() helper
  mm: add new mmgrab() helper
  checkpatch: warn when formats use %Z and suggest %z
  lib/vsprintf.c: remove %Z support
  scripts/spelling.txt: add some typo-words
  scripts/spelling.txt: add "followings" pattern and fix typo instances
  scripts/spelling.txt: add "therfore" pattern and fix typo instances
  scripts/spelling.txt: add "overwriten" pattern and fix typo instances
  scripts/spelling.txt: add "overwritting" pattern and fix typo instances
  scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
  scripts/spelling.txt: add "disassocation" pattern and fix typo instances
  scripts/spelling.txt: add "omited" pattern and fix typo instances
  scripts/spelling.txt: add "explictely" pattern and fix typo instances
  scripts/spelling.txt: add "applys" pattern and fix typo instances
  scripts/spelling.txt: add "configuartion" pattern and fix typo instances
  ...

423 files changed, 1288 insertions, 946 deletions

diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl
index d7fcdc5a4379..0320910b866d 100644
--- a/Documentation/DocBook/libata.tmpl
+++ b/Documentation/DocBook/libata.tmpl
@@ -1020,7 +1020,7 @@ and other resources, etc.
         </itemizedlist>
 
         <para>
-        Of errors detected as above, the followings are not ATA/ATAPI
+        Of errors detected as above, the following are not ATA/ATAPI
         device errors but ATA bus errors and should be handled
         according to <xref linkend="excatATAbusErr"/>.
         </para>
diff --git a/Documentation/acpi/method-customizing.txt b/Documentation/acpi/method-customizing.txt
index 5f55373dd53b..a3f598e141f2 100644
--- a/Documentation/acpi/method-customizing.txt
+++ b/Documentation/acpi/method-customizing.txt
@@ -57,7 +57,7 @@ Note: To get the ACPI debug object output (Store (AAAA, Debug)),
 3. undo your changes
    The "undo" operation is not supported for a new inserted method
    right now, i.e. we can not remove a method currently.
-   For an overrided method, in order to undo your changes, please
+   For an overridden method, in order to undo your changes, please
    save a copy of the method original ASL code in step c) section 1,
    and redo step c) ~ g) to override the method with the original one.
 
diff --git a/Documentation/acpi/method-tracing.txt b/Documentation/acpi/method-tracing.txt
index c2505eefc878..0aba14c8f459 100644
--- a/Documentation/acpi/method-tracing.txt
+++ b/Documentation/acpi/method-tracing.txt
@@ -152,7 +152,7 @@ tracing facility.
         Users can enable/disable this debug tracing feature by executing
         the following command:
             # echo string > /sys/module/acpi/parameters/trace_state
-        Where "string" should be one of the followings:
+        Where "string" should be one of the following:
         "disable"
             Disable the method tracing feature.
         "enable"
diff --git a/Documentation/admin-guide/ras.rst b/Documentation/admin-guide/ras.rst
index 9939348bd4a3..1b90c6f00a92 100644
--- a/Documentation/admin-guide/ras.rst
+++ b/Documentation/admin-guide/ras.rst
@@ -81,7 +81,7 @@ That defines some categories of errors:
   still run, eventually replacing the affected hardware by a hot spare,
   if available.
 
-  Also, when an error happens on an userspace process, it is also possible to
+  Also, when an error happens on a userspace process, it is also possible to
   kill such process and let userspace restart it.
 
 The mechanism for handling non-fatal errors is usually complex and may
diff --git a/Documentation/blockdev/mflash.txt b/Documentation/blockdev/mflash.txt
index 1f610ecf698a..f7e050551487 100644
--- a/Documentation/blockdev/mflash.txt
+++ b/Documentation/blockdev/mflash.txt
@@ -17,7 +17,7 @@ driver and currently works well under standard IDE subsystem. Actually it's
 one chip SSD. IO mode is ATA-like custom mode for the host that doesn't have
 IDE interface.
 
-Followings are brief descriptions about IO mode.
+Following are brief descriptions about IO mode.
 A. IO mode based on ATA protocol and uses some custom command. (read confirm,
 write confirm)
 B. IO mode uses SRAM bus interface.
diff --git a/Documentation/device-mapper/dm-raid.txt b/Documentation/device-mapper/dm-raid.txt
index 0d199353e477..cd2cb2fc85ea 100644
--- a/Documentation/device-mapper/dm-raid.txt
+++ b/Documentation/device-mapper/dm-raid.txt
@@ -319,7 +319,7 @@ Version History
 1.5.2   'mismatch_cnt' is zero unless [last_]sync_action is "check".
 1.6.0   Add discard support (and devices_handle_discard_safely module param).
 1.7.0   Add support for MD RAID0 mappings.
-1.8.0   Explictely check for compatible flags in the superblock metadata
+1.8.0   Explicitly check for compatible flags in the superblock metadata
         and reject to start the raid set if any are set by a newer
         target version, thus avoiding data corruption on a raid set
         with a reshape in progress.
diff --git a/Documentation/devicetree/bindings/mfd/qcom-rpm.txt b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt
index 485bc59fcc48..3c91ad430eea 100644
--- a/Documentation/devicetree/bindings/mfd/qcom-rpm.txt
+++ b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt
@@ -234,7 +234,7 @@ see regulator.txt - with additional custom properties described below:
 - qcom,switch-mode-frequency:
         Usage: required
         Value type: <u32>
-        Definition: Frequency (Hz) of the swith mode power supply;
+        Definition: Frequency (Hz) of the switch mode power supply;
                     must be one of:
                     19200000, 9600000, 6400000, 4800000, 3840000, 3200000,
                     2740000, 2400000, 2130000, 1920000, 1750000, 1600000,
diff --git a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
index 7aa840c8768d..ae4234ca4ee4 100644
--- a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
+++ b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
@@ -1,7 +1,7 @@
 * Marvell Armada 370 / Armada XP / Armada 3700 Ethernet Controller (NETA)
 
 Required properties:
-- compatible: could be one of the followings
+- compatible: could be one of the following:
         "marvell,armada-370-neta"
         "marvell,armada-xp-neta"
         "marvell,armada-3700-neta"
diff --git a/Documentation/devicetree/bindings/opp/opp.txt b/Documentation/devicetree/bindings/opp/opp.txt
index 9f5ca4457b5f..ecdcfb790704 100644
--- a/Documentation/devicetree/bindings/opp/opp.txt
+++ b/Documentation/devicetree/bindings/opp/opp.txt
@@ -136,7 +136,7 @@ Optional properties:
   larger OPP table, based on what version of the hardware we are running on. We
   still can't have multiple nodes with the same opp-hz value in OPP table.
 
-  It's an user defined array containing a hierarchy of hardware version numbers,
+  It's a user defined array containing a hierarchy of hardware version numbers,
   supported by the OPP. For example: a platform with hierarchy of three levels
   of versions (A, B and C), this field should be like <X Y Z>, where X
   corresponds to Version hierarchy A, Y corresponds to version hierarchy B and Z
diff --git a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
index 7c85dca4221a..2fd688c8dbdb 100644
--- a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
@@ -6,7 +6,7 @@ the first two functions being GPIO in and out. The configuration on
 the pins includes drive strength and pull-up.
 
 Required properties:
-- compatible: Should be one of the followings (depending on you SoC):
+- compatible: Should be one of the following (depending on your SoC):
   "allwinner,sun4i-a10-pinctrl"
   "allwinner,sun5i-a10s-pinctrl"
   "allwinner,sun5i-a13-pinctrl"
diff --git a/Documentation/devicetree/bindings/power/pd-samsung.txt b/Documentation/devicetree/bindings/power/pd-samsung.txt
index 7eb9674e9687..549f7dee9b9d 100644
--- a/Documentation/devicetree/bindings/power/pd-samsung.txt
+++ b/Documentation/devicetree/bindings/power/pd-samsung.txt
@@ -23,7 +23,7 @@ Optional Properties:
 - clock-names: The following clocks can be specified:
         - oscclk: Oscillator clock.
         - clkN: Input clocks to the devices in this power domain. These clocks
-                will be reparented to oscclk before swithing power domain off.
+                will be reparented to oscclk before switching power domain off.
                 Their original parent will be brought back after turning on
                 the domain. Maximum of 4 clocks (N = 0 to 3) are supported.
         - asbN: Clocks required by asynchronous bridges (ASB) present in
diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.txt b/Documentation/devicetree/bindings/soc/rockchip/grf.txt
index c6e62cb30712..a0685c209218 100644
--- a/Documentation/devicetree/bindings/soc/rockchip/grf.txt
+++ b/Documentation/devicetree/bindings/soc/rockchip/grf.txt
@@ -10,7 +10,7 @@ From RK3368 SoCs, the GRF is divided into two sections,
 
 Required Properties:
 
-- compatible: GRF should be one of the followings
+- compatible: GRF should be one of the following:
    - "rockchip,rk3036-grf", "syscon": for rk3036
    - "rockchip,rk3066-grf", "syscon": for rk3066
    - "rockchip,rk3188-grf", "syscon": for rk3188
@@ -18,7 +18,7 @@ Required Properties:
    - "rockchip,rk3288-grf", "syscon": for rk3288
    - "rockchip,rk3368-grf", "syscon": for rk3368
    - "rockchip,rk3399-grf", "syscon": for rk3399
-- compatible: PMUGRF should be one of the followings
+- compatible: PMUGRF should be one of the following:
    - "rockchip,rk3368-pmugrf", "syscon": for rk3368
    - "rockchip,rk3399-pmugrf", "syscon": for rk3399
 - compatible: SGRF should be one of the following
diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt
index 4ea29aa9af59..a6600f6dea64 100644
--- a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt
@@ -5,7 +5,7 @@ audio data transfer between devices in the system.
 
 Required properties:
 
-- compatible: should be one of the followings
+- compatible: should be one of the following:
    - "rockchip,rk3066-i2s": for rk3066
    - "rockchip,rk3188-i2s", "rockchip,rk3066-i2s": for rk3188
    - "rockchip,rk3288-i2s", "rockchip,rk3066-i2s": for rk3288
@@ -17,7 +17,7 @@ Required properties:
         Documentation/devicetree/bindings/dma/dma.txt
 - dma-names: should include "tx" and "rx".
 - clocks: a list of phandle + clock-specifer pairs, one for each entry in clock-names.
-- clock-names: should contain followings:
+- clock-names: should contain the following:
    - "i2s_hclk": clock for I2S BUS
    - "i2s_clk" : clock for I2S controller
 - rockchip,playback-channels: max playback channels, if not set, 8 channels default.
diff --git a/Documentation/devicetree/bindings/sound/sun4i-codec.txt b/Documentation/devicetree/bindings/sound/sun4i-codec.txt
index 3033bd8aab0f..3863531d1e6d 100644
--- a/Documentation/devicetree/bindings/sound/sun4i-codec.txt
+++ b/Documentation/devicetree/bindings/sound/sun4i-codec.txt
@@ -14,7 +14,7 @@ Required properties:
 - dma-names: should include "tx" and "rx".
 - clocks: a list of phandle + clock-specifer pairs, one for each entry
   in clock-names.
-- clock-names: should contain followings:
+- clock-names: should contain the following:
    - "apb": the parent APB clock for this controller
    - "codec": the parent module clock
 
diff --git a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt
index f4adc58f82ba..ee21da865771 100644
--- a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt
@@ -5,7 +5,7 @@ audio data transfer between devices in the system.
 
 Required properties:
 
-- compatible: should be one of the followings
+- compatible: should be one of the following:
    - "allwinner,sun4i-a10-i2s"
    - "allwinner,sun6i-a31-i2s"
 - reg: physical base address of the controller and length of memory mapped
@@ -15,7 +15,7 @@ Required properties:
         Documentation/devicetree/bindings/dma/dma.txt
 - dma-names: should include "tx" and "rx".
 - clocks: a list of phandle + clock-specifer pairs, one for each entry in clock-names.
-- clock-names: should contain followings:
+- clock-names: should contain the following:
    - "apb" : clock for the I2S bus interface
    - "mod" : module clock for the I2S controller
 - #sound-dai-cells : Must be equal to 0
diff --git a/Documentation/filesystems/autofs4-mount-control.txt b/Documentation/filesystems/autofs4-mount-control.txt
index 50a3e01a36f8..e5177cb31a04 100644
--- a/Documentation/filesystems/autofs4-mount-control.txt
+++ b/Documentation/filesystems/autofs4-mount-control.txt
@@ -179,6 +179,7 @@ struct autofs_dev_ioctl {
                                  * including this struct */
         __s32 ioctlfd;          /* automount command fd */
 
+        /* Command parameters */
         union {
                 struct args_protover            protover;
                 struct args_protosubver         protosubver;
diff --git a/Documentation/filesystems/autofs4.txt b/Documentation/filesystems/autofs4.txt
index 8fac3fe7b8c9..f10dd590f69f 100644
--- a/Documentation/filesystems/autofs4.txt
+++ b/Documentation/filesystems/autofs4.txt
@@ -65,7 +65,7 @@ directory is a mount trap only if the filesystem is mounted *direct*
 and the root is empty.
 
 Directories created in the root directory are mount traps only if the
-filesystem is mounted  *indirect* and they are empty.
+filesystem is mounted *indirect* and they are empty.
 
 Directories further down the tree depend on the *maxproto* mount
 option and particularly whether it is less than five or not.
@@ -352,7 +352,7 @@ Communicating with autofs: root directory ioctls
 ------------------------------------------------
 
 The root directory of an autofs filesystem will respond to a number of
-ioctls.   The process issuing the ioctl must have the CAP_SYS_ADMIN
+ioctls.  The process issuing the ioctl must have the CAP_SYS_ADMIN
 capability, or must be the automount daemon.
 
 The available ioctl commands are:
@@ -425,8 +425,20 @@ Each ioctl is passed a pointer to an `autofs_dev_ioctl` structure:
                                          * including this struct */
                 __s32 ioctlfd;          /* automount command fd */
 
-                __u32 arg1;             /* Command parameters */
-                __u32 arg2;
+                /* Command parameters */
+                union {
+                        struct args_protover            protover;
+                        struct args_protosubver         protosubver;
+                        struct args_openmount           openmount;
+                        struct args_ready               ready;
+                        struct args_fail                fail;
+                        struct args_setpipefd           setpipefd;
+                        struct args_timeout             timeout;
+                        struct args_requester           requester;
+                        struct args_expire              expire;
+                        struct args_askumount           askumount;
+                        struct args_ismountpoint        ismountpoint;
+                };
 
                 char path[0];
         };
@@ -446,25 +458,22 @@ Commands are:
     set version numbers.
 - **AUTOFS_DEV_IOCTL_OPENMOUNT_CMD**: return an open file descriptor
     on the root of an autofs filesystem.  The filesystem is identified
-    by name and device number, which is stored in `arg1`.  Device
-    numbers for existing filesystems can be found in
+    by name and device number, which is stored in `openmount.devid`.
+    Device numbers for existing filesystems can be found in
     `/proc/self/mountinfo`.
 - **AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD**: same as `close(ioctlfd)`.
 - **AUTOFS_DEV_IOCTL_SETPIPEFD_CMD**: if the filesystem is in
     catatonic mode, this can provide the write end of a new pipe
-    in `arg1` to re-establish communication with a daemon.  The
-    process group of the calling process is used to identify the
+    in `setpipefd.pipefd` to re-establish communication with a daemon.
+    The process group of the calling process is used to identify the
     daemon.
 - **AUTOFS_DEV_IOCTL_REQUESTER_CMD**: `path` should be a
     name within the filesystem that has been auto-mounted on.
-    arg1 is the dev number of the underlying autofs.  On successful
-    return, `arg1` and `arg2` will be the UID and GID of the process
-    which triggered that mount.
-
+    On successful return, `requester.uid` and `requester.gid` will be
+    the UID and GID of the process which triggered that mount.
 - **AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD**: Check if path is a
     mountpoint of a particular type - see separate documentation for
     details.
-
 - **AUTOFS_DEV_IOCTL_PROTOVER_CMD**:
 - **AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD**:
 - **AUTOFS_DEV_IOCTL_READY_CMD**:
@@ -474,7 +483,7 @@ Commands are:
 - **AUTOFS_DEV_IOCTL_EXPIRE_CMD**:
 - **AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD**:  These all have the same
     function as the similarly named **AUTOFS_IOC** ioctls, except
-    that **FAIL** can be given an explicit error number in `arg1`
+    that **FAIL** can be given an explicit error number in `fail.status`
     instead of assuming `ENOENT`, and this **EXPIRE** command
     corresponds to **AUTOFS_IOC_EXPIRE_MULTI**.
 
@@ -512,7 +521,7 @@ always be mounted "shared". e.g.
 
 > `mount --make-shared /autofs/mount/point`
 
-The automount daemon is only able to mange a single mount location for
+The automount daemon is only able to manage a single mount location for
 an autofs filesystem and if mounts on that are not 'shared', other
 locations will not behave as expected.  In particular access to those
 other locations will likely result in the `ELOOP` error
diff --git a/Documentation/filesystems/quota.txt b/Documentation/filesystems/quota.txt
index 29fc01552646..32874b06ebe9 100644
--- a/Documentation/filesystems/quota.txt
+++ b/Documentation/filesystems/quota.txt
@@ -6,7 +6,7 @@ Quota subsystem allows system administrator to set limits on used space and
 number of used inodes (inode is a filesystem structure which is associated with
 each file or directory) for users and/or groups. For both used space and number
 of used inodes there are actually two limits. The first one is called softlimit
-and the second one hardlimit.  An user can never exceed a hardlimit for any
+and the second one hardlimit.  A user can never exceed a hardlimit for any
 resource (unless he has CAP_SYS_RESOURCE capability). User is allowed to exceed
 softlimit but only for limited period of time. This period is called "grace
 period" or "grace time". When grace time is over, user is not able to allocate
diff --git a/Documentation/kselftest.txt b/Documentation/kselftest.txt
index d431dc82c228..5bd590335839 100644
--- a/Documentation/kselftest.txt
+++ b/Documentation/kselftest.txt
@@ -59,14 +59,14 @@ Install selftests
 =================
 
 You can use kselftest_install.sh tool installs selftests in default
-location which is tools/testing/selftests/kselftest or an user specified
+location which is tools/testing/selftests/kselftest or a user specified
 location.
 
 To install selftests in default location:
    $ cd tools/testing/selftests
    $ ./kselftest_install.sh
 
-To install selftests in an user specified location:
+To install selftests in a user specified location:
    $ cd tools/testing/selftests
    $ ./kselftest_install.sh install_dir
 
diff --git a/Documentation/media/dvb-drivers/ci.rst b/Documentation/media/dvb-drivers/ci.rst
index 8124bf5ce5ef..69b07e9d1816 100644
--- a/Documentation/media/dvb-drivers/ci.rst
+++ b/Documentation/media/dvb-drivers/ci.rst
@@ -20,7 +20,7 @@ existing low level CI API.
 ca_zap
 ~~~~~~
 
-An userspace application, like ``ca_zap`` is required to handle encrypted
+A userspace application, like ``ca_zap`` is required to handle encrypted
 MPEG-TS streams.
 
 The ``ca_zap`` userland application is in charge of sending the
diff --git a/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst b/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst
index bf31411fc9df..899fd5c3545e 100644
--- a/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst
+++ b/Documentation/media/uapi/dvb/dvb-frontend-parameters.rst
@@ -9,7 +9,7 @@ frontend parameters
 The kind of parameters passed to the frontend device for tuning depend
 on the kind of hardware you are using.
 
-The struct ``dvb_frontend_parameters`` uses an union with specific
+The struct ``dvb_frontend_parameters`` uses a union with specific
 per-system parameters. However, as newer delivery systems required more
 data, the structure size weren't enough to fit, and just extending its
 size would break the existing applications. So, those parameters were
@@ -23,7 +23,7 @@ So, newer applications should use
 instead, in order to be able to support the newer System Delivery like
 DVB-S2, DVB-T2, DVB-C2, ISDB, etc.
 
-All kinds of parameters are combined as an union in the
+All kinds of parameters are combined as a union in the
 FrontendParameters structure:
 
 
diff --git a/Documentation/memory-hotplug.txt b/Documentation/memory-hotplug.txt
index 5de846d3ecc0..670f3ded0802 100644
--- a/Documentation/memory-hotplug.txt
+++ b/Documentation/memory-hotplug.txt
@@ -114,11 +114,11 @@ config options.
     Memory model -> Sparse Memory  (CONFIG_SPARSEMEM)
     Allow for memory hot-add       (CONFIG_MEMORY_HOTPLUG)
 
-- To enable memory removal, the followings are also necessary
+- To enable memory removal, the following are also necessary
     Allow for memory hot remove    (CONFIG_MEMORY_HOTREMOVE)
     Page Migration                 (CONFIG_MIGRATION)
 
-- For ACPI memory hotplug, the followings are also necessary
+- For ACPI memory hotplug, the following are also necessary
     Memory hotplug (under ACPI Support menu) (CONFIG_ACPI_HOTPLUG_MEMORY)
     This option can be kernel module.
 
diff --git a/Documentation/networking/cdc_mbim.txt b/Documentation/networking/cdc_mbim.txt
index a15ea602aa52..b9482ca10254 100644
--- a/Documentation/networking/cdc_mbim.txt
+++ b/Documentation/networking/cdc_mbim.txt
@@ -38,7 +38,7 @@ Basic usage
 ===========
 
 MBIM functions are inactive when unmanaged. The cdc_mbim driver only
-provides an userspace interface to the MBIM control channel, and will
+provides a userspace interface to the MBIM control channel, and will
 not participate in the management of the function. This implies that a
 userspace MBIM management application always is required to enable a
 MBIM function.
@@ -200,7 +200,7 @@ structure described in section 10.5.29 of [1].
 The DSS VLAN subdevices are used as a practical interface between the
 shared MBIM data channel and a MBIM DSS aware userspace application.
 It is not intended to be presented as-is to an end user. The
-assumption is that an userspace application initiating a DSS session
+assumption is that a userspace application initiating a DSS session
 also takes care of the necessary framing of the DSS data, presenting
 the stream to the end user in an appropriate way for the stream type.
 
diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/scsi/ChangeLog.megaraid_sas
index 00ffdf187f0b..234ddabb23ef 100644
--- a/Documentation/scsi/ChangeLog.megaraid_sas
+++ b/Documentation/scsi/ChangeLog.megaraid_sas
@@ -549,7 +549,7 @@ ii.	Reduced by 1 max cmds sent to FW from Driver to make the reply_q_sz same
 3 Older Version   : 00.00.03.02
 
 i.      Send stop adapter to FW & Dump pending FW cmds before declaring adapter dead.
-        New varible added to set dbg level.
+        New variable added to set dbg level.
 ii.     Disable interrupt made as fn pointer as they are different for 1068 / 1078
 iii.    Frame count optimization. Main frame can contain 2 SGE for 64 bit SGLs and
         3 SGE for 32 bit SGL
diff --git a/Documentation/sound/hd-audio/notes.rst b/Documentation/sound/hd-audio/notes.rst
index 168d0cfab1ce..9eeb9b468706 100644
--- a/Documentation/sound/hd-audio/notes.rst
+++ b/Documentation/sound/hd-audio/notes.rst
@@ -697,7 +697,7 @@ If it's a regression, at best, send alsa-info outputs of both working
 and non-working kernels.  This is really helpful because we can
 compare the codec registers directly.
 
-Send a bug report either the followings:
+Send a bug report either the following:
 
 kernel-bugzilla
     https://bugzilla.kernel.org/
diff --git a/Documentation/vm/userfaultfd.txt b/Documentation/vm/userfaultfd.txt
index fe51a5aa8963..0e5543a920e5 100644
--- a/Documentation/vm/userfaultfd.txt
+++ b/Documentation/vm/userfaultfd.txt
@@ -149,7 +149,7 @@ migration thread in the QEMU running in the destination node will
 receive the page that triggered the userfault and it'll map it as
 usual with the UFFDIO_COPY|ZEROPAGE (without actually knowing if it
 was spontaneously sent by the source or if it was an urgent page
-requested through an userfault).
+requested through a userfault).
 
 By the time the userfaults start, the QEMU in the destination node
 doesn't need to keep any per-page state bitmap relative to the live
diff --git a/MAINTAINERS b/MAINTAINERS
index 6cd8945b9094..846f97aa3508 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7286,6 +7286,7 @@ M:	Masami Hiramatsu <mhiramat@kernel.org>
 S:      Maintained
 F:      Documentation/kprobes.txt
 F:      include/linux/kprobes.h
+F:      include/asm-generic/kprobes.h
 F:      kernel/kprobes.c
 
 KS0108 LCD CONTROLLER DRIVER
diff --git a/arch/Kconfig b/arch/Kconfig
index d0012add6b19..cd211a14a88f 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -29,7 +29,7 @@ config OPROFILE_EVENT_MULTIPLEX
           The number of hardware counters is limited. The multiplexing
           feature enables OProfile to gather more events than counters
           are provided by the hardware. This is realized by switching
-          between events at an user specified time interval.
+          between events at a user specified time interval.
 
           If unsure, say N.
 
diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
index 46e47c088622..d103db5af5ff 100644
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@ -10,3 +10,4 @@ generic-y += preempt.h
 generic-y += sections.h
 generic-y += trace_clock.h
 generic-y += current.h
+generic-y += kprobes.h
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 46bf263c3153..acb4b146a607 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -144,7 +144,7 @@ smp_callin(void)
                 alpha_mv.smp_callin();
 
         /* All kernel threads share the same mm context.  */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
 
         /* inform the notifiers about the new cpu */
diff --git a/arch/arc/include/asm/kprobes.h b/arch/arc/include/asm/kprobes.h
index 944dbedb38b5..00bdbe167615 100644
--- a/arch/arc/include/asm/kprobes.h
+++ b/arch/arc/include/asm/kprobes.h
@@ -9,6 +9,8 @@
 #ifndef _ARC_KPROBES_H
 #define _ARC_KPROBES_H
 
+#include <asm-generic/kprobes.h>
+
 #ifdef CONFIG_KPROBES
 
 typedef u16 kprobe_opcode_t;
@@ -55,6 +57,6 @@ void trap_is_kprobe(unsigned long address, struct pt_regs *regs);
 static void trap_is_kprobe(unsigned long address, struct pt_regs *regs)
 {
 }
-#endif
+#endif /* CONFIG_KPROBES */
 
-#endif
+#endif /* _ARC_KPROBES_H */
diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c
index 2afbafadb6ab..b8e8d3944481 100644
--- a/arch/arc/kernel/smp.c
+++ b/arch/arc/kernel/smp.c
@@ -139,8 +139,8 @@ void start_kernel_secondary(void)
         /* MMU, Caches, Vector Table, Interrupts etc */
         setup_processor();
 
-        atomic_inc(&mm->mm_users);
-        atomic_inc(&mm->mm_count);
+        mmget(mm);
+        mmgrab(mm);
         current->active_mm = mm;
         cpumask_set_cpu(cpu, mm_cpumask(mm));
 
diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c
index 61fd1ce63c56..b6e4f7a7419b 100644
--- a/arch/arc/kernel/unwind.c
+++ b/arch/arc/kernel/unwind.c
@@ -1051,9 +1051,9 @@ int arc_unwind(struct unwind_frame_info *frame)
                 ++ptr;
         }
         if (cie != NULL) {
-                /* get code aligment factor */
+                /* get code alignment factor */
                 state.codeAlign = get_uleb128(&ptr, end);
-                /* get data aligment factor */
+                /* get data alignment factor */
                 state.dataAlign = get_sleb128(&ptr, end);
                 if (state.codeAlign == 0 || state.dataAlign == 0 || ptr >= end)
                         cie = NULL;
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index fc6d541549a2..9150f9732785 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -1196,7 +1196,7 @@ skip:
                 bgt     loop1
 finished:
                 ldmfd   sp!, {r0-r7, r9-r11}
-                mov     r10, #0                 @ swith back to cache level 0
+                mov     r10, #0                 @ switch back to cache level 0
                 mcr     p15, 2, r10, c0, c0, 0  @ select current cache level in cssr
 iflush:
                 mcr     p15, 0, r10, c7, c10, 4 @ DSB
diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h
index 3ea9be559726..59655459da59 100644
--- a/arch/arm/include/asm/kprobes.h
+++ b/arch/arm/include/asm/kprobes.h
@@ -16,6 +16,9 @@
 #ifndef _ARM_KPROBES_H
 #define _ARM_KPROBES_H
 
+#include <asm-generic/kprobes.h>
+
+#ifdef CONFIG_KPROBES
 #include <linux/types.h>
 #include <linux/ptrace.h>
 #include <linux/notifier.h>
@@ -83,4 +86,5 @@ struct arch_optimized_insn {
          */
 };
 
+#endif /* CONFIG_KPROBES */
 #endif /* _ARM_KPROBES_H */
diff --git a/arch/arm/include/asm/mach/flash.h b/arch/arm/include/asm/mach/flash.h
index 4ca69fe2c850..bada3f845a97 100644
--- a/arch/arm/include/asm/mach/flash.h
+++ b/arch/arm/include/asm/mach/flash.h
@@ -22,7 +22,7 @@ struct mtd_info;
  * set_vpp:     method called to enable or disable VPP
  * mmcontrol:   method called to enable or disable Sync. Burst Read in OneNAND
  * parts:       optional array of mtd_partitions for static partitioning
- * nr_parts:    number of mtd_partitions for static partitoning
+ * nr_parts:    number of mtd_partitions for static partitioning
  */
 struct flash_platform_data {
         const char      *map_name;
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 7dd14e8395e6..c6514ce0fcbc 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -371,7 +371,7 @@ asmlinkage void secondary_start_kernel(void)
          * reference and switch to it.
          */
         cpu = smp_processor_id();
-        atomic_inc(&mm->mm_count);
+        mmgrab(mm);
         current->active_mm = mm;
         cpumask_set_cpu(cpu, mm_cpumask(mm));
 
diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
index 6bf626700557..1346b3ab34a5 100644
--- a/arch/arm/mach-omap2/omap_twl.c
+++ b/arch/arm/mach-omap2/omap_twl.c
@@ -1,5 +1,5 @@
 /**
- * OMAP and TWL PMIC specific intializations.
+ * OMAP and TWL PMIC specific initializations.
  *
  * Copyright (C) 2010 Texas Instruments Incorporated.
  * Thara Gopinath
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
index a134d8a13d00..de78109d002d 100644
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
@@ -164,7 +164,7 @@ skip:
         cmp     r3, r10
         bgt     flush_levels
 finished:
-        mov     r10, #0                         @ swith back to cache level 0
+        mov     r10, #0                         @ switch back to cache level 0
         mcr     p15, 2, r10, c0, c0, 0          @ select current cache level in cssr
         dsb     st
         isb
diff --git a/arch/arm/mm/cache-v7m.S b/arch/arm/mm/cache-v7m.S
index 816a7e44e6f1..788486e830d3 100644
--- a/arch/arm/mm/cache-v7m.S
+++ b/arch/arm/mm/cache-v7m.S
@@ -217,7 +217,7 @@ skip:
         cmp     r3, r10
         bgt     flush_levels
 finished:
-        mov     r10, #0                         @ swith back to cache level 0
+        mov     r10, #0                         @ switch back to cache level 0
         write_csselr r10, r3                    @ select current cache level in cssr
         dsb     st
         isb
diff --git a/arch/arm/probes/decode.h b/arch/arm/probes/decode.h
index f9b08ba7fe73..548d622a3159 100644
--- a/arch/arm/probes/decode.h
+++ b/arch/arm/probes/decode.h
@@ -22,6 +22,7 @@
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include <asm/probes.h>
+#include <asm/kprobes.h>
 
 void __init arm_probes_decode_init(void);
 
diff --git a/arch/arm64/include/asm/kprobes.h b/arch/arm64/include/asm/kprobes.h
index 1737aecfcc5e..6deb8d726041 100644
--- a/arch/arm64/include/asm/kprobes.h
+++ b/arch/arm64/include/asm/kprobes.h
@@ -16,6 +16,9 @@
 #ifndef _ARM_KPROBES_H
 #define _ARM_KPROBES_H
 
+#include <asm-generic/kprobes.h>
+
+#ifdef CONFIG_KPROBES
 #include <linux/types.h>
 #include <linux/ptrace.h>
 #include <linux/percpu.h>
@@ -57,4 +60,5 @@ int kprobe_single_step_handler(struct pt_regs *regs, unsigned int esr);
 void kretprobe_trampoline(void);
 void __kprobes *trampoline_probe_handler(struct pt_regs *regs);
 
+#endif /* CONFIG_KPROBES */
 #endif /* _ARM_KPROBES_H */
diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c
index 86032a012388..657977e77ec8 100644
--- a/arch/arm64/kernel/armv8_deprecated.c
+++ b/arch/arm64/kernel/armv8_deprecated.c
@@ -19,6 +19,7 @@
 #include <asm/sysreg.h>
 #include <asm/system_misc.h>
 #include <asm/traps.h>
+#include <asm/kprobes.h>
 #include <linux/uaccess.h>
 #include <asm/cpufeature.h>
 
diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c
index b6badff5a151..3a63954a8b14 100644
--- a/arch/arm64/kernel/insn.c
+++ b/arch/arm64/kernel/insn.c
@@ -31,6 +31,7 @@
 #include <asm/debug-monitors.h>
 #include <asm/fixmap.h>
 #include <asm/insn.h>
+#include <asm/kprobes.h>
 
 #define AARCH64_INSN_SF_BIT     BIT(31)
 #define AARCH64_INSN_N_BIT      BIT(22)
diff --git a/arch/arm64/kernel/probes/decode-insn.h b/arch/arm64/kernel/probes/decode-insn.h
index 76d3f315407f..192ab007bacb 100644
--- a/arch/arm64/kernel/probes/decode-insn.h
+++ b/arch/arm64/kernel/probes/decode-insn.h
@@ -16,6 +16,8 @@
 #ifndef _ARM_KERNEL_KPROBES_ARM64_H
 #define _ARM_KERNEL_KPROBES_ARM64_H
 
+#include <asm/kprobes.h>
+
 /*
  * ARM strongly recommends a limit of 128 bytes between LoadExcl and
  * StoreExcl instructions in a single thread of execution. So keep the
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index a8ec5da530af..827d52d78b67 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -222,7 +222,7 @@ asmlinkage void secondary_start_kernel(void)
          * All kernel threads share the same mm context; grab a
          * reference and switch to it.
          */
-        atomic_inc(&mm->mm_count);
+        mmgrab(mm);
         current->active_mm = mm;
 
         /*
diff --git a/arch/arm64/lib/copy_template.S b/arch/arm64/lib/copy_template.S
index 410fbdb8163f..f5b9210f1c83 100644
--- a/arch/arm64/lib/copy_template.S
+++ b/arch/arm64/lib/copy_template.S
@@ -62,7 +62,7 @@ D_h	.req	x14
         sub     count, count, tmp2
         /*
         * Copy the leading memory data from src to dst in an increasing
-        * address order.By this way,the risk of overwritting the source
+        * address order.By this way,the risk of overwriting the source
         * memory data is eliminated when the distance between src and
         * dst is less than 16. The memory accesses here are alignment.
         */
diff --git a/arch/avr32/include/asm/kprobes.h b/arch/avr32/include/asm/kprobes.h
index 45f563ed73fd..28dfc61ad384 100644
--- a/arch/avr32/include/asm/kprobes.h
+++ b/arch/avr32/include/asm/kprobes.h
@@ -11,10 +11,14 @@
 #ifndef __ASM_AVR32_KPROBES_H
 #define __ASM_AVR32_KPROBES_H
 
+#include <asm-generic/kprobes.h>
+
+#define BREAKPOINT_INSTRUCTION  0xd673  /* breakpoint */
+
+#ifdef CONFIG_KPROBES
 #include <linux/types.h>
 
 typedef u16     kprobe_opcode_t;
-#define BREAKPOINT_INSTRUCTION  0xd673  /* breakpoint */
 #define MAX_INSN_SIZE           2
 #define MAX_STACK_SIZE          64      /* 32 would probably be OK */
 
@@ -46,4 +50,5 @@ extern int kprobe_exceptions_notify(struct notifier_block *self,
 
 #define flush_insn_slot(p)      do { } while (0)
 
+#endif /* CONFIG_KPROBES */
 #endif /* __ASM_AVR32_KPROBES_H */
diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild
index d6fa60b158be..625db8ac815e 100644
--- a/arch/blackfin/include/asm/Kbuild
+++ b/arch/blackfin/include/asm/Kbuild
@@ -46,3 +46,4 @@ generic-y += unaligned.h
 generic-y += user.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c
index 23c4ef5f8bdc..a2e6db2ce811 100644
--- a/arch/blackfin/mach-common/smp.c
+++ b/arch/blackfin/mach-common/smp.c
@@ -307,8 +307,8 @@ void secondary_start_kernel(void)
         local_irq_disable();
 
         /* Attach the new idle task to the global mm. */
-        atomic_inc(&mm->mm_users);
-        atomic_inc(&mm->mm_count);
+        mmget(mm);
+        mmgrab(mm);
         current->active_mm = mm;
 
         preempt_disable();
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index 4e9f57433f3a..82619c32d25b 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -61,3 +61,4 @@ generic-y += user.h
 generic-y += vga.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index 8e4ef321001f..0f5132b08896 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -45,3 +45,4 @@ generic-y += types.h
 generic-y += vga.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild
index 0f5b0d5d313c..c33b46715f65 100644
--- a/arch/frv/include/asm/Kbuild
+++ b/arch/frv/include/asm/Kbuild
@@ -7,3 +7,4 @@ generic-y += mm-arch-hooks.h
 generic-y += preempt.h
 generic-y += trace_clock.h
 generic-y += word-at-a-time.h
+generic-y += kprobes.h
diff --git a/arch/frv/mm/mmu-context.c b/arch/frv/mm/mmu-context.c
index 81757d55a5b5..3473bde77f56 100644
--- a/arch/frv/mm/mmu-context.c
+++ b/arch/frv/mm/mmu-context.c
@@ -188,7 +188,7 @@ int cxn_pin_by_pid(pid_t pid)
                 task_lock(tsk);
                 if (tsk->mm) {
                         mm = tsk->mm;
-                        atomic_inc(&mm->mm_users);
+                        mmget(mm);
                         ret = 0;
                 }
                 task_unlock(tsk);
diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
index 5efd0c87f3c0..341740c3581c 100644
--- a/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@ -74,3 +74,4 @@ generic-y += unaligned.h
 generic-y += vga.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
index a43a7c90e4af..797b64a4b80b 100644
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@ -59,3 +59,4 @@ generic-y += unaligned.h
 generic-y += vga.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/hexagon/kernel/smp.c b/arch/hexagon/kernel/smp.c
index 983bae7d2665..c02a6455839e 100644
--- a/arch/hexagon/kernel/smp.c
+++ b/arch/hexagon/kernel/smp.c
@@ -162,7 +162,7 @@ void start_secondary(void)
         );
 
         /*  Set the memory struct  */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
 
         cpu = smp_processor_id();
diff --git a/arch/ia64/include/asm/kprobes.h b/arch/ia64/include/asm/kprobes.h
index d5505d6f2382..0302b3664789 100644
--- a/arch/ia64/include/asm/kprobes.h
+++ b/arch/ia64/include/asm/kprobes.h
@@ -23,14 +23,19 @@
  * 2005-Apr     Rusty Lynch <rusty.lynch@intel.com> and Anil S Keshavamurthy
  *              <anil.s.keshavamurthy@intel.com> adapted from i386
  */
+#include <asm-generic/kprobes.h>
+#include <asm/break.h>
+
+#define BREAK_INST      (long)(__IA64_BREAK_KPROBE << 6)
+
+#ifdef CONFIG_KPROBES
+
 #include <linux/types.h>
 #include <linux/ptrace.h>
 #include <linux/percpu.h>
-#include <asm/break.h>
 
 #define __ARCH_WANT_KPROBES_INSN_SLOT
 #define MAX_INSN_SIZE   2       /* last half is for kprobe-booster */
-#define BREAK_INST      (long)(__IA64_BREAK_KPROBE << 6)
 #define NOP_M_INST      (long)(1<<27)
 #define BRL_INST(i1, i2) ((long)((0xcL << 37) | /* brl */ \
                                 (0x1L << 12) |  /* many */ \
@@ -124,4 +129,5 @@ extern void invalidate_stacked_regs(void);
 extern void flush_register_stack(void);
 extern void arch_remove_kprobe(struct kprobe *p);
 
-#endif                          /* _ASM_KPROBES_H */
+#endif /* CONFIG_KPROBES */
+#endif /* _ASM_KPROBES_H */
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index c483ece3eb84..d68322966f33 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -994,7 +994,7 @@ cpu_init (void)
          */
         ia64_setreg(_IA64_REG_CR_DCR,  (  IA64_DCR_DP | IA64_DCR_DK | IA64_DCR_DX | IA64_DCR_DR
                                         | IA64_DCR_DA | IA64_DCR_DD | IA64_DCR_LC));
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
         BUG_ON(current->mm);
 
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 4c3b84d8406a..52704f199dd6 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -525,7 +525,7 @@ static int sn_topology_show(struct seq_file *s, void *d)
                                 /* both ends local to this partition */
                                 seq_puts(s, " local");
                         else if (SN_HWPERF_FOREIGN(p))
-                                /* both ends of the link in foreign partiton */
+                                /* both ends of the link in foreign partition */
                                 seq_puts(s, " foreign");
                         else
                                 /* link straddles a partition */
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index 8c24c5e1db66..deb298777df2 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -11,3 +11,4 @@ generic-y += preempt.h
 generic-y += sections.h
 generic-y += trace_clock.h
 generic-y += word-at-a-time.h
+generic-y += kprobes.h
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c
index 136c69f1fb8a..b18bc0bd6544 100644
--- a/arch/m32r/kernel/setup.c
+++ b/arch/m32r/kernel/setup.c
@@ -403,7 +403,7 @@ void __init cpu_init (void)
         printk(KERN_INFO "Initializing CPU#%d\n", cpu_id);
 
         /* Set up and load the per-CPU TSS and LDT */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
         if (current->mm)
                 BUG();
diff --git a/arch/m68k/ifpsp060/src/isp.S b/arch/m68k/ifpsp060/src/isp.S
index 6dccda766e22..b865c1a052ba 100644
--- a/arch/m68k/ifpsp060/src/isp.S
+++ b/arch/m68k/ifpsp060/src/isp.S
@@ -3814,7 +3814,7 @@ CAS2W2_FILLER:
 #       (3) Save current DFC/SFC (ASSUMED TO BE EQUAL!!!); Then set     #
 #           SFC/DFC according to whether exception occurred in user or  #
 #           supervisor mode.                                            #
-#       (4) Use "plpaw" instruction to pre-load ATC with efective       #
+#       (4) Use "plpaw" instruction to pre-load ATC with effective      #
 #           address page(s). THIS SHOULD NOT FAULT!!! The relevant      #
 #           page(s) should have been made resident prior to entering    #
 #           this routine.                                               #
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 6c76d6c24b3d..d4f9ccbfa85c 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -33,3 +33,4 @@ generic-y += trace_clock.h
 generic-y += types.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/metag/include/asm/Kbuild b/arch/metag/include/asm/Kbuild
index d3731f0db73b..f9b9df5d6de9 100644
--- a/arch/metag/include/asm/Kbuild
+++ b/arch/metag/include/asm/Kbuild
@@ -54,3 +54,4 @@ generic-y += user.h
 generic-y += vga.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/metag/kernel/smp.c b/arch/metag/kernel/smp.c
index bad13232de51..c622293254e4 100644
--- a/arch/metag/kernel/smp.c
+++ b/arch/metag/kernel/smp.c
@@ -344,8 +344,8 @@ asmlinkage void secondary_start_kernel(void)
          * All kernel threads share the same mm context; grab a
          * reference and switch to it.
          */
-        atomic_inc(&mm->mm_users);
-        atomic_inc(&mm->mm_count);
+        mmget(mm);
+        mmgrab(mm);
         current->active_mm = mm;
         cpumask_set_cpu(cpu, mm_cpumask(mm));
         enter_lazy_tlb(mm, current);
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
index 6275eb051801..1732ec13b211 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -10,3 +10,4 @@ generic-y += preempt.h
 generic-y += syscalls.h
 generic-y += trace_clock.h
 generic-y += word-at-a-time.h
+generic-y += kprobes.h
diff --git a/arch/mips/include/asm/kprobes.h b/arch/mips/include/asm/kprobes.h
index daba1f9a4f79..291846d9ba83 100644
--- a/arch/mips/include/asm/kprobes.h
+++ b/arch/mips/include/asm/kprobes.h
@@ -22,6 +22,9 @@
 #ifndef _ASM_KPROBES_H
 #define _ASM_KPROBES_H
 
+#include <asm-generic/kprobes.h>
+
+#ifdef CONFIG_KPROBES
 #include <linux/ptrace.h>
 #include <linux/types.h>
 
@@ -94,4 +97,5 @@ struct kprobe_ctlblk {
 extern int kprobe_exceptions_notify(struct notifier_block *self,
                                     unsigned long val, void *data);
 
-#endif                          /* _ASM_KPROBES_H */
+#endif /* CONFIG_KPROBES */
+#endif /* _ASM_KPROBES_H */
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index cb479be31a50..49c6df20672a 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -2232,7 +2232,7 @@ void per_cpu_trap_init(bool is_boot_cpu)
         if (!cpu_data[cpu].asid_cache)
                 cpu_data[cpu].asid_cache = asid_first_version(cpu);
 
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
         BUG_ON(current->mm);
         enter_lazy_tlb(&init_mm, current);
diff --git a/arch/mn10300/include/asm/kprobes.h b/arch/mn10300/include/asm/kprobes.h
index c800b590183a..7abea0bdb549 100644
--- a/arch/mn10300/include/asm/kprobes.h
+++ b/arch/mn10300/include/asm/kprobes.h
@@ -21,13 +21,17 @@
 #ifndef _ASM_KPROBES_H
 #define _ASM_KPROBES_H
 
+#include <asm-generic/kprobes.h>
+
+#define BREAKPOINT_INSTRUCTION  0xff
+
+#ifdef CONFIG_KPROBES
 #include <linux/types.h>
 #include <linux/ptrace.h>
 
 struct kprobe;
 
 typedef unsigned char kprobe_opcode_t;
-#define BREAKPOINT_INSTRUCTION  0xff
 #define MAX_INSN_SIZE 8
 #define MAX_STACK_SIZE 128
 
@@ -47,4 +51,5 @@ extern int kprobe_exceptions_notify(struct notifier_block *self,
 
 extern void arch_remove_kprobe(struct kprobe *p);
 
+#endif /* CONFIG_KPROBES */
 #endif /* _ASM_KPROBES_H */
diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c
index 426173c4b0b9..e65b5cc2fa67 100644
--- a/arch/mn10300/kernel/smp.c
+++ b/arch/mn10300/kernel/smp.c
@@ -589,7 +589,7 @@ static void __init smp_cpu_init(void)
         }
         printk(KERN_INFO "Initializing CPU#%d\n", cpu_id);
 
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
         BUG_ON(current->mm);
 
diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild
index 35b0e883761a..aaa3c218b56c 100644
--- a/arch/nios2/include/asm/Kbuild
+++ b/arch/nios2/include/asm/Kbuild
@@ -62,3 +62,4 @@ generic-y += user.h
 generic-y += vga.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
index fb241757f7f0..fb01873a5aad 100644
--- a/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@ -67,3 +67,4 @@ generic-y += user.h
 generic-y += vga.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/openrisc/kernel/entry.S b/arch/openrisc/kernel/entry.S
index bc6500860f4d..1b7160c79646 100644
--- a/arch/openrisc/kernel/entry.S
+++ b/arch/openrisc/kernel/entry.S
@@ -319,7 +319,7 @@ EXCEPTION_ENTRY(_timer_handler)
         l.j    _ret_from_intr
          l.nop
 
-/* ---[ 0x600: Aligment exception ]-------------------------------------- */
+/* ---[ 0x600: Alignment exception ]-------------------------------------- */
 
 EXCEPTION_ENTRY(_alignment_handler)
         CLEAR_LWA_FLAG(r3)
@@ -331,8 +331,8 @@ EXCEPTION_ENTRY(_alignment_handler)
          l.nop
 
 #if 0
-EXCEPTION_ENTRY(_aligment_handler)
-//        l.mfspr r2,r0,SPR_EEAR_BASE     /* Load the efective addres */
+EXCEPTION_ENTRY(_alignment_handler)
+//        l.mfspr r2,r0,SPR_EEAR_BASE     /* Load the effective address */
         l.addi  r2,r4,0
 //        l.mfspr r5,r0,SPR_EPCR_BASE     /* Load the insn address */
         l.lwz   r5,PT_PC(r1)
diff --git a/arch/openrisc/kernel/head.S b/arch/openrisc/kernel/head.S
index d01b82eace3e..1e87913576e3 100644
--- a/arch/openrisc/kernel/head.S
+++ b/arch/openrisc/kernel/head.S
@@ -325,7 +325,7 @@ _dispatch_do_ipage_fault:
     .org 0x500
         EXCEPTION_HANDLE(_timer_handler)
 
-/* ---[ 0x600: Aligment exception ]-------------------------------------- */
+/* ---[ 0x600: Alignment exception ]-------------------------------------- */
     .org 0x600
         EXCEPTION_HANDLE(_alignment_handler)
 
@@ -640,8 +640,8 @@ _flush_tlb:
 
 /* ========================================[ cache ]=== */
 
-        /* aligment here so we don't change memory offsets with
-         * memory controler defined
+        /* alignment here so we don't change memory offsets with
+         * memory controller defined
          */
         .align 0x2000
 
diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S
index 552544616b9d..00ddb7804be4 100644
--- a/arch/openrisc/kernel/vmlinux.lds.S
+++ b/arch/openrisc/kernel/vmlinux.lds.S
@@ -19,8 +19,8 @@
 
 /* TODO
  *              - clean up __offset & stuff
- *              - change all 8192 aligment to PAGE !!!
- *              - recheck if all aligments are really needed
+ *              - change all 8192 alignment to PAGE !!!
+ *              - recheck if all alignments are really needed
  */
 
 #  define LOAD_OFFSET  PAGE_OFFSET
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index cc70b4116718..a9909c2d04c5 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -28,3 +28,4 @@ generic-y += user.h
 generic-y += vga.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 75dab2871346..67b452b41ff6 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -279,7 +279,7 @@ smp_cpu_init(int cpunum)
         set_cpu_online(cpunum, true);
 
         /* Initialise the idle task for this CPU */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
         BUG_ON(current->mm);
         enter_lazy_tlb(&init_mm, current);
diff --git a/arch/powerpc/boot/dts/fsl/mpc8569mds.dts b/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
index 8e94448f296c..76b2bd6f7742 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
@@ -55,7 +55,7 @@
                                 label = "kernel";
                                 reg = <0x01c00000 0x002e0000>;
                         };
-                        partiton@1ee0000 {
+                        partition@1ee0000 {
                                 label = "dtb";
                                 reg = <0x01ee0000 0x00020000>;
                         };
diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h b/arch/powerpc/include/asm/book3s/64/mmu.h
index d73e9dfa5237..1145dc8e726d 100644
--- a/arch/powerpc/include/asm/book3s/64/mmu.h
+++ b/arch/powerpc/include/asm/book3s/64/mmu.h
@@ -30,7 +30,7 @@ extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];
 
 #ifndef __ASSEMBLY__
 /*
- * ISA 3.0 partiton and process table entry format
+ * ISA 3.0 partition and process table entry format
  */
 struct prtb_entry {
         __be64 prtb0;
diff --git a/arch/powerpc/include/asm/fsl_hcalls.h b/arch/powerpc/include/asm/fsl_hcalls.h
index 3abb58394da4..b889d13547fd 100644
--- a/arch/powerpc/include/asm/fsl_hcalls.h
+++ b/arch/powerpc/include/asm/fsl_hcalls.h
@@ -109,7 +109,7 @@ static inline unsigned int fh_send_nmi(unsigned int vcpu_mask)
 #define FH_DTPROP_MAX_PROPLEN 32768
 
 /**
- * fh_partiton_get_dtprop - get a property from a guest device tree.
+ * fh_partition_get_dtprop - get a property from a guest device tree.
  * @handle: handle of partition whose device tree is to be accessed
  * @dtpath_addr: physical address of device tree path to access
  * @propname_addr: physical address of name of property
diff --git a/arch/powerpc/include/asm/kprobes.h b/arch/powerpc/include/asm/kprobes.h
index d821835ade86..0503c98b2117 100644
--- a/arch/powerpc/include/asm/kprobes.h
+++ b/arch/powerpc/include/asm/kprobes.h
@@ -1,5 +1,8 @@
 #ifndef _ASM_POWERPC_KPROBES_H
 #define _ASM_POWERPC_KPROBES_H
+
+#include <asm-generic/kprobes.h>
+
 #ifdef __KERNEL__
 /*
  *  Kernel Probes (KProbes)
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 893bd7f79be6..573fb3a461b5 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -707,7 +707,7 @@ void start_secondary(void *unused)
         unsigned int cpu = smp_processor_id();
         int i, base;
 
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
 
         smp_store_cpu_info(cpu);
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
index 0899315e1434..0d3002b7e2b4 100644
--- a/arch/powerpc/lib/code-patching.c
+++ b/arch/powerpc/lib/code-patching.c
@@ -14,6 +14,7 @@
 #include <asm/page.h>
 #include <asm/code-patching.h>
 #include <linux/uaccess.h>
+#include <linux/kprobes.h>
 
 
 int patch_instruction(unsigned int *addr, unsigned int instr)
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 8278f43ad4b8..e0f83c204ccc 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -3034,7 +3034,7 @@ static void pnv_ioda_setup_pe_res(struct pnv_ioda_pe *pe,
 /*
  * This function is supposed to be called on basis of PE from top
  * to bottom style. So the the I/O or MMIO segment assigned to
- * parent PE could be overrided by its child PEs if necessary.
+ * parent PE could be overridden by its child PEs if necessary.
  */
 static void pnv_ioda_setup_pe_seg(struct pnv_ioda_pe *pe)
 {
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 0024e451bb36..4d757eaa46bf 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -1020,7 +1020,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
         /* check largest block * page size > max memory hotplug addr */
         max_addr = memory_hotplug_max();
         if (query.largest_available_block < (max_addr >> page_shift)) {
-                dev_dbg(&dev->dev, "can't map partiton max 0x%llx with %u "
+                dev_dbg(&dev->dev, "can't map partition max 0x%llx with %u "
                           "%llu-sized pages\n", max_addr,  query.largest_available_block,
                           1ULL << page_shift);
                 goto out_failed;
diff --git a/arch/powerpc/xmon/ppc-opc.c b/arch/powerpc/xmon/ppc-opc.c
index 6845e91ba04a..954dbf8222d7 100644
--- a/arch/powerpc/xmon/ppc-opc.c
+++ b/arch/powerpc/xmon/ppc-opc.c
@@ -1587,7 +1587,7 @@ extract_tbr (unsigned long insn,
 #define CTX(op, xop)   (OP (op) | (((unsigned long)(xop)) & 0x7))
 #define CTX_MASK CTX(0x3f, 0x7)
 
-/* An User Context form instruction.  */
+/* A User Context form instruction.  */
 #define UCTX(op, xop)  (OP (op) | (((unsigned long)(xop)) & 0x1f))
 #define UCTX_MASK UCTX(0x3f, 0x1f)
 
diff --git a/arch/s390/include/asm/kprobes.h b/arch/s390/include/asm/kprobes.h
index 591e5a5279b0..84c0f9086483 100644
--- a/arch/s390/include/asm/kprobes.h
+++ b/arch/s390/include/asm/kprobes.h
@@ -27,6 +27,11 @@
  * 2005-Dec     Used as a template for s390 by Mike Grundy
  *              <grundym@us.ibm.com>
  */
+#include <asm-generic/kprobes.h>
+
+#define BREAKPOINT_INSTRUCTION  0x0002
+
+#ifdef CONFIG_KPROBES
 #include <linux/types.h>
 #include <linux/ptrace.h>
 #include <linux/percpu.h>
@@ -37,7 +42,6 @@ struct pt_regs;
 struct kprobe;
 
 typedef u16 kprobe_opcode_t;
-#define BREAKPOINT_INSTRUCTION  0x0002
 
 /* Maximum instruction size is 3 (16bit) halfwords: */
 #define MAX_INSN_SIZE           0x0003
@@ -91,4 +95,5 @@ int probe_is_insn_relative_long(u16 *insn);
 
 #define flush_insn_slot(p)      do { } while (0)
 
+#endif /* CONFIG_KPROBES */
 #endif  /* _ASM_S390_KPROBES_H */
diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index 21004aaac69b..bc2b60dcb178 100644
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -73,7 +73,7 @@ void cpu_init(void)
         get_cpu_id(id);
         if (machine_has_cpu_mhz)
                 update_cpu_mhz(NULL);
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
         BUG_ON(current->mm);
         enter_lazy_tlb(&init_mm, current);
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index b4a3e9e06ef2..31bd96e81167 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -350,7 +350,7 @@ static void __add_vtimer(struct vtimer_list *timer, int periodic)
 }
 
 /*
- * add_virt_timer - add an oneshot virtual CPU timer
+ * add_virt_timer - add a oneshot virtual CPU timer
  */
 void add_virt_timer(struct vtimer_list *timer)
 {
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index db3e28ca3ae2..926943a49ea5 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -13,3 +13,4 @@ generic-y += trace_clock.h
 generic-y += xor.h
 generic-y += serial.h
 generic-y += word-at-a-time.h
+generic-y += kprobes.h
diff --git a/arch/score/kernel/traps.c b/arch/score/kernel/traps.c
index 2b22bcf02c27..569ac02f68df 100644
--- a/arch/score/kernel/traps.c
+++ b/arch/score/kernel/traps.c
@@ -336,7 +336,7 @@ void __init trap_init(void)
         set_except_vector(18, handle_dbe);
         flush_icache_range(DEBUG_VECTOR_BASE_ADDR, IRQ_VECTOR_BASE_ADDR);
 
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
         cpu_cache_init();
 }
diff --git a/arch/sh/include/asm/kprobes.h b/arch/sh/include/asm/kprobes.h
index 134f3980e44a..f0986f9b3844 100644
--- a/arch/sh/include/asm/kprobes.h
+++ b/arch/sh/include/asm/kprobes.h
@@ -1,13 +1,16 @@
 #ifndef __ASM_SH_KPROBES_H
 #define __ASM_SH_KPROBES_H
 
+#include <asm-generic/kprobes.h>
+
+#define BREAKPOINT_INSTRUCTION  0xc33a
+
 #ifdef CONFIG_KPROBES
 
 #include <linux/types.h>
 #include <linux/ptrace.h>
 
 typedef insn_size_t kprobe_opcode_t;
-#define BREAKPOINT_INSTRUCTION  0xc33a
 
 #define MAX_INSN_SIZE 16
 #define MAX_STACK_SIZE 64
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index bc3591125df7..04487e8fc9b1 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -99,7 +99,7 @@ static inline void handle_one_irq(unsigned int irq)
                         "mov    %0, r4          \n"
                         "mov    r15, r8         \n"
                         "jsr    @%1             \n"
-                        /* swith to the irq stack */
+                        /* switch to the irq stack */
                         " mov   %2, r15         \n"
                         /* restore the stack (ring zero) */
                         "mov    r8, r15         \n"
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 38e7860845db..edc4769b047e 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -178,8 +178,8 @@ asmlinkage void start_secondary(void)
         struct mm_struct *mm = &init_mm;
 
         enable_mmu();
-        atomic_inc(&mm->mm_count);
-        atomic_inc(&mm->mm_users);
+        mmgrab(mm);
+        mmget(mm);
         current->active_mm = mm;
 #ifdef CONFIG_MMU
         enter_lazy_tlb(mm, current);
diff --git a/arch/sparc/include/asm/kprobes.h b/arch/sparc/include/asm/kprobes.h
index a145d798e112..49f8402035d7 100644
--- a/arch/sparc/include/asm/kprobes.h
+++ b/arch/sparc/include/asm/kprobes.h
@@ -1,13 +1,17 @@
 #ifndef _SPARC64_KPROBES_H
 #define _SPARC64_KPROBES_H
 
+#include <asm-generic/kprobes.h>
+
+#define BREAKPOINT_INSTRUCTION   0x91d02070 /* ta 0x70 */
+#define BREAKPOINT_INSTRUCTION_2 0x91d02071 /* ta 0x71 */
+
+#ifdef CONFIG_KPROBES
 #include <linux/types.h>
 #include <linux/percpu.h>
 
 typedef u32 kprobe_opcode_t;
 
-#define BREAKPOINT_INSTRUCTION   0x91d02070 /* ta 0x70 */
-#define BREAKPOINT_INSTRUCTION_2 0x91d02071 /* ta 0x71 */
 #define MAX_INSN_SIZE 2
 
 #define kretprobe_blacklist_size 0
@@ -48,4 +52,6 @@ int kprobe_exceptions_notify(struct notifier_block *self,
 int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
 asmlinkage void __kprobes kprobe_trap(unsigned long trap_level,
                                       struct pt_regs *regs);
+
+#endif /* CONFIG_KPROBES */
 #endif /* _SPARC64_KPROBES_H */
diff --git a/arch/sparc/include/asm/switch_to_32.h b/arch/sparc/include/asm/switch_to_32.h
index 16f10374feb3..475dd4158ae4 100644
--- a/arch/sparc/include/asm/switch_to_32.h
+++ b/arch/sparc/include/asm/switch_to_32.h
@@ -9,7 +9,7 @@ extern struct thread_info *current_set[NR_CPUS];
  * Flush windows so that the VM switch which follows
  * would not pull the stack from under us.
  *
- * SWITCH_ENTER and SWITH_DO_LAZY_FPU do not work yet (e.g. SMP does not work)
+ * SWITCH_ENTER and SWITCH_DO_LAZY_FPU do not work yet (e.g. SMP does not work)
  * XXX WTF is the above comment? Found in late teen 2.4.x.
  */
 #ifdef CONFIG_SMP
diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index 71e16f2241c2..b99d33797e1d 100644
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -93,7 +93,7 @@ void leon_cpu_pre_online(void *arg)
                              : "memory" /* paranoid */);
 
         /* Attach to the address space of init_task. */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
 
         while (!cpumask_test_cpu(cpuid, &smp_commenced_mask))
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 90a02cb64e20..8e3e13924594 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -122,7 +122,7 @@ void smp_callin(void)
         current_thread_info()->new_child = 0;
 
         /* Attach to the address space of init_task. */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
 
         /* inform the notifiers about the new cpu */
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 9d98e5002a09..7b55c50eabe5 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -93,7 +93,7 @@ void sun4d_cpu_pre_online(void *arg)
         show_leds(cpuid);
 
         /* Attach to the address space of init_task. */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
 
         local_ops->cache_all();
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index 278c40abce82..633c4cf6fdb0 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -59,7 +59,7 @@ void sun4m_cpu_pre_online(void *arg)
                              : "memory" /* paranoid */);
 
         /* Attach to the address space of init_task. */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
 
         while (!cpumask_test_cpu(cpuid, &smp_commenced_mask))
diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
index 4f21df7d4f13..ecddac5a4c96 100644
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
@@ -448,7 +448,7 @@ void trap_init(void)
                 thread_info_offsets_are_bolixed_pete();
 
         /* Attach to the address space of init_task. */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
 
         /* NOTE: Other cpus have this done as they are started
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
index dfc97a47c9a0..e022d7b00390 100644
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
@@ -2837,6 +2837,6 @@ void __init trap_init(void)
         /* Attach to the address space of init_task.  On SMP we
          * do this in smp.c:smp_callin for other cpus.
          */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
 }
diff --git a/arch/sparc/kernel/visemul.c b/arch/sparc/kernel/visemul.c
index c4ac58e483a4..8f35eea2103a 100644
--- a/arch/sparc/kernel/visemul.c
+++ b/arch/sparc/kernel/visemul.c
@@ -30,7 +30,7 @@
 /* 001001011 - two 32-bit merges */
 #define FPMERGE_OPF     0x04b
 
-/* 000110001 - 8-by-16-bit partitoned product  */
+/* 000110001 - 8-by-16-bit partitioned product  */
 #define FMUL8x16_OPF    0x031
 
 /* 000110011 - 8-by-16-bit upper alpha partitioned product  */
diff --git a/arch/tile/include/asm/kprobes.h b/arch/tile/include/asm/kprobes.h
index d8f9a83943b1..4a8b1cadca24 100644
--- a/arch/tile/include/asm/kprobes.h
+++ b/arch/tile/include/asm/kprobes.h
@@ -17,10 +17,13 @@
 #ifndef _ASM_TILE_KPROBES_H
 #define _ASM_TILE_KPROBES_H
 
+#include <asm-generic/kprobes.h>
+
+#ifdef CONFIG_KPROBES
+
 #include <linux/types.h>
 #include <linux/ptrace.h>
 #include <linux/percpu.h>
-
 #include <arch/opcode.h>
 
 #define __ARCH_WANT_KPROBES_INSN_SLOT
@@ -76,4 +79,5 @@ void arch_remove_kprobe(struct kprobe *);
 extern int kprobe_exceptions_notify(struct notifier_block *self,
                              unsigned long val, void *data);
 
+#endif /* CONFIG_KPROBES */
 #endif /* _ASM_TILE_KPROBES_H */
diff --git a/arch/tile/kernel/smpboot.c b/arch/tile/kernel/smpboot.c
index 6c0abaacec33..53ce940a5016 100644
--- a/arch/tile/kernel/smpboot.c
+++ b/arch/tile/kernel/smpboot.c
@@ -160,7 +160,7 @@ static void start_secondary(void)
         __this_cpu_write(current_asid, min_asid);
 
         /* Set up this thread as another owner of the init_mm */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         current->active_mm = &init_mm;
         if (current->mm)
                 BUG();
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index 90c281cd7e1d..e9d42aab76dc 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -25,3 +25,4 @@ generic-y += topology.h
 generic-y += trace_clock.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild
index 5d51ade89f4c..84205fe1cd79 100644
--- a/arch/unicore32/include/asm/Kbuild
+++ b/arch/unicore32/include/asm/Kbuild
@@ -63,3 +63,4 @@ generic-y += user.h
 generic-y += vga.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index c4cba00dbdee..63c1d13aaf9f 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -74,14 +74,6 @@ config EFI_PGT_DUMP
           issues with the mapping of the EFI runtime regions into that
           table.
 
-config DEBUG_RODATA_TEST
-        bool "Testcase for the marking rodata read-only"
-        default y
-        ---help---
-          This option enables a testcase for the setting rodata read-only
-          as well as for the change_page_attr() infrastructure.
-          If in doubt, say "N"
-
 config DEBUG_WX
         bool "Warn on W+X mappings at boot"
         select X86_PTDUMP_CORE
diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
index 872877d930de..e7e1942edff7 100644
--- a/arch/x86/include/asm/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
@@ -90,18 +90,8 @@ void clflush_cache_range(void *addr, unsigned int size);
 
 #define mmio_flush_range(addr, size) clflush_cache_range(addr, size)
 
-extern const int rodata_test_data;
 extern int kernel_set_to_readonly;
 void set_kernel_text_rw(void);
 void set_kernel_text_ro(void);
 
-#ifdef CONFIG_DEBUG_RODATA_TEST
-int rodata_test(void);
-#else
-static inline int rodata_test(void)
-{
-        return 0;
-}
-#endif
-
 #endif /* _ASM_X86_CACHEFLUSH_H */
diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
index eb5deb42484d..49265345d4d2 100644
--- a/arch/x86/include/asm/desc_defs.h
+++ b/arch/x86/include/asm/desc_defs.h
@@ -15,7 +15,7 @@
  * FIXME: Accessing the desc_struct through its fields is more elegant,
  * and should be the one valid thing to do. However, a lot of open code
  * still touches the a and b accessors, and doing this allow us to do it
- * incrementally. We keep the signature as a struct, rather than an union,
+ * incrementally. We keep the signature as a struct, rather than a union,
  * so we can get rid of it transparently in the future -- glommer
  */
 /* 8 byte segment descriptor */
diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
index d1d1e5094c28..200581691c6e 100644
--- a/arch/x86/include/asm/kprobes.h
+++ b/arch/x86/include/asm/kprobes.h
@@ -21,6 +21,12 @@
  *
  * See arch/x86/kernel/kprobes.c for x86 kprobes history.
  */
+
+#include <asm-generic/kprobes.h>
+
+#define BREAKPOINT_INSTRUCTION  0xcc
+
+#ifdef CONFIG_KPROBES
 #include <linux/types.h>
 #include <linux/ptrace.h>
 #include <linux/percpu.h>
@@ -32,7 +38,6 @@ struct pt_regs;
 struct kprobe;
 
 typedef u8 kprobe_opcode_t;
-#define BREAKPOINT_INSTRUCTION  0xcc
 #define RELATIVEJUMP_OPCODE 0xe9
 #define RELATIVEJUMP_SIZE 5
 #define RELATIVECALL_OPCODE 0xe8
@@ -116,4 +121,6 @@ extern int kprobe_exceptions_notify(struct notifier_block *self,
                                     unsigned long val, void *data);
 extern int kprobe_int3_handler(struct pt_regs *regs);
 extern int kprobe_debug_handler(struct pt_regs *regs);
+
+#endif /* CONFIG_KPROBES */
 #endif /* _ASM_X86_KPROBES_H */
diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
index 8f50fb3f04e1..72277b1028a5 100644
--- a/arch/x86/include/asm/pgtable-3level.h
+++ b/arch/x86/include/asm/pgtable-3level.h
@@ -121,7 +121,8 @@ static inline void native_pmd_clear(pmd_t *pmd)
         *(tmp + 1) = 0;
 }
 
-#ifndef CONFIG_SMP
+#if !defined(CONFIG_SMP) || (defined(CONFIG_HIGHMEM64G) && \
+                defined(CONFIG_PARAVIRT))
 static inline void native_pud_clear(pud_t *pudp)
 {
 }
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index bdcdb3b3a219..84c00592d359 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -100,7 +100,6 @@ obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
 obj-$(CONFIG_APB_TIMER)         += apb_timer.o
 
 obj-$(CONFIG_AMD_NB)            += amd_nb.o
-obj-$(CONFIG_DEBUG_RODATA_TEST) += test_rodata.o
 obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o
 
 obj-$(CONFIG_KVM_GUEST)         += kvm.o kvmclock.o
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index f07005e6f461..c64ca5929cb5 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1510,7 +1510,7 @@ void cpu_init(void)
         for (i = 0; i <= IO_BITMAP_LONGS; i++)
                 t->io_bitmap[i] = ~0UL;
 
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         me->active_mm = &init_mm;
         BUG_ON(me->mm);
         enter_lazy_tlb(&init_mm, me);
@@ -1561,7 +1561,7 @@ void cpu_init(void)
         /*
          * Set up and load the per-CPU TSS and LDT
          */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         curr->active_mm = &init_mm;
         BUG_ON(curr->mm);
         enter_lazy_tlb(&init_mm, curr);
diff --git a/arch/x86/kernel/test_rodata.c b/arch/x86/kernel/test_rodata.c
deleted file mode 100644
index 222e84e2432e..000000000000
--- a/arch/x86/kernel/test_rodata.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * test_rodata.c: functional test for mark_rodata_ro function
- *
- * (C) Copyright 2008 Intel Corporation
- * Author: Arjan van de Ven <arjan@linux.intel.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
- * of the License.
- */
-#include <asm/cacheflush.h>
-#include <asm/sections.h>
-#include <asm/asm.h>
-
-int rodata_test(void)
-{
-        unsigned long result;
-        unsigned long start, end;
-
-        /* test 1: read the value */
-        /* If this test fails, some previous testrun has clobbered the state */
-        if (!rodata_test_data) {
-                printk(KERN_ERR "rodata_test: test 1 fails (start data)\n");
-                return -ENODEV;
-        }
-
-        /* test 2: write to the variable; this should fault */
-        /*
-         * If this test fails, we managed to overwrite the data
-         *
-         * This is written in assembly to be able to catch the
-         * exception that is supposed to happen in the correct
-         * case
-         */
-
-        result = 1;
-        asm volatile(
-                "0:     mov %[zero],(%[rodata_test])\n"
-                "       mov %[zero], %[rslt]\n"
-                "1:\n"
-                ".section .fixup,\"ax\"\n"
-                "2:     jmp 1b\n"
-                ".previous\n"
-                _ASM_EXTABLE(0b,2b)
-                : [rslt] "=r" (result)
-                : [rodata_test] "r" (&rodata_test_data), [zero] "r" (0UL)
-        );
-
-
-        if (!result) {
-                printk(KERN_ERR "rodata_test: test data was not read only\n");
-                return -ENODEV;
-        }
-
-        /* test 3: check the value hasn't changed */
-        /* If this test fails, we managed to overwrite the data */
-        if (!rodata_test_data) {
-                printk(KERN_ERR "rodata_test: Test 3 fails (end data)\n");
-                return -ENODEV;
-        }
-        /* test 4: check if the rodata section is 4Kb aligned */
-        start = (unsigned long)__start_rodata;
-        end = (unsigned long)__end_rodata;
-        if (start & (PAGE_SIZE - 1)) {
-                printk(KERN_ERR "rodata_test: .rodata is not 4k aligned\n");
-                return -ENODEV;
-        }
-        if (end & (PAGE_SIZE - 1)) {
-                printk(KERN_ERR "rodata_test: .rodata end is not 4k aligned\n");
-                return -ENODEV;
-        }
-
-        return 0;
-}
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 2fd7586aad4d..1cda35277278 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -4102,7 +4102,7 @@ static void update_permission_bitmask(struct kvm_vcpu *vcpu,
                                  * as a SMAP violation if all of the following
                                  * conditions are ture:
                                  *   - X86_CR4_SMAP is set in CR4
-                                 *   - An user page is accessed
+                                 *   - A user page is accessed
                                  *   - Page fault in kernel mode
                                  *   - if CPL = 3 or X86_EFLAGS_AC is clear
                                  *
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 928d657de829..2b4b53e6793f 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -864,9 +864,6 @@ static noinline int do_test_wp_bit(void)
         return flag;
 }
 
-const int rodata_test_data = 0xC3;
-EXPORT_SYMBOL_GPL(rodata_test_data);
-
 int kernel_set_to_readonly __read_mostly;
 
 void set_kernel_text_rw(void)
@@ -939,7 +936,6 @@ void mark_rodata_ro(void)
         set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
         printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
                 size >> 10);
-        rodata_test();
 
 #ifdef CONFIG_CPA_DEBUG
         printk(KERN_INFO "Testing CPA: undo %lx-%lx\n", start, start + size);
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 97346f987ef2..15173d37f399 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1000,9 +1000,6 @@ void __init mem_init(void)
         mem_init_print_info(NULL);
 }
 
-const int rodata_test_data = 0xC3;
-EXPORT_SYMBOL_GPL(rodata_test_data);
-
 int kernel_set_to_readonly;
 
 void set_kernel_text_rw(void)
@@ -1071,8 +1068,6 @@ void mark_rodata_ro(void)
         all_end = roundup((unsigned long)_brk_end, PMD_SIZE);
         set_memory_nx(text_end, (all_end - text_end) >> PAGE_SHIFT);
 
-        rodata_test();
-
 #ifdef CONFIG_CPA_DEBUG
         printk(KERN_INFO "Testing CPA: undo %lx-%lx\n", start, end);
         set_memory_rw(start, (end-start) >> PAGE_SHIFT);
diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
index 9e9760b20be5..f41408c53fe1 100644
--- a/arch/xtensa/include/asm/Kbuild
+++ b/arch/xtensa/include/asm/Kbuild
@@ -31,3 +31,4 @@ generic-y += topology.h
 generic-y += trace_clock.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
+generic-y += kprobes.h
diff --git a/arch/xtensa/kernel/smp.c b/arch/xtensa/kernel/smp.c
index fc4ad21a5ed4..fcea72019df7 100644
--- a/arch/xtensa/kernel/smp.c
+++ b/arch/xtensa/kernel/smp.c
@@ -135,8 +135,8 @@ void secondary_start_kernel(void)
 
         /* All kernel threads share the same mm context. */
 
-        atomic_inc(&mm->mm_users);
-        atomic_inc(&mm->mm_count);
+        mmget(mm);
+        mmgrab(mm);
         current->active_mm = mm;
         cpumask_set_cpu(cpu, mm_cpumask(mm));
         enter_lazy_tlb(mm, current);
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 82fd0cc394eb..8fab716e4059 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -185,7 +185,7 @@ static struct throtl_grp *sq_to_tg(struct throtl_service_queue *sq)
  * sq_to_td - return throtl_data the specified service queue belongs to
  * @sq: the throtl_service_queue of interest
  *
- * A service_queue can be embeded in either a throtl_grp or throtl_data.
+ * A service_queue can be embedded in either a throtl_grp or throtl_data.
  * Determine the associated throtl_data accordingly and return it.
  */
 static struct throtl_data *sq_to_td(struct throtl_service_queue *sq)
diff --git a/block/bsg.c b/block/bsg.c
index a9a8b8e0446f..74835dbf0c47 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -573,7 +573,7 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         int ret;
         ssize_t bytes_read;
 
-        dprintk("%s: read %Zd bytes\n", bd->name, count);
+        dprintk("%s: read %zd bytes\n", bd->name, count);
 
         bsg_set_block(bd, file);
 
@@ -648,7 +648,7 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
         ssize_t bytes_written;
         int ret;
 
-        dprintk("%s: write %Zd bytes\n", bd->name, count);
+        dprintk("%s: write %zd bytes\n", bd->name, count);
 
         if (unlikely(segment_eq(get_fs(), KERNEL_DS)))
                 return -EINVAL;
@@ -667,7 +667,7 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
         if (!bytes_written || err_block_err(ret))
                 bytes_written = ret;
 
-        dprintk("%s: returning %Zd\n", bd->name, bytes_written);
+        dprintk("%s: returning %zd\n", bd->name, bytes_written);
         return bytes_written;
 }
 
diff --git a/drivers/acpi/acpica/dbconvert.c b/drivers/acpi/acpica/dbconvert.c
index 251f9477a984..857dbc43a9b1 100644
--- a/drivers/acpi/acpica/dbconvert.c
+++ b/drivers/acpi/acpica/dbconvert.c
@@ -242,7 +242,7 @@ acpi_status acpi_db_convert_to_package(char *string, union acpi_object *object)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Convert a typed and tokenized string to an union acpi_object. Typing:
+ * DESCRIPTION: Convert a typed and tokenized string to a union acpi_object. Typing:
  *              1) String objects were surrounded by quotes.
  *              2) Buffer objects were surrounded by parentheses.
  *              3) Package objects were surrounded by brackets "[]".
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 3dbbecf22087..9d14b509529e 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -323,7 +323,7 @@ acpi_ns_check_reference(struct acpi_evaluate_info *info,
 
         /*
          * Check the reference object for the correct reference type (opcode).
-         * The only type of reference that can be converted to an union acpi_object is
+         * The only type of reference that can be converted to a union acpi_object is
          * a reference to a named object (reference class: NAME)
          */
         if (return_object->reference.class == ACPI_REFCLASS_NAME) {
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index 8e365c0e766b..c944ff5c9c3d 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -495,9 +495,9 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info)
         /*
          * Two types of references are supported - those created by Index and
          * ref_of operators. A name reference (AML_NAMEPATH_OP) can be converted
-         * to an union acpi_object, so it is not dereferenced here. A ddb_handle
+         * to a union acpi_object, so it is not dereferenced here. A ddb_handle
          * (AML_LOAD_OP) cannot be dereferenced, nor can it be converted to
-         * an union acpi_object.
+         * a union acpi_object.
          */
         switch (info->return_object->reference.class) {
         case ACPI_REFCLASS_INDEX:
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 8b11d6d385dc..cd4c4271dc4c 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -406,7 +406,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
         }
 
         /*
-         * In IO-APIC mode, use overrided attribute. Two reasons:
+         * In IO-APIC mode, use overridden attribute. Two reasons:
          * 1. BIOS bug in DSDT
          * 2. BIOS uses IO-APIC mode Interrupt Source Override
          *
diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c
index 2b5d0fac81f0..01c94669a2b0 100644
--- a/drivers/acpi/spcr.c
+++ b/drivers/acpi/spcr.c
@@ -46,7 +46,7 @@ static bool qdf2400_erratum_44_present(struct acpi_table_header *h)
  * console is registered and if @earlycon is true, earlycon is set up.
  *
  * When CONFIG_ACPI_SPCR_TABLE is defined, this function should be called
- * from arch inintialization code as soon as the DT/ACPI decision is made.
+ * from arch initialization code as soon as the DT/ACPI decision is made.
  *
  */
 int __init parse_spcr(bool earlycon)
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 4e5bf36c5f46..ef68232b5222 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2034,7 +2034,7 @@ static int speed_down_verdict_cb(struct ata_ering_entry *ent, void *void_arg)
  *      This is to expedite speed down decisions right after device is
  *      initially configured.
  *
- *      The followings are speed down rules.  #1 and #2 deal with
+ *      The following are speed down rules.  #1 and #2 deal with
  *      DUBIOUS errors.
  *
  *      1. If more than one DUBIOUS_ATA_BUS or DUBIOUS_TOUT_HSM errors
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index f1a9198dfe5a..4a610795b585 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -2394,12 +2394,7 @@ static int __init amb_module_init (void)
 {
   PRINTD (DBG_FLOW|DBG_INIT, "init_module");
   
-  // sanity check - cast needed as printk does not support %Zu
-  if (sizeof(amb_mem) != 4*16 + 4*12) {
-    PRINTK (KERN_ERR, "Fix amb_mem (is %lu words).",
-            (unsigned long) sizeof(amb_mem));
-    return -ENOMEM;
-  }
+  BUILD_BUG_ON(sizeof(amb_mem) != 4*16 + 4*12);
   
   show_version();
   
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 623359e407aa..b042ec458544 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -2326,11 +2326,7 @@ static int __init eni_init(void)
 {
         struct sk_buff *skb; /* dummy for sizeof */
 
-        if (sizeof(skb->cb) < sizeof(struct eni_skb_prv)) {
-                printk(KERN_ERR "eni_detect: skb->cb is too small (%Zd < %Zd)\n",
-                    sizeof(skb->cb),sizeof(struct eni_skb_prv));
-                return -EIO;
-        }
+        BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct eni_skb_prv));
         return pci_register_driver(&eni_driver);
 }
 
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 80c2ddcfa92c..22dcab952a24 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -895,7 +895,7 @@ static int fs_open(struct atm_vcc *atm_vcc)
         /* XXX handle qos parameters (rate limiting) ? */
 
         vcc = kmalloc(sizeof(struct fs_vcc), GFP_KERNEL);
-        fs_dprintk (FS_DEBUG_ALLOC, "Alloc VCC: %p(%Zd)\n", vcc, sizeof(struct fs_vcc));
+        fs_dprintk (FS_DEBUG_ALLOC, "Alloc VCC: %p(%zd)\n", vcc, sizeof(struct fs_vcc));
         if (!vcc) {
                 clear_bit(ATM_VF_ADDR, &atm_vcc->flags);
                 return -ENOMEM;
@@ -946,7 +946,7 @@ static int fs_open(struct atm_vcc *atm_vcc)
 
         if (DO_DIRECTION (txtp)) {
                 tc = kmalloc (sizeof (struct fs_transmit_config), GFP_KERNEL);
-                fs_dprintk (FS_DEBUG_ALLOC, "Alloc tc: %p(%Zd)\n",
+                fs_dprintk (FS_DEBUG_ALLOC, "Alloc tc: %p(%zd)\n",
                             tc, sizeof (struct fs_transmit_config));
                 if (!tc) {
                         fs_dprintk (FS_DEBUG_OPEN, "fs: can't alloc transmit_config.\n");
@@ -1185,7 +1185,7 @@ static int fs_send (struct atm_vcc *atm_vcc, struct sk_buff *skb)
         vcc->last_skb = skb;
 
         td = kmalloc (sizeof (struct FS_BPENTRY), GFP_ATOMIC);
-        fs_dprintk (FS_DEBUG_ALLOC, "Alloc transd: %p(%Zd)\n", td, sizeof (struct FS_BPENTRY));
+        fs_dprintk (FS_DEBUG_ALLOC, "Alloc transd: %p(%zd)\n", td, sizeof (struct FS_BPENTRY));
         if (!td) {
                 /* Oops out of mem */
                 return -ENOMEM;
@@ -1492,7 +1492,7 @@ static void top_off_fp (struct fs_dev *dev, struct freepool *fp,
                 fs_dprintk (FS_DEBUG_ALLOC, "Alloc rec-skb: %p(%d)\n", skb, fp->bufsize);
                 if (!skb) break;
                 ne = kmalloc (sizeof (struct FS_BPENTRY), gfp_flags);
-                fs_dprintk (FS_DEBUG_ALLOC, "Alloc rec-d: %p(%Zd)\n", ne, sizeof (struct FS_BPENTRY));
+                fs_dprintk (FS_DEBUG_ALLOC, "Alloc rec-d: %p(%zd)\n", ne, sizeof (struct FS_BPENTRY));
                 if (!ne) {
                         fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p\n", skb);
                         dev_kfree_skb_any (skb);
@@ -1803,7 +1803,7 @@ static int fs_init(struct fs_dev *dev)
         }
         dev->atm_vccs = kcalloc (dev->nchannels, sizeof (struct atm_vcc *),
                                  GFP_KERNEL);
-        fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%Zd)\n",
+        fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%zd)\n",
                     dev->atm_vccs, dev->nchannels * sizeof (struct atm_vcc *));
 
         if (!dev->atm_vccs) {
@@ -1911,7 +1911,7 @@ static int firestream_init_one(struct pci_dev *pci_dev,
                 goto err_out;
 
         fs_dev = kzalloc (sizeof (struct fs_dev), GFP_KERNEL);
-        fs_dprintk (FS_DEBUG_ALLOC, "Alloc fs-dev: %p(%Zd)\n",
+        fs_dprintk (FS_DEBUG_ALLOC, "Alloc fs-dev: %p(%zd)\n",
                     fs_dev, sizeof (struct fs_dev));
         if (!fs_dev)
                 goto err_out;
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 584aa881882b..2bf1ef1c3c78 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -2884,12 +2884,7 @@ static struct pci_driver hrz_driver = {
 /********** module entry **********/
 
 static int __init hrz_module_init (void) {
-  // sanity check - cast is needed since printk does not support %Zu
-  if (sizeof(struct MEMMAP) != 128*1024/4) {
-    PRINTK (KERN_ERR, "Fix struct MEMMAP (is %lu fakewords).",
-            (unsigned long) sizeof(struct MEMMAP));
-    return -ENOMEM;
-  }
+  BUILD_BUG_ON(sizeof(struct MEMMAP) != 128*1024/4);
   
   show_version();
   
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 8640bafeb471..a4fa6c82261e 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -21,7 +21,7 @@
       supports a variety of varients of Interphase ATM PCI (i)Chip adapter 
       card family (See www.iphase.com/products/ClassSheet.cfm?ClassID=ATM) 
       in terms of PHY type, the size of control memory and the size of 
-      packet memory. The followings are the change log and history:
+      packet memory. The following are the change log and history:
      
           Bugfix the Mona's UBR driver.
           Modify the basic memory allocation and dma logic.
diff --git a/drivers/atm/iphase.h b/drivers/atm/iphase.h
index 53ecac5a2161..2beacf2fc1ec 100644
--- a/drivers/atm/iphase.h
+++ b/drivers/atm/iphase.h
@@ -21,7 +21,7 @@
       supports a variety of varients of Interphase ATM PCI (i)Chip adapter 
       card family (See www.iphase.com/products/ClassSheet.cfm?ClassID=ATM) 
       in terms of PHY type, the size of control memory and the size of 
-      packet memory. The followings are the change log and history:
+      packet memory. The following are the change log and history:
      
           Bugfix the Mona's UBR driver.
           Modify the basic memory allocation and dma logic.
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 445505d9ea07..1a9bc51284b0 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1389,7 +1389,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
         if (n < 0)
                 n += lanai_buf_size(&lvcc->rx.buf);
         APRINTK(n >= 0 && n < lanai_buf_size(&lvcc->rx.buf) && !(n & 15),
-            "vcc_rx_aal5: n out of range (%d/%Zu)\n",
+            "vcc_rx_aal5: n out of range (%d/%zu)\n",
             n, lanai_buf_size(&lvcc->rx.buf));
         /* Recover the second-to-last word to get true pdu length */
         if ((x = &end[-2]) < lvcc->rx.buf.start)
@@ -1493,9 +1493,9 @@ static int lanai_get_sized_buffer(struct lanai_dev *lanai,
                 return -ENOMEM;
         if (unlikely(lanai_buf_size(buf) < size))
                 printk(KERN_WARNING DEV_LABEL "(itf %d): wanted %d bytes "
-                    "for %s buffer, got only %Zu\n", lanai->number, size,
+                    "for %s buffer, got only %zu\n", lanai->number, size,
                     name, lanai_buf_size(buf));
-        DPRINTK("Allocated %Zu byte %s buffer\n", lanai_buf_size(buf), name);
+        DPRINTK("Allocated %zu byte %s buffer\n", lanai_buf_size(buf), name);
         return 0;
 }
 
@@ -1586,7 +1586,7 @@ static int service_buffer_allocate(struct lanai_dev *lanai)
             lanai->pci);
         if (unlikely(lanai->service.start == NULL))
                 return -ENOMEM;
-        DPRINTK("allocated service buffer at 0x%08lX, size %Zu(%d)\n",
+        DPRINTK("allocated service buffer at 0x%08lX, size %zu(%d)\n",
             (unsigned long) lanai->service.start,
             lanai_buf_size(&lanai->service),
             lanai_buf_size_cardorder(&lanai->service));
@@ -2467,8 +2467,8 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)
                     (lanai->status & STATUS_LED) ? 1 : 0,
                     (lanai->status & STATUS_GPIN) ? 1 : 0);
         if (left-- == 0)
-                return sprintf(page, "global buffer sizes: service=%Zu, "
-                    "aal0_rx=%Zu\n", lanai_buf_size(&lanai->service),
+                return sprintf(page, "global buffer sizes: service=%zu, "
+                    "aal0_rx=%zu\n", lanai_buf_size(&lanai->service),
                     lanai->naal0 ? lanai_buf_size(&lanai->aal0buf) : 0);
         if (left-- == 0) {
                 get_statistics(lanai);
@@ -2513,7 +2513,7 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)
                 left += sprintf(&page[left], ",\n          rx_AAL=%d",
                     lvcc->rx.atmvcc->qos.aal == ATM_AAL5 ? 5 : 0);
                 if (lvcc->rx.atmvcc->qos.aal == ATM_AAL5)
-                        left += sprintf(&page[left], ", rx_buf_size=%Zu, "
+                        left += sprintf(&page[left], ", rx_buf_size=%zu, "
                             "rx_bad_len=%u,\n          rx_service_trash=%u, "
                             "rx_service_stream=%u, rx_bad_crc=%u",
                             lanai_buf_size(&lvcc->rx.buf),
@@ -2524,7 +2524,7 @@ static int lanai_proc_read(struct atm_dev *atmdev, loff_t *pos, char *page)
         }
         if (lvcc->tx.atmvcc != NULL)
                 left += sprintf(&page[left], ",\n          tx_AAL=%d, "
-                    "tx_buf_size=%Zu, tx_qos=%cBR, tx_backlogged=%c",
+                    "tx_buf_size=%zu, tx_qos=%cBR, tx_backlogged=%c",
                     lvcc->tx.atmvcc->qos.aal == ATM_AAL5 ? 5 : 0,
                     lanai_buf_size(&lvcc->tx.buf),
                     lvcc->tx.atmvcc == lanai->cbrvcc ? 'C' : 'U',
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 304377182c1a..4b52a1690329 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -186,7 +186,7 @@ static void __loop_update_dio(struct loop_device *lo, bool dio)
          *
          * TODO: the above condition may be loosed in the future, and
          * direct I/O may be switched runtime at that time because most
-         * of requests in sane appplications should be PAGE_SIZE algined
+         * of requests in sane applications should be PAGE_SIZE aligned
          */
         if (dio) {
                 if (queue_logical_block_size(lo->lo_queue) >= sb_bsize &&
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index e051fc8aa7d7..cd53771b9ae7 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -655,7 +655,7 @@ static void terminate_monitor(struct cm4000_dev *dev)
  * monitor the card every 50msec. as a side-effect, retrieve the
  * atr once a card is inserted. another side-effect of retrieving the
  * atr is that the card will be powered on, so there is no need to
- * power on the card explictely from the application: the driver
+ * power on the card explicitly from the application: the driver
  * is already doing that for you.
  */
 
@@ -1037,7 +1037,7 @@ release_io:
         clear_bit(LOCK_IO, &dev->flags);
         wake_up_interruptible(&dev->ioq);
 
-        DEBUGP(2, dev, "<- cmm_read returns: rc = %Zi\n",
+        DEBUGP(2, dev, "<- cmm_read returns: rc = %zi\n",
                (rc < 0 ? rc : count));
         return rc < 0 ? rc : count;
 }
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index d7123259143e..d4dbd8d8e524 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -331,7 +331,7 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf,
         }
 
         if ((count < 5) || (count > READ_WRITE_BUFFER_SIZE)) {
-                DEBUGP(2, dev, "<- cm4040_write buffersize=%Zd < 5\n", count);
+                DEBUGP(2, dev, "<- cm4040_write buffersize=%zd < 5\n", count);
                 return -EIO;
         }
 
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 4fa7fcd8af36..f4f866ee54bc 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -603,7 +603,7 @@ static void sonypi_type3_srs(void)
         u16 v16;
         u8  v8;
 
-        /* This model type uses the same initialiazation of
+        /* This model type uses the same initialization of
          * the embedded controller as the type2 models. */
         sonypi_type2_srs();
 
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 579f8263c479..fef39f9f41ee 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -269,7 +269,7 @@ static int deinstantiate_rng(struct device *ctrldev, int state_handle_mask)
                 /*
                  * If the corresponding bit is set, then it means the state
                  * handle was initialized by us, and thus it needs to be
-                 * deintialized as well
+                 * deinitialized as well
                  */
                 if ((1 << sh_idx) & state_handle_mask) {
                         /*
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 551a271353d2..dea04871b50d 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -1228,7 +1228,7 @@ static int __init devfreq_init(void)
 subsys_initcall(devfreq_init);
 
 /*
- * The followings are helper functions for devfreq user device drivers with
+ * The following are helper functions for devfreq user device drivers with
  * OPP framework.
  */
 
diff --git a/drivers/extcon/extcon-rt8973a.c b/drivers/extcon/extcon-rt8973a.c
index 3e882aa107e8..eaa355e7d9e4 100644
--- a/drivers/extcon/extcon-rt8973a.c
+++ b/drivers/extcon/extcon-rt8973a.c
@@ -537,7 +537,7 @@ static void rt8973a_init_dev_type(struct rt8973a_muic_info *info)
                 regmap_update_bits(info->regmap, reg, mask, val);
         }
 
-        /* Check whether RT8973A is auto swithcing mode or not */
+        /* Check whether RT8973A is auto switching mode or not */
         ret = regmap_read(info->regmap, RT8973A_REG_CONTROL1, &data);
         if (ret) {
                 dev_err(info->dev,
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
index f9e3aee6a211..7c2eed76011e 100644
--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -1068,7 +1068,7 @@ static void fw_device_init(struct work_struct *work)
 
         /*
          * Transition the device to running state.  If it got pulled
-         * out from under us while we did the intialization work, we
+         * out from under us while we did the initialization work, we
          * have to shut down the device again here.  Normally, though,
          * fw_node_event will be responsible for shutting it down when
          * necessary.  We have to use the atomic cmpxchg here to avoid
@@ -1231,7 +1231,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
                         break;
 
                 /*
-                 * Do minimal intialization of the device here, the
+                 * Do minimal initialization of the device here, the
                  * rest will happen in fw_device_init().
                  *
                  * Attention:  A lot of things, even fw_device_get(),
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index ef7c8de7060e..ca5f2aa7232d 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -262,7 +262,7 @@ static void kfd_process_notifier_release(struct mmu_notifier *mn,
          * and because the mmu_notifier_unregister function also drop
          * mm_count we need to take an extra count here.
          */
-        atomic_inc(&p->mm->mm_count);
+        mmgrab(p->mm);
         mmu_notifier_unregister_no_release(&p->mmu_notifier, p->mm);
         mmu_notifier_call_srcu(&p->rcu, &kfd_process_destroy_delayed);
 }
diff --git a/drivers/gpu/drm/amd/include/atombios.h b/drivers/gpu/drm/amd/include/atombios.h
index 4a4d3797a6d3..181a2c3c6362 100644
--- a/drivers/gpu/drm/amd/include/atombios.h
+++ b/drivers/gpu/drm/amd/include/atombios.h
@@ -188,7 +188,7 @@
 #define HW_ASSISTED_I2C_STATUS_FAILURE     2
 #define HW_ASSISTED_I2C_STATUS_SUCCESS     1
 
-#pragma pack(1)                                       // BIOS data must use byte aligment
+#pragma pack(1)                                       // BIOS data must use byte alignment
 
 // Define offset to location of ROM header.
 #define OFFSET_TO_POINTER_TO_ATOM_ROM_HEADER         0x00000048L
@@ -4361,7 +4361,7 @@ typedef struct _ATOM_GPIO_PIN_ASSIGNMENT
 // GPIO use to control PCIE_VDDC in certain SLT board
 #define PCIE_VDDC_CONTROL_GPIO_PINID        56
 
-//from SMU7.x, if ucGPIO_ID=PP_AC_DC_SWITCH_GPIO_PINID in GPIO_LUTTable, AC/DC swithing feature is enable
+//from SMU7.x, if ucGPIO_ID=PP_AC_DC_SWITCH_GPIO_PINID in GPIO_LUTTable, AC/DC switching feature is enable
 #define PP_AC_DC_SWITCH_GPIO_PINID          60
 //from SMU7.x, if ucGPIO_ID=VDDC_REGULATOR_VRHOT_GPIO_PINID in GPIO_LUTable, VRHot feature is enable
 #define VDDC_VRHOT_GPIO_PINID               61
@@ -9180,7 +9180,7 @@ typedef struct  _ATOM_POWERPLAY_INFO_V3
 
 /*********************************************************************************/
 
-#pragma pack() // BIOS data must use byte aligment
+#pragma pack() // BIOS data must use byte alignment
 
 #pragma pack(1)
 
@@ -9211,7 +9211,7 @@ typedef struct _ATOM_SERVICE_INFO
 
 
 
-#pragma pack() // BIOS data must use byte aligment
+#pragma pack() // BIOS data must use byte alignment
 
 //
 // AMD ACPI Table
diff --git a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
index 26129972f686..80ed65985af8 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
@@ -89,7 +89,7 @@ enum phm_platform_caps {
         PHM_PlatformCaps_EnableSideportControl,                 /* indicates Sideport can be controlled */
         PHM_PlatformCaps_VideoPlaybackEEUNotification,          /* indicates EEU notification of video start/stop is required */
         PHM_PlatformCaps_TurnOffPll_ASPML1,                     /* PCIE Turn Off PLL in ASPM L1 */
-        PHM_PlatformCaps_EnableHTLinkControl,                   /* indicates HT Link can be controlled by ACPI or CLMC overrided/automated mode. */
+        PHM_PlatformCaps_EnableHTLinkControl,                   /* indicates HT Link can be controlled by ACPI or CLMC overridden/automated mode. */
         PHM_PlatformCaps_PerformanceStateOnly,                  /* indicates only performance power state to be used on current system. */
         PHM_PlatformCaps_ExclusiveModeAlwaysHigh,               /* In Exclusive (3D) mode always stay in High state. */
         PHM_PlatformCaps_DisableMGClockGating,                  /* to disable Medium Grain Clock Gating or not */
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 93381454bdf7..dc4419ada12c 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -220,8 +220,8 @@ drm_connector_detect(struct drm_connector *connector, bool force)
  *    - drm_mode_validate_basic() performs basic sanity checks
  *    - drm_mode_validate_size() filters out modes larger than @maxX and @maxY
  *      (if specified)
- *    - drm_mode_validate_flag() checks the modes againt basic connector
- *      capabilites (interlace_allowed,doublescan_allowed,stereo_allowed)
+ *    - drm_mode_validate_flag() checks the modes against basic connector
+ *      capabilities (interlace_allowed,doublescan_allowed,stereo_allowed)
  *    - the optional &drm_connector_helper_funcs.mode_valid helper can perform
  *      driver and/or hardware specific checks
  *
diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c
index b42c81b42487..7032c542a9b1 100644
--- a/drivers/gpu/drm/i915/i915_gem_render_state.c
+++ b/drivers/gpu/drm/i915/i915_gem_render_state.c
@@ -60,7 +60,7 @@ render_state_get_rodata(const struct intel_engine_cs *engine)
  * this is sufficient as the null state generator makes the final batch
  * with two passes to build command and state separately. At this point
  * the size of both are known and it compacts them by relocating the state
- * right after the commands taking care of aligment so we should sufficient
+ * right after the commands taking care of alignment so we should sufficient
  * space below them for adding new commands.
  */
 #define OUT_BATCH(batch, i, val)                                \
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index 6a8fa085b74e..0115989e324a 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -334,7 +334,7 @@ i915_gem_userptr_init__mm_struct(struct drm_i915_gem_object *obj)
                 mm->i915 = to_i915(obj->base.dev);
 
                 mm->mm = current->mm;
-                atomic_inc(&current->mm->mm_count);
+                mmgrab(current->mm);
 
                 mm->mn = NULL;
 
@@ -507,7 +507,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
                         flags |= FOLL_WRITE;
 
                 ret = -EFAULT;
-                if (atomic_inc_not_zero(&mm->mm_users)) {
+                if (mmget_not_zero(mm)) {
                         down_read(&mm->mmap_sem);
                         while (pinned < npages) {
                                 ret = get_user_pages_remote
diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
index d5ce829b3199..45cf363d25ad 100644
--- a/drivers/gpu/drm/mga/mga_drv.h
+++ b/drivers/gpu/drm/mga/mga_drv.h
@@ -266,7 +266,7 @@ do {									\
 do {                                                                    \
         if (MGA_VERBOSE) {                                              \
                 DRM_INFO("BEGIN_DMA(%d)\n", (n));                       \
-                DRM_INFO("   space=0x%x req=0x%Zx\n",                   \
+                DRM_INFO("   space=0x%x req=0x%zx\n",                   \
                          dev_priv->prim.space, (n) * DMA_BLOCK_SIZE);   \
         }                                                               \
         prim = dev_priv->prim.start;                                    \
@@ -313,7 +313,7 @@ do {									\
 #define DMA_WRITE(offset, val)                                          \
 do {                                                                    \
         if (MGA_VERBOSE)                                                \
-                DRM_INFO("   DMA_WRITE( 0x%08x ) at 0x%04Zx\n",         \
+                DRM_INFO("   DMA_WRITE( 0x%08x ) at 0x%04zx\n",         \
                          (u32)(val), write + (offset) * sizeof(u32));   \
         *(volatile u32 *)(prim + write + (offset) * sizeof(u32)) = val; \
 } while (0)
diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h
index ab89eed9ddd9..4b86e8b45009 100644
--- a/drivers/gpu/drm/radeon/atombios.h
+++ b/drivers/gpu/drm/radeon/atombios.h
@@ -181,7 +181,7 @@
 #define HW_ASSISTED_I2C_STATUS_FAILURE          2
 #define HW_ASSISTED_I2C_STATUS_SUCCESS          1
 
-#pragma pack(1)                                       /* BIOS data must use byte aligment */
+#pragma pack(1)                                       /* BIOS data must use byte alignment */
 
 /*  Define offset to location of ROM header. */
 
@@ -3883,7 +3883,7 @@ typedef struct _ATOM_GPIO_PIN_ASSIGNMENT
 }ATOM_GPIO_PIN_ASSIGNMENT;
 
 //ucGPIO_ID pre-define id for multiple usage
-//from SMU7.x, if ucGPIO_ID=PP_AC_DC_SWITCH_GPIO_PINID in GPIO_LUTTable, AC/DC swithing feature is enable
+//from SMU7.x, if ucGPIO_ID=PP_AC_DC_SWITCH_GPIO_PINID in GPIO_LUTTable, AC/DC switching feature is enable
 #define PP_AC_DC_SWITCH_GPIO_PINID          60
 //from SMU7.x, if ucGPIO_ID=VDDC_REGULATOR_VRHOT_GPIO_PINID in GPIO_LUTable, VRHot feature is enable
 #define VDDC_VRHOT_GPIO_PINID               61
@@ -7909,7 +7909,7 @@ typedef struct  _ATOM_POWERPLAY_INFO_V3
 
 /*********************************************************************************/
 
-#pragma pack() // BIOS data must use byte aligment
+#pragma pack() // BIOS data must use byte alignment
 
 //
 // AMD ACPI Table
diff --git a/drivers/hid/hid-kye.c b/drivers/hid/hid-kye.c
index 0dd1167b2c9b..9c113f62472d 100644
--- a/drivers/hid/hid-kye.c
+++ b/drivers/hid/hid-kye.c
@@ -487,7 +487,7 @@ static __u8 *kye_consumer_control_fixup(struct hid_device *hdev, __u8 *rdesc,
                 unsigned int *rsize, int offset, const char *device_name) {
         /*
          * the fixup that need to be done:
-         *   - change Usage Maximum in the Comsumer Control
+         *   - change Usage Maximum in the Consumer Control
          *     (report ID 3) to a reasonable value
          */
         if (*rsize >= offset + 31 &&
diff --git a/drivers/hwmon/g762.c b/drivers/hwmon/g762.c
index 6dca2fd3d303..6d1208b2b6d2 100644
--- a/drivers/hwmon/g762.c
+++ b/drivers/hwmon/g762.c
@@ -861,7 +861,7 @@ static ssize_t fan1_pulses_store(struct device *dev,
  * (i.e. closed or open-loop).
  *
  * Following documentation about hwmon's sysfs interface, a pwm1_enable node
- * should accept followings:
+ * should accept the following:
  *
  *  0 : no fan speed control (i.e. fan at full speed)
  *  1 : manual fan speed control enabled (use pwm[1-*]) (open-loop)
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index b6940992a6ff..968038482d2f 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -447,7 +447,7 @@ void ide_acpi_get_timing(ide_hwif_t *hwif)
         memcpy(&hwif->acpidata->gtm, out_obj->buffer.pointer,
                sizeof(struct GTM_buffer));
 
-        DEBPRINT("_GTM info: ptr: 0x%p, len: 0x%x, exp.len: 0x%Zx\n",
+        DEBPRINT("_GTM info: ptr: 0x%p, len: 0x%x, exp.len: 0x%zx\n",
                  out_obj->buffer.pointer, out_obj->buffer.length,
                  sizeof(struct GTM_buffer));
 
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 3c1b7974d66d..d8a552b47718 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -1136,7 +1136,7 @@ static ssize_t idetape_chrdev_read(struct file *file, char __user *buf,
         ssize_t ret = 0;
         int rc;
 
-        ide_debug_log(IDE_DBG_FUNC, "count %Zd", count);
+        ide_debug_log(IDE_DBG_FUNC, "count %zd", count);
 
         if (tape->chrdev_dir != IDETAPE_DIR_READ) {
                 if (test_bit(ilog2(IDE_AFLAG_DETECT_BS), &drive->atapi_flags))
@@ -1195,7 +1195,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
         if (tape->write_prot)
                 return -EACCES;
 
-        ide_debug_log(IDE_DBG_FUNC, "count %Zd", count);
+        ide_debug_log(IDE_DBG_FUNC, "count %zd", count);
 
         /* Initialize write operation */
         rc = idetape_init_rw(drive, IDETAPE_DIR_WRITE);
diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c
index f46033984d07..3b19c16a9e45 100644
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@ -185,7 +185,7 @@ static int hfi1_file_open(struct inode *inode, struct file *fp)
         if (fd) {
                 fd->rec_cpu_num = -1; /* no cpu affinity by default */
                 fd->mm = current->mm;
-                atomic_inc(&fd->mm->mm_count);
+                mmgrab(fd->mm);
                 fp->private_data = fd;
         } else {
                 fp->private_data = NULL;
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c
index 92399d3ffd15..06de1cbcf67d 100644
--- a/drivers/infiniband/hw/qib/qib_iba6120.c
+++ b/drivers/infiniband/hw/qib/qib_iba6120.c
@@ -707,7 +707,7 @@ static void qib_6120_clear_freeze(struct qib_devdata *dd)
         /* disable error interrupts, to avoid confusion */
         qib_write_kreg(dd, kr_errmask, 0ULL);
 
-        /* also disable interrupts; errormask is sometimes overwriten */
+        /* also disable interrupts; errormask is sometimes overwritten */
         qib_6120_set_intr_state(dd, 0);
 
         qib_cancel_sends(dd->pport);
diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c
index e55e31a69195..55a18384c22d 100644
--- a/drivers/infiniband/hw/qib/qib_iba7220.c
+++ b/drivers/infiniband/hw/qib/qib_iba7220.c
@@ -1259,7 +1259,7 @@ static void qib_7220_clear_freeze(struct qib_devdata *dd)
         /* disable error interrupts, to avoid confusion */
         qib_write_kreg(dd, kr_errmask, 0ULL);
 
-        /* also disable interrupts; errormask is sometimes overwriten */
+        /* also disable interrupts; errormask is sometimes overwritten */
         qib_7220_set_intr_state(dd, 0);
 
         qib_cancel_sends(dd->pport);
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c
index 9cc97bd42775..12c4208fd701 100644
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@ -2053,7 +2053,7 @@ static void qib_7322_clear_freeze(struct qib_devdata *dd)
                         qib_write_kreg_port(dd->pport + pidx, krp_errmask,
                                             0ULL);
 
-        /* also disable interrupts; errormask is sometimes overwriten */
+        /* also disable interrupts; errormask is sometimes overwritten */
         qib_7322_set_intr_state(dd, 0);
 
         /* clear the freeze, and be sure chip saw it */
diff --git a/drivers/infiniband/sw/rdmavt/mad.c b/drivers/infiniband/sw/rdmavt/mad.c
index f6e99778d7ca..bba241faca61 100644
--- a/drivers/infiniband/sw/rdmavt/mad.c
+++ b/drivers/infiniband/sw/rdmavt/mad.c
@@ -74,9 +74,9 @@ int rvt_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
                     u16 *out_mad_pkey_index)
 {
         /*
-         * MAD processing is quite different between hfi1 and qib. Therfore this
-         * is expected to be provided by the driver. Other drivers in the future
-         * may chose to implement this but it should not be made into a
+         * MAD processing is quite different between hfi1 and qib. Therefore
+         * this is expected to be provided by the driver. Other drivers in the
+         * future may choose to implement this but it should not be made into a
          * requirement.
          */
         if (ibport_num_to_idx(ibdev, port_num) < 0)
diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c
index 44deca88c579..beaf61ce775b 100644
--- a/drivers/input/touchscreen/cyttsp4_core.c
+++ b/drivers/input/touchscreen/cyttsp4_core.c
@@ -202,7 +202,7 @@ static int cyttsp4_si_get_cydata(struct cyttsp4 *cd)
         int rc;
 
         si->si_ofs.cydata_size = si->si_ofs.test_ofs - si->si_ofs.cydata_ofs;
-        dev_dbg(cd->dev, "%s: cydata size: %Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: cydata size: %zd\n", __func__,
                         si->si_ofs.cydata_size);
 
         p = krealloc(si->si_ptrs.cydata, si->si_ofs.cydata_size, GFP_KERNEL);
@@ -430,13 +430,13 @@ static int cyttsp4_si_get_opcfg_data(struct cyttsp4 *cd)
         for (abs = 0; abs < CY_TCH_NUM_ABS; abs++) {
                 dev_dbg(cd->dev, "%s: tch_rec_%s\n", __func__,
                         cyttsp4_tch_abs_string[abs]);
-                dev_dbg(cd->dev, "%s:     ofs =%2Zd\n", __func__,
+                dev_dbg(cd->dev, "%s:     ofs =%2zd\n", __func__,
                         si->si_ofs.tch_abs[abs].ofs);
-                dev_dbg(cd->dev, "%s:     siz =%2Zd\n", __func__,
+                dev_dbg(cd->dev, "%s:     siz =%2zd\n", __func__,
                         si->si_ofs.tch_abs[abs].size);
-                dev_dbg(cd->dev, "%s:     max =%2Zd\n", __func__,
+                dev_dbg(cd->dev, "%s:     max =%2zd\n", __func__,
                         si->si_ofs.tch_abs[abs].max);
-                dev_dbg(cd->dev, "%s:     bofs=%2Zd\n", __func__,
+                dev_dbg(cd->dev, "%s:     bofs=%2zd\n", __func__,
                         si->si_ofs.tch_abs[abs].bofs);
         }
 
@@ -586,62 +586,62 @@ static int cyttsp4_si_get_op_data_ptrs(struct cyttsp4 *cd)
 static void cyttsp4_si_put_log_data(struct cyttsp4 *cd)
 {
         struct cyttsp4_sysinfo *si = &cd->sysinfo;
-        dev_dbg(cd->dev, "%s: cydata_ofs =%4Zd siz=%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: cydata_ofs =%4zd siz=%4zd\n", __func__,
                 si->si_ofs.cydata_ofs, si->si_ofs.cydata_size);
-        dev_dbg(cd->dev, "%s: test_ofs   =%4Zd siz=%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: test_ofs   =%4zd siz=%4zd\n", __func__,
                 si->si_ofs.test_ofs, si->si_ofs.test_size);
-        dev_dbg(cd->dev, "%s: pcfg_ofs   =%4Zd siz=%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: pcfg_ofs   =%4zd siz=%4zd\n", __func__,
                 si->si_ofs.pcfg_ofs, si->si_ofs.pcfg_size);
-        dev_dbg(cd->dev, "%s: opcfg_ofs  =%4Zd siz=%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: opcfg_ofs  =%4zd siz=%4zd\n", __func__,
                 si->si_ofs.opcfg_ofs, si->si_ofs.opcfg_size);
-        dev_dbg(cd->dev, "%s: ddata_ofs  =%4Zd siz=%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: ddata_ofs  =%4zd siz=%4zd\n", __func__,
                 si->si_ofs.ddata_ofs, si->si_ofs.ddata_size);
-        dev_dbg(cd->dev, "%s: mdata_ofs  =%4Zd siz=%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: mdata_ofs  =%4zd siz=%4zd\n", __func__,
                 si->si_ofs.mdata_ofs, si->si_ofs.mdata_size);
 
-        dev_dbg(cd->dev, "%s: cmd_ofs       =%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: cmd_ofs       =%4zd\n", __func__,
                 si->si_ofs.cmd_ofs);
-        dev_dbg(cd->dev, "%s: rep_ofs       =%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: rep_ofs       =%4zd\n", __func__,
                 si->si_ofs.rep_ofs);
-        dev_dbg(cd->dev, "%s: rep_sz        =%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: rep_sz        =%4zd\n", __func__,
                 si->si_ofs.rep_sz);
-        dev_dbg(cd->dev, "%s: num_btns      =%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: num_btns      =%4zd\n", __func__,
                 si->si_ofs.num_btns);
-        dev_dbg(cd->dev, "%s: num_btn_regs  =%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: num_btn_regs  =%4zd\n", __func__,
                 si->si_ofs.num_btn_regs);
-        dev_dbg(cd->dev, "%s: tt_stat_ofs   =%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: tt_stat_ofs   =%4zd\n", __func__,
                 si->si_ofs.tt_stat_ofs);
-        dev_dbg(cd->dev, "%s: tch_rec_size  =%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: tch_rec_size  =%4zd\n", __func__,
                 si->si_ofs.tch_rec_size);
-        dev_dbg(cd->dev, "%s: max_tchs      =%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: max_tchs      =%4zd\n", __func__,
                 si->si_ofs.max_tchs);
-        dev_dbg(cd->dev, "%s: mode_size     =%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: mode_size     =%4zd\n", __func__,
                 si->si_ofs.mode_size);
-        dev_dbg(cd->dev, "%s: data_size     =%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: data_size     =%4zd\n", __func__,
                 si->si_ofs.data_size);
-        dev_dbg(cd->dev, "%s: map_sz        =%4Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: map_sz        =%4zd\n", __func__,
                 si->si_ofs.map_sz);
 
-        dev_dbg(cd->dev, "%s: btn_rec_size   =%2Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: btn_rec_size   =%2zd\n", __func__,
                 si->si_ofs.btn_rec_size);
-        dev_dbg(cd->dev, "%s: btn_diff_ofs   =%2Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: btn_diff_ofs   =%2zd\n", __func__,
                 si->si_ofs.btn_diff_ofs);
-        dev_dbg(cd->dev, "%s: btn_diff_size  =%2Zd\n", __func__,
+        dev_dbg(cd->dev, "%s: btn_diff_size  =%2zd\n", __func__,
                 si->si_ofs.btn_diff_size);
 
-        dev_dbg(cd->dev, "%s: max_x    = 0x%04ZX (%Zd)\n", __func__,
+        dev_dbg(cd->dev, "%s: max_x    = 0x%04zX (%zd)\n", __func__,
                 si->si_ofs.max_x, si->si_ofs.max_x);
-        dev_dbg(cd->dev, "%s: x_origin = %Zd (%s)\n", __func__,
+        dev_dbg(cd->dev, "%s: x_origin = %zd (%s)\n", __func__,
                 si->si_ofs.x_origin,
                 si->si_ofs.x_origin == CY_NORMAL_ORIGIN ?
                 "left corner" : "right corner");
-        dev_dbg(cd->dev, "%s: max_y    = 0x%04ZX (%Zd)\n", __func__,
+        dev_dbg(cd->dev, "%s: max_y    = 0x%04zX (%zd)\n", __func__,
                 si->si_ofs.max_y, si->si_ofs.max_y);
-        dev_dbg(cd->dev, "%s: y_origin = %Zd (%s)\n", __func__,
+        dev_dbg(cd->dev, "%s: y_origin = %zd (%s)\n", __func__,
                 si->si_ofs.y_origin,
                 si->si_ofs.y_origin == CY_NORMAL_ORIGIN ?
                 "upper corner" : "lower corner");
-        dev_dbg(cd->dev, "%s: max_p    = 0x%04ZX (%Zd)\n", __func__,
+        dev_dbg(cd->dev, "%s: max_p    = 0x%04zX (%zd)\n", __func__,
                 si->si_ofs.max_p, si->si_ofs.max_p);
 
         dev_dbg(cd->dev, "%s: xy_mode=%p xy_data=%p\n", __func__,
@@ -1000,7 +1000,7 @@ static int cyttsp4_xy_worker(struct cyttsp4 *cd)
                 dev_dbg(dev, "%s: Large area detected\n", __func__);
 
         if (num_cur_tch > si->si_ofs.max_tchs) {
-                dev_err(dev, "%s: too many tch; set to max tch (n=%d c=%Zd)\n",
+                dev_err(dev, "%s: too many tch; set to max tch (n=%d c=%zd)\n",
                                 __func__, num_cur_tch, si->si_ofs.max_tchs);
                 num_cur_tch = si->si_ofs.max_tchs;
         }
diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c
index cb72e0011310..51f2b228723f 100644
--- a/drivers/iommu/intel-svm.c
+++ b/drivers/iommu/intel-svm.c
@@ -579,7 +579,7 @@ static irqreturn_t prq_event_thread(int irq, void *d)
                 if (!svm->mm)
                         goto bad_req;
                 /* If the mm is already defunct, don't handle faults. */
-                if (!atomic_inc_not_zero(&svm->mm->mm_users))
+                if (!mmget_not_zero(svm->mm))
                         goto bad_req;
                 down_read(&svm->mm->mmap_sem);
                 vma = find_extend_vma(svm->mm, address);
diff --git a/drivers/isdn/hardware/eicon/debug.c b/drivers/isdn/hardware/eicon/debug.c
index 576b7b4a3278..8bc2791bc39c 100644
--- a/drivers/isdn/hardware/eicon/debug.c
+++ b/drivers/isdn/hardware/eicon/debug.c
@@ -2049,7 +2049,7 @@ static int diva_dbg_cmp_key(const char *ref, const char *key) {
 /*
   In case trace filter starts with "C" character then
   all following characters are interpreted as command.
-  Followings commands are available:
+  Following commands are available:
   - single, trace single call at time, independent from CPN/CiPN
 */
 static int diva_mnt_cmp_nmbr(const char *nmbr) {
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index 8d338ba366d0..77dec28ba874 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -1625,7 +1625,7 @@ mISDNipac_init(struct ipac_hw *ipac, void *hw)
                 ipac->hscx[i].bch.hw = hw;
                 ipac->hscx[i].ip = ipac;
                 /* default values for IOM time slots
-                 * can be overwriten by card */
+                 * can be overwritten by card */
                 ipac->hscx[i].slot = (i == 0) ? 0x2f : 0x03;
         }
 
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index 0222b1a35a2d..9b85295aa657 100644
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -115,7 +115,7 @@
  *
  * The CMX has special functions for conferences with one, two and more
  * members. It will allow different types of data flow. Receive and transmit
- * data to/form upper layer may be swithed on/off individually without losing
+ * data to/form upper layer may be switched on/off individually without losing
  * features of CMX, Tones and DTMF.
  *
  * Echo Cancellation: Sometimes we like to cancel echo from the interface.
diff --git a/drivers/media/dvb-core/dvb_ringbuffer.h b/drivers/media/dvb-core/dvb_ringbuffer.h
index bbe94873d44d..8ed6bcc3a56e 100644
--- a/drivers/media/dvb-core/dvb_ringbuffer.h
+++ b/drivers/media/dvb-core/dvb_ringbuffer.h
@@ -136,7 +136,7 @@ extern void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf);
 }
 
 /**
- * dvb_ringbuffer_read_user - Reads a buffer into an user pointer
+ * dvb_ringbuffer_read_user - Reads a buffer into a user pointer
  *
  * @rbuf: pointer to struct dvb_ringbuffer
  * @buf: pointer to the buffer where the data will be stored
@@ -193,7 +193,7 @@ extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf,
                                     size_t len);
 
 /**
- * dvb_ringbuffer_write_user - Writes a buffer received via an user pointer
+ * dvb_ringbuffer_write_user - Writes a buffer received via a user pointer
  *
  * @rbuf: pointer to struct dvb_ringbuffer
  * @buf: pointer to the buffer where the data will be read
diff --git a/drivers/media/dvb-frontends/drx39xyj/drx_driver.h b/drivers/media/dvb-frontends/drx39xyj/drx_driver.h
index 9076bf21cc8a..7a681d8202c7 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drx_driver.h
+++ b/drivers/media/dvb-frontends/drx39xyj/drx_driver.h
@@ -1317,9 +1317,9 @@ struct drx_version_list {
                 DRX_MPEG_STR_WIDTH_8
         };
 
-/* CTRL CFG MPEG ouput */
+/* CTRL CFG MPEG output */
 /**
-* \struct struct drx_cfg_mpeg_output * \brief Configuartion parameters for MPEG output control.
+* \struct struct drx_cfg_mpeg_output * \brief Configuration parameters for MPEG output control.
 *
 * Used by DRX_CFG_MPEG_OUTPUT, in combination with DRX_CTRL_SET_CFG and
 * DRX_CTRL_GET_CFG.
diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c
index f1c3e3b09b65..daeaf965dd56 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drxj.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c
@@ -601,7 +601,7 @@ static struct drxj_data drxj_data_g = {
         0,                      /* hi_cfg_wake_up_key    */
         0,                      /* hi_cfg_ctrl         */
         0,                      /* HICfgTimeout      */
-        /* UIO configuartion */
+        /* UIO configuration */
         DRX_UIO_MODE_DISABLE,   /* uio_sma_rx_mode      */
         DRX_UIO_MODE_DISABLE,   /* uio_sma_tx_mode      */
         DRX_UIO_MODE_DISABLE,   /* uioASELMode       */
@@ -619,7 +619,7 @@ static struct drxj_data drxj_data_g = {
 /*   false,                  * flagHDevSet       */
 /*   (u16) 0xFFF,          * rdsLastCount      */
 
-        /* ATV configuartion */
+        /* ATV configuration */
         0UL,                    /* flags cfg changes */
         /* shadow of ATV_TOP_EQU0__A */
         {-5,
@@ -3352,7 +3352,7 @@ rw_error:
 /*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*/
-/* miscellaneous configuartions - begin                           */
+/* miscellaneous configurations - begin                           */
 /*----------------------------------------------------------------------------*/
 
 /**
@@ -3515,7 +3515,7 @@ rw_error:
 }
 
 /*----------------------------------------------------------------------------*/
-/* miscellaneous configuartions - end                             */
+/* miscellaneous configurations - end                             */
 /*----------------------------------------------------------------------------*/
 
 /*----------------------------------------------------------------------------*/
@@ -10952,7 +10952,7 @@ rw_error:
 
 static void drxj_reset_mode(struct drxj_data *ext_attr)
 {
-        /* Initialize default AFE configuartion for QAM */
+        /* Initialize default AFE configuration for QAM */
         if (ext_attr->has_lna) {
                 /* IF AGC off, PGA active */
 #ifndef DRXJ_VSB_ONLY
@@ -10996,7 +10996,7 @@ static void drxj_reset_mode(struct drxj_data *ext_attr)
         ext_attr->qam_pre_saw_cfg.reference = 0x07;
         ext_attr->qam_pre_saw_cfg.use_pre_saw = true;
 #endif
-        /* Initialize default AFE configuartion for VSB */
+        /* Initialize default AFE configuration for VSB */
         ext_attr->vsb_rf_agc_cfg.standard = DRX_STANDARD_8VSB;
         ext_attr->vsb_rf_agc_cfg.ctrl_mode = DRX_AGC_CTRL_AUTO;
         ext_attr->vsb_rf_agc_cfg.min_output_level = 0;
@@ -11072,9 +11072,9 @@ ctrl_power_mode(struct drx_demod_instance *demod, enum drx_power_mode *mode)
         }
 
         if ((*mode == DRX_POWER_UP)) {
-                /* Restore analog & pin configuartion */
+                /* Restore analog & pin configuration */
 
-                /* Initialize default AFE configuartion for VSB */
+                /* Initialize default AFE configuration for VSB */
                 drxj_reset_mode(ext_attr);
         } else {
                 /* Power down to requested mode */
diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.h b/drivers/media/dvb-frontends/drx39xyj/drxj.h
index 55ad535197d2..6c5b8f78f9f6 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drxj.h
+++ b/drivers/media/dvb-frontends/drx39xyj/drxj.h
@@ -447,7 +447,7 @@ struct drxj_cfg_atv_output {
                 u16 hi_cfg_ctrl;          /**< HI Configure() parameter 5                       */
                 u16 hi_cfg_transmit;      /**< HI Configure() parameter 6                       */
 
-                /* UIO configuartion */
+                /* UIO configuration */
                 enum drxuio_mode uio_sma_rx_mode;/**< current mode of SmaRx pin                        */
                 enum drxuio_mode uio_sma_tx_mode;/**< current mode of SmaTx pin                        */
                 enum drxuio_mode uio_gpio_mode; /**< current mode of ASEL pin                         */
@@ -459,7 +459,7 @@ struct drxj_cfg_atv_output {
                 /* IQM RC frequecy shift */
                 u32 iqm_rc_rate_ofs;       /**< frequency shifter setting after setchannel      */
 
-                /* ATV configuartion */
+                /* ATV configuration */
                 u32 atv_cfg_changed_flags; /**< flag: flags cfg changes */
                 s16 atv_top_equ0[DRXJ_COEF_IDX_MAX];         /**< shadow of ATV_TOP_EQU0__A */
                 s16 atv_top_equ1[DRXJ_COEF_IDX_MAX];         /**< shadow of ATV_TOP_EQU1__A */
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
index 15d2cac588b1..7e1bbbaad625 100644
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -1626,7 +1626,7 @@ static int ctrl_power_mode(struct drxk_state *state, enum drx_power_mode *mode)
         }
 
         if (*mode == DRX_POWER_UP) {
-                /* Restore analog & pin configuartion */
+                /* Restore analog & pin configuration */
         } else {
                 /* Power down to requested mode */
                 /* Backup some register settings */
diff --git a/drivers/media/dvb-frontends/helene.c b/drivers/media/dvb-frontends/helene.c
index ef35c2b30ea3..4bf5a551ba40 100644
--- a/drivers/media/dvb-frontends/helene.c
+++ b/drivers/media/dvb-frontends/helene.c
@@ -309,7 +309,7 @@ static int helene_write_regs(struct helene_priv *priv,
 
         if (len + 1 > sizeof(buf)) {
                 dev_warn(&priv->i2c->dev,
-                                "wr reg=%04x: len=%d vs %Zu is too big!\n",
+                                "wr reg=%04x: len=%d vs %zu is too big!\n",
                                 reg, len + 1, sizeof(buf));
                 return -E2BIG;
         }
diff --git a/drivers/media/dvb-frontends/or51132.c b/drivers/media/dvb-frontends/or51132.c
index 4b67d7e0116d..62aa00767015 100644
--- a/drivers/media/dvb-frontends/or51132.c
+++ b/drivers/media/dvb-frontends/or51132.c
@@ -133,7 +133,7 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware
         u32 firmwareAsize, firmwareBsize;
         int i,ret;
 
-        dprintk("Firmware is %Zd bytes\n",fw->size);
+        dprintk("Firmware is %zd bytes\n",fw->size);
 
         /* Get size of firmware A and B */
         firmwareAsize = le32_to_cpu(*((__le32*)fw->data));
diff --git a/drivers/media/dvb-frontends/tda10048.c b/drivers/media/dvb-frontends/tda10048.c
index 92ab34c3e0be..143b39b5f6c9 100644
--- a/drivers/media/dvb-frontends/tda10048.c
+++ b/drivers/media/dvb-frontends/tda10048.c
@@ -499,7 +499,7 @@ static int tda10048_firmware_upload(struct dvb_frontend *fe)
                         __func__);
                 return -EIO;
         } else {
-                printk(KERN_INFO "%s: firmware read %Zu bytes.\n",
+                printk(KERN_INFO "%s: firmware read %zu bytes.\n",
                         __func__,
                         fw->size);
                 ret = 0;
diff --git a/drivers/media/i2c/adv7183_regs.h b/drivers/media/i2c/adv7183_regs.h
index 843d4998435e..4ade89d33d62 100644
--- a/drivers/media/i2c/adv7183_regs.h
+++ b/drivers/media/i2c/adv7183_regs.h
@@ -83,7 +83,7 @@
 #define ADV7183_LETTERBOX_3        0x9D /* Letterbox 3 */
 #define ADV7183_CRC_EN             0xB2 /* CRC enable */
 #define ADV7183_ADC_SWITCH_1       0xC3 /* ADC switch 1 */
-#define ADV7183_ADC_SWITCH_2       0xC4 /* ADC swithc 2 */
+#define ADV7183_ADC_SWITCH_2       0xC4 /* ADC switch 2 */
 #define ADV7183_LETTERBOX_CTRL_1   0xDC /* Letterbox control 1 */
 #define ADV7183_LETTERBOX_CTRL_2   0xDD /* Letterbox control 2 */
 #define ADV7183_SD_OFFSET_CB       0xE1 /* SD offset Cb */
diff --git a/drivers/media/pci/saa7164/saa7164-fw.c b/drivers/media/pci/saa7164/saa7164-fw.c
index 4ba5eade7ce2..ef4906406ebf 100644
--- a/drivers/media/pci/saa7164/saa7164-fw.c
+++ b/drivers/media/pci/saa7164/saa7164-fw.c
@@ -422,7 +422,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
                         return -ENOMEM;
                 }
 
-                printk(KERN_INFO "%s() firmware read %Zu bytes.\n",
+                printk(KERN_INFO "%s() firmware read %zu bytes.\n",
                         __func__, fw->size);
 
                 if (fw->size != fwlength) {
diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/platform/exynos4-is/fimc-core.h
index 5615fefbf7af..c0373aede81a 100644
--- a/drivers/media/platform/exynos4-is/fimc-core.h
+++ b/drivers/media/platform/exynos4-is/fimc-core.h
@@ -358,7 +358,7 @@ struct fimc_pix_limit {
  * @pix_limit: pixel size constraints for the scaler
  * @min_inp_pixsize: minimum input pixel size
  * @min_out_pixsize: minimum output pixel size
- * @hor_offs_align: horizontal pixel offset aligment
+ * @hor_offs_align: horizontal pixel offset alignment
  * @min_vsize_align: minimum vertical pixel size alignment
  */
 struct fimc_variant {
diff --git a/drivers/media/tuners/xc5000.c b/drivers/media/tuners/xc5000.c
index 0345b274eccc..91947cf1950e 100644
--- a/drivers/media/tuners/xc5000.c
+++ b/drivers/media/tuners/xc5000.c
@@ -1144,7 +1144,7 @@ static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe, int force)
                         pr_err("xc5000: Upload failed. rc %d\n", ret);
                         return ret;
                 }
-                dprintk(1, "firmware read %Zu bytes.\n", fw->size);
+                dprintk(1, "firmware read %zu bytes.\n", fw->size);
 
                 if (fw->size != desired_fw->size) {
                         pr_err("xc5000: Firmware file with incorrect size\n");
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
index 81d7fd4f7776..85ab3fa48f9a 100644
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
@@ -2414,7 +2414,7 @@ static int stk9090m_frontend_attach(struct dvb_usb_adapter *adap)
                 deb_info("%s: Upload failed. (file not found?)\n", __func__);
                 return -ENODEV;
         } else {
-                deb_info("%s: firmware read %Zu bytes.\n", __func__, state->frontend_firmware->size);
+                deb_info("%s: firmware read %zu bytes.\n", __func__, state->frontend_firmware->size);
         }
         stk9090m_config.microcode_B_fe_size = state->frontend_firmware->size;
         stk9090m_config.microcode_B_fe_buffer = state->frontend_firmware->data;
@@ -2480,7 +2480,7 @@ static int nim9090md_frontend_attach(struct dvb_usb_adapter *adap)
                 deb_info("%s: Upload failed. (file not found?)\n", __func__);
                 return -EIO;
         } else {
-                deb_info("%s: firmware read %Zu bytes.\n", __func__, state->frontend_firmware->size);
+                deb_info("%s: firmware read %zu bytes.\n", __func__, state->frontend_firmware->size);
         }
         nim9090md_config[0].microcode_B_fe_size = state->frontend_firmware->size;
         nim9090md_config[0].microcode_B_fe_buffer = state->frontend_firmware->data;
diff --git a/drivers/media/usb/gspca/t613.c b/drivers/media/usb/gspca/t613.c
index 42667710af92..46fb76349000 100644
--- a/drivers/media/usb/gspca/t613.c
+++ b/drivers/media/usb/gspca/t613.c
@@ -570,9 +570,9 @@ static void setfreq(struct gspca_dev *gspca_dev, s32 val)
 /* this function is called at probe and resume time */
 static int sd_init(struct gspca_dev *gspca_dev)
 {
-        /* some of this registers are not really neded, because
-         * they are overriden by setbrigthness, setcontrast, etc,
-         * but wont hurt anyway, and can help someone with similar webcam
+        /* some of this registers are not really needed, because
+         * they are overridden by setbrigthness, setcontrast, etc.,
+         * but won't hurt anyway, and can help someone with similar webcam
          * to see the initial parameters.*/
         struct sd *sd = (struct sd *) gspca_dev;
         const struct additional_sensor_data *sensor;
diff --git a/drivers/media/usb/tm6000/tm6000-input.c b/drivers/media/usb/tm6000/tm6000-input.c
index 4afd4655d562..39c15bb2b20c 100644
--- a/drivers/media/usb/tm6000/tm6000-input.c
+++ b/drivers/media/usb/tm6000/tm6000-input.c
@@ -438,7 +438,7 @@ int tm6000_ir_init(struct tm6000_core *dev)
 
         /* input setup */
         rc->allowed_protocols = RC_BIT_RC5 | RC_BIT_NEC;
-        /* Neded, in order to support NEC remotes with 24 or 32 bits */
+        /* Needed, in order to support NEC remotes with 24 or 32 bits */
         rc->scancode_mask = 0xffff;
         rc->priv = ir;
         rc->change_protocol = tm6000_ir_change_protocol;
diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
index 05b5c6652cfa..e48b7c032c95 100644
--- a/drivers/media/v4l2-core/tuner-core.c
+++ b/drivers/media/v4l2-core/tuner-core.c
@@ -245,7 +245,7 @@ static const struct analog_demod_ops tuner_analog_ops = {
  * @tuner_callback:     an optional function to be called when switching
  *                      to analog mode
  *
- * This function applys the tuner config to tuner specified
+ * This function applies the tuner config to tuner specified
  * by tun_setup structure. It contains several per-tuner initialization "magic"
  */
 static void set_type(struct i2c_client *c, unsigned int type,
@@ -463,7 +463,7 @@ attach_failed:
  * @sd:         subdev descriptor
  * @tun_setup:  type to be associated to a given tuner i2c address
  *
- * This function applys the tuner config to tuner specified
+ * This function applies the tuner config to tuner specified
  * by tun_setup structure.
  * If tuner I2C address is UNSET, then it will only set the device
  * if the tuner supports the mode specified in the call.
diff --git a/drivers/misc/vmw_vmci/vmci_context.c b/drivers/misc/vmw_vmci/vmci_context.c
index f866a4baecb5..f35f0c8606b9 100644
--- a/drivers/misc/vmw_vmci/vmci_context.c
+++ b/drivers/misc/vmw_vmci/vmci_context.c
@@ -303,7 +303,7 @@ int vmci_ctx_enqueue_datagram(u32 cid, struct vmci_datagram *dg)
 
         vmci_dg_size = VMCI_DG_SIZE(dg);
         if (vmci_dg_size > VMCI_MAX_DG_SIZE) {
-                pr_devel("Datagram too large (bytes=%Zu)\n", vmci_dg_size);
+                pr_devel("Datagram too large (bytes=%zu)\n", vmci_dg_size);
                 return VMCI_ERROR_INVALID_ARGS;
         }
 
diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.c b/drivers/misc/vmw_vmci/vmci_queue_pair.c
index f84a4275ca29..498c0854305f 100644
--- a/drivers/misc/vmw_vmci/vmci_queue_pair.c
+++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c
@@ -2928,7 +2928,7 @@ int vmci_qpair_get_produce_indexes(const struct vmci_qp *qpair,
 EXPORT_SYMBOL_GPL(vmci_qpair_get_produce_indexes);
 
 /*
- * vmci_qpair_get_consume_indexes() - Retrieves the indexes of the comsumer.
+ * vmci_qpair_get_consume_indexes() - Retrieves the indexes of the consumer.
  * @qpair:      Pointer to the queue pair struct.
  * @consumer_tail:      Reference used for storing consumer tail index.
  * @producer_head:      Reference used for storing the producer head index.
diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c
index 2b7fc3764803..00750c9d3514 100644
--- a/drivers/mmc/host/mmci_qcom_dml.c
+++ b/drivers/mmc/host/mmci_qcom_dml.c
@@ -170,7 +170,7 @@ int dml_hw_init(struct mmci_host *host, struct device_node *np)
         writel_relaxed(producer_id | (consumer_id << CONSUMER_PIPE_ID_SHFT),
                        base + DML_PIPE_ID);
 
-        /* Make sure dml intialization is finished */
+        /* Make sure dml initialization is finished */
         mb();
 
         return 0;
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index 6ea963e3b89a..62ee439d5882 100644
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -123,7 +123,7 @@ static int __init arcnet_init(void)
                 arc_proto_map[count] = arc_proto_default;
 
         if (BUGLVL(D_DURING))
-                pr_info("struct sizes: %Zd %Zd %Zd %Zd %Zd\n",
+                pr_info("struct sizes: %zd %zd %zd %zd %zd\n",
                         sizeof(struct arc_hardware),
                         sizeof(struct arc_rfc1201),
                         sizeof(struct arc_rfc1051),
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index a81731303730..a9ac58c351a0 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -1206,7 +1206,7 @@ static void bfin_mac_rx(struct bfin_mac_local *lp)
         /* reserve 2 bytes for RXDWA padding */
         skb_reserve(new_skb, NET_IP_ALIGN);
         /* Invalidate the data cache of skb->data range when it is write back
-         * cache. It will prevent overwritting the new data from DMA
+         * cache. It will prevent overwriting the new data from DMA
          */
         blackfin_dcache_invalidate_range((unsigned long)new_skb->head,
                                          (unsigned long)new_skb->end);
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 0ee6e208aa07..50d88d3e03b6 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -817,7 +817,7 @@ static void bcm_enet_adjust_phy_link(struct net_device *dev)
                         rx_pause_en = 1;
                         tx_pause_en = 1;
                 } else if (!priv->pause_auto) {
-                        /* pause setting overrided by user */
+                        /* pause setting overridden by user */
                         rx_pause_en = priv->pause_rx;
                         tx_pause_en = priv->pause_tx;
                 } else {
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 05356efdbf93..b209b7f6093e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -6957,7 +6957,7 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                          * hence its link is expected to be down
                          * - SECOND_PHY means that first phy should not be able
                          * to link up by itself (using configuration)
-                         * - DEFAULT should be overriden during initialiazation
+                         * - DEFAULT should be overridden during initialization
                          */
                                 DP(NETIF_MSG_LINK, "Invalid link indication"
                                            "mpc=0x%x. DISABLING LINK !!!\n",
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 016d481c6476..30606b11b128 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -1622,7 +1622,7 @@ static void macb_init_rx_buffer_size(struct macb *bp, size_t size)
                 }
         }
 
-        netdev_dbg(bp->dev, "mtu [%u] rx_buffer_size [%Zu]\n",
+        netdev_dbg(bp->dev, "mtu [%u] rx_buffer_size [%zu]\n",
                    bp->dev->mtu, bp->rx_buffer_size);
 }
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
index acc231293e4d..f6e739da7bb7 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
@@ -1416,7 +1416,7 @@ static unsigned int xdigit2int(unsigned char c)
  * <pattern data>[/<pattern mask>][@<anchor>]
  *
  * Up to 2 filter patterns can be specified.  If 2 are supplied the first one
- * must be anchored at 0.  An omited mask is taken as a mask of 1s, an omitted
+ * must be anchored at 0.  An omitted mask is taken as a mask of 1s, an omitted
  * anchor is taken as 0.
  */
 static ssize_t mps_trc_write(struct file *file, const char __user *buf,
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index cbbf8648307a..78460c52b7c4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -847,9 +847,7 @@ static void i40e_free_vf_res(struct i40e_vf *vf)
                 wr32(hw, reg_idx, reg);
                 i40e_flush(hw);
         }
-        /* reset some of the state varibles keeping
-         * track of the resources
-         */
+        /* reset some of the state variables keeping track of the resources */
         vf->num_queue_pairs = 0;
         vf->vf_states = 0;
         clear_bit(I40E_VF_STAT_INIT, &vf->vf_states);
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 2788a5409023..68812d783f33 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -294,7 +294,7 @@ s32 igb_write_phy_reg_i2c(struct e1000_hw *hw, u32 offset, u16 data)
         u32 i, i2ccmd = 0;
         u16 phy_data_swapped;
 
-        /* Prevent overwritting SFP I2C EEPROM which is at A0 address.*/
+        /* Prevent overwriting SFP I2C EEPROM which is at A0 address.*/
         if ((hw->phy.addr == 0) || (hw->phy.addr > 7)) {
                 hw_dbg("PHY I2C Address %d is out of range.\n",
                           hw->phy.addr);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
index 30535e6b68f0..c8ac46049f34 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
@@ -1449,7 +1449,7 @@ do { \
  *  @atr_input: input bitstream to compute the hash on
  *  @input_mask: mask for the input bitstream
  *
- *  This function serves two main purposes.  First it applys the input_mask
+ *  This function serves two main purposes.  First it applies the input_mask
  *  to the atr_input resulting in a cleaned up atr_input data stream.
  *  Secondly it computes the hash and stores it in the bkt_hash field at
  *  the end of the input byte stream.  This way it will be available for
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index ee38c18c2d2d..ee1c78abab0b 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -1251,10 +1251,10 @@ struct ksz_port_info {
  * @tx_size:            Transmit data size.  Used for TX optimization.
  *                      The maximum is defined by MAX_TX_HELD_SIZE.
  * @perm_addr:          Permanent MAC address.
- * @override_addr:      Overrided MAC address.
+ * @override_addr:      Overridden MAC address.
  * @address:            Additional MAC address entries.
  * @addr_list_size:     Additional MAC address list size.
- * @mac_override:       Indication of MAC address overrided.
+ * @mac_override:       Indication of MAC address overridden.
  * @promiscuous:        Counter to keep track of promiscuous mode set.
  * @all_multi:          Counter to keep track of all multicast mode set.
  * @multi_list:         Multicast address entries.
@@ -4042,7 +4042,7 @@ static int empty_addr(u8 *addr)
  * @hw:         The hardware instance.
  *
  * This routine programs the MAC address of the hardware when the address is
- * overrided.
+ * overridden.
  */
 static void hw_set_addr(struct ksz_hw *hw)
 {
@@ -7043,7 +7043,7 @@ static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id)
         if (macaddr[0] != ':')
                 get_mac_addr(hw_priv, macaddr, MAIN_PORT);
 
-        /* Read MAC address and initialize override address if not overrided. */
+        /* Read MAC address and initialize override address if not overridden. */
         hw_read_addr(hw);
 
         /* Multiple device interfaces mode requires a second MAC address. */
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 99b187bfdd55..718bf58a7da6 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -178,7 +178,7 @@ const u32 qlcnic_83xx_reg_tbl[] = {
         0x3540,         /* Device state, DRV_REG1 */
         0x3544,         /* Driver state, DRV_REG2 */
         0x3548,         /* Driver scratch, DRV_REG3 */
-        0x354C,         /* Device partiton info, DRV_REG4 */
+        0x354C,         /* Device partition info, DRV_REG4 */
         0x3524,         /* Driver IDC ver, DRV_REG5 */
         0x3550,         /* FW_VER_MAJOR */
         0x3554,         /* FW_VER_MINOR */
diff --git a/drivers/net/ethernet/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h
index 47ced8a898ca..91fb54fd03d9 100644
--- a/drivers/net/ethernet/sfc/mcdi_pcol.h
+++ b/drivers/net/ethernet/sfc/mcdi_pcol.h
@@ -10832,7 +10832,7 @@
 
 /***********************************/
 /* MC_CMD_GET_LICENSED_V3_FEATURE_STATES
- * Query the state of an one or more licensed features. (Note that the actual
+ * Query the state of one or more licensed features. (Note that the actual
  * state may be invalidated by the MC_CMD_LICENSING_V3 OP_UPDATE_LICENSE
  * operation or a reboot of the MC.) Used for V3 licensing (Medford)
  */
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 19a458716f1a..1b6f6171d078 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -176,7 +176,7 @@ struct sis900_private {
 
         u32 msg_enable;
 
-        unsigned int cur_rx, dirty_rx; /* producer/comsumer pointers for Tx/Rx ring */
+        unsigned int cur_rx, dirty_rx; /* producer/consumer pointers for Tx/Rx ring */
         unsigned int cur_tx, dirty_tx;
 
         /* The saved address of a sent/receive-in-place packet buffer */
diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c
index bda0c6413450..89698741682f 100644
--- a/drivers/net/gtp.c
+++ b/drivers/net/gtp.c
@@ -1330,7 +1330,7 @@ static int __init gtp_init(void)
         if (err < 0)
                 goto unreg_genl_family;
 
-        pr_info("GTP module loaded (pdp ctx size %Zd bytes)\n",
+        pr_info("GTP module loaded (pdp ctx size %zd bytes)\n",
                 sizeof(struct pdp_ctx));
         return 0;
 
diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c
index 3e37724d30ae..8aefb282c862 100644
--- a/drivers/net/usb/kalmia.c
+++ b/drivers/net/usb/kalmia.c
@@ -343,7 +343,7 @@ static const struct driver_info kalmia_info = {
 static const struct usb_device_id products[] = {
         /* The unswitched USB ID, to get the module auto loaded: */
         { USB_DEVICE(0x04e8, 0x689a) },
-        /* The stick swithed into modem (by e.g. usb_modeswitch): */
+        /* The stick switched into modem (by e.g. usb_modeswitch): */
         { USB_DEVICE(0x04e8, 0x6889),
                 .driver_info = (unsigned long) &kalmia_info, },
         { /* EMPTY == end of list */} };
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 4f4f71b2966b..c5b21138b7eb 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -383,7 +383,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
 
         /* REVISIT:  peripheral "alignment" request is ignored ... */
         dev_dbg(&intf->dev,
-                "hard mtu %u (%u from dev), rx buflen %Zu, align %d\n",
+                "hard mtu %u (%u from dev), rx buflen %zu, align %d\n",
                 dev->hard_mtu, tmp, dev->rx_urb_size,
                 1 << le32_to_cpu(u.init_c->packet_alignment));
 
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index d9440bc022f2..ac69f28d92d2 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -379,7 +379,7 @@ static int sierra_net_parse_lsi(struct usbnet *dev, char *data, int datalen)
         u32 expected_length;
 
         if (datalen < sizeof(struct lsi_umts_single)) {
-                netdev_err(dev->net, "%s: Data length %d, exp >= %Zu\n",
+                netdev_err(dev->net, "%s: Data length %d, exp >= %zu\n",
                            __func__, datalen, sizeof(struct lsi_umts_single));
                 return -1;
         }
diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c
index e74664b84925..502c346aa790 100644
--- a/drivers/net/wimax/i2400m/usb-fw.c
+++ b/drivers/net/wimax/i2400m/usb-fw.c
@@ -237,7 +237,7 @@ void __i2400mu_bm_notif_cb(struct urb *urb)
  *
  * @i2400m: device descriptor
  * @urb: urb to use
- * @completion: completion varible to complete when done
+ * @completion: completion variable to complete when done
  *
  * Data is always read to i2400m->bm_ack_buf
  */
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index 815efe9fd208..5214dd7a3936 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -59,13 +59,13 @@ static const struct ani_ofdm_level_entry ofdm_level_table[] = {
 /*
  * MRC (Maximal Ratio Combining) has always been used with multi-antenna ofdm.
  * With OFDM for single stream you just add up all antenna inputs, you're
- * only interested in what you get after FFT. Signal aligment is also not
+ * only interested in what you get after FFT. Signal alignment is also not
  * required for OFDM because any phase difference adds up in the frequency
  * domain.
  *
  * MRC requires extra work for use with CCK. You need to align the antenna
  * signals from the different antenna before you can add the signals together.
- * You need aligment of signals as CCK is in time domain, so addition can cancel
+ * You need alignment of signals as CCK is in time domain, so addition can cancel
  * your signal completely if phase is 180 degrees (think of adding sine waves).
  * You also need to remove noise before the addition and this is where ANI
  * MRC CCK comes into play. One of the antenna inputs may be stronger but
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 10098b7586f3..944b83cfc519 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -4874,7 +4874,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
                 kfree(af_params);
         } else {
                 brcmf_dbg(TRACE, "Unhandled, fc=%04x!!\n", mgmt->frame_control);
-                brcmf_dbg_hex_dump(true, buf, len, "payload, len=%Zu\n", len);
+                brcmf_dbg_hex_dump(true, buf, len, "payload, len=%zu\n", len);
         }
 
 exit:
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
index 356aba9d3d53..f922859acf40 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
@@ -1238,7 +1238,7 @@ static int ipw2100_get_hw_features(struct ipw2100_priv *priv)
 }
 
 /*
- * Start firmware execution after power on and intialization
+ * Start firmware execution after power on and initialization
  * The sequence is:
  *  1. Release ARC
  *  2. Wait for f/w initialization completes;
@@ -1277,7 +1277,7 @@ static int ipw2100_start_adapter(struct ipw2100_priv *priv)
         /* Release ARC - clear reset bit */
         write_register(priv->net_dev, IPW_REG_RESET_REG, 0);
 
-        /* wait for f/w intialization complete */
+        /* wait for f/w initialization complete */
         IPW_DEBUG_FW("Waiting for f/w initialization to complete...\n");
         i = 5000;
         do {
@@ -5652,7 +5652,7 @@ static void shim__set_security(struct net_device *dev,
 
 /* As a temporary work around to enable WPA until we figure out why
  * wpa_supplicant toggles the security capability of the driver, which
- * forces a disassocation with force_update...
+ * forces a disassociation with force_update...
  *
  *      if (force_update || !(priv->status & STATUS_ASSOCIATED))*/
         if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)))
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index ef9af8a29cad..5ef3c5cc47c5 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -3974,7 +3974,7 @@ static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
                 return;
         }
 
-        IPW_DEBUG_ASSOC("Disassocation attempt from %pM "
+        IPW_DEBUG_ASSOC("Disassociation attempt from %pM "
                         "on channel %d.\n",
                         priv->assoc_request.bssid,
                         priv->assoc_request.channel);
@@ -5196,7 +5196,7 @@ static void ipw_rx_queue_restock(struct ipw_priv *priv)
  * Move all used packet from rx_used to rx_free, allocating a new SKB for each.
  * Also restock the Rx queue via ipw_rx_queue_restock.
  *
- * This is called as a scheduled work item (except for during intialization)
+ * This is called as a scheduled work item (except for during initialization)
  */
 static void ipw_rx_queue_replenish(void *data)
 {
diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
index a91d170a614b..2781f5728d07 100644
--- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
@@ -4855,39 +4855,39 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
          */
 
         D_INFO("f/w package hdr ucode version raw = 0x%x\n", il->ucode_ver);
-        D_INFO("f/w package hdr runtime inst size = %Zd\n", pieces.inst_size);
-        D_INFO("f/w package hdr runtime data size = %Zd\n", pieces.data_size);
-        D_INFO("f/w package hdr init inst size = %Zd\n", pieces.init_size);
-        D_INFO("f/w package hdr init data size = %Zd\n", pieces.init_data_size);
-        D_INFO("f/w package hdr boot inst size = %Zd\n", pieces.boot_size);
+        D_INFO("f/w package hdr runtime inst size = %zd\n", pieces.inst_size);
+        D_INFO("f/w package hdr runtime data size = %zd\n", pieces.data_size);
+        D_INFO("f/w package hdr init inst size = %zd\n", pieces.init_size);
+        D_INFO("f/w package hdr init data size = %zd\n", pieces.init_data_size);
+        D_INFO("f/w package hdr boot inst size = %zd\n", pieces.boot_size);
 
         /* Verify that uCode images will fit in card's SRAM */
         if (pieces.inst_size > il->hw_params.max_inst_size) {
-                IL_ERR("uCode instr len %Zd too large to fit in\n",
+                IL_ERR("uCode instr len %zd too large to fit in\n",
                        pieces.inst_size);
                 goto try_again;
         }
 
         if (pieces.data_size > il->hw_params.max_data_size) {
-                IL_ERR("uCode data len %Zd too large to fit in\n",
+                IL_ERR("uCode data len %zd too large to fit in\n",
                        pieces.data_size);
                 goto try_again;
         }
 
         if (pieces.init_size > il->hw_params.max_inst_size) {
-                IL_ERR("uCode init instr len %Zd too large to fit in\n",
+                IL_ERR("uCode init instr len %zd too large to fit in\n",
                        pieces.init_size);
                 goto try_again;
         }
 
         if (pieces.init_data_size > il->hw_params.max_data_size) {
-                IL_ERR("uCode init data len %Zd too large to fit in\n",
+                IL_ERR("uCode init data len %zd too large to fit in\n",
                        pieces.init_data_size);
                 goto try_again;
         }
 
         if (pieces.boot_size > il->hw_params.max_bsm_size) {
-                IL_ERR("uCode boot instr len %Zd too large to fit in\n",
+                IL_ERR("uCode boot instr len %zd too large to fit in\n",
                        pieces.boot_size);
                 goto try_again;
         }
@@ -4938,7 +4938,7 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
         /* Copy images into buffers for card's bus-master reads ... */
 
         /* Runtime instructions (first block of data in file) */
-        D_INFO("Copying (but not loading) uCode instr len %Zd\n",
+        D_INFO("Copying (but not loading) uCode instr len %zd\n",
                pieces.inst_size);
         memcpy(il->ucode_code.v_addr, pieces.inst, pieces.inst_size);
 
@@ -4949,28 +4949,28 @@ il4965_ucode_callback(const struct firmware *ucode_raw, void *context)
          * Runtime data
          * NOTE:  Copy into backup buffer will be done in il_up()
          */
-        D_INFO("Copying (but not loading) uCode data len %Zd\n",
+        D_INFO("Copying (but not loading) uCode data len %zd\n",
                pieces.data_size);
         memcpy(il->ucode_data.v_addr, pieces.data, pieces.data_size);
         memcpy(il->ucode_data_backup.v_addr, pieces.data, pieces.data_size);
 
         /* Initialization instructions */
         if (pieces.init_size) {
-                D_INFO("Copying (but not loading) init instr len %Zd\n",
+                D_INFO("Copying (but not loading) init instr len %zd\n",
                        pieces.init_size);
                 memcpy(il->ucode_init.v_addr, pieces.init, pieces.init_size);
         }
 
         /* Initialization data */
         if (pieces.init_data_size) {
-                D_INFO("Copying (but not loading) init data len %Zd\n",
+                D_INFO("Copying (but not loading) init data len %zd\n",
                        pieces.init_data_size);
                 memcpy(il->ucode_init_data.v_addr, pieces.init_data,
                        pieces.init_data_size);
         }
 
         /* Bootstrap instructions */
-        D_INFO("Copying (but not loading) boot instr len %Zd\n",
+        D_INFO("Copying (but not loading) boot instr len %zd\n",
                pieces.boot_size);
         memcpy(il->ucode_boot.v_addr, pieces.boot, pieces.boot_size);
 
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 0e0293d42b5d..be466a074c1d 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1141,21 +1141,21 @@ static int validate_sec_sizes(struct iwl_drv *drv,
                               struct iwl_firmware_pieces *pieces,
                               const struct iwl_cfg *cfg)
 {
-        IWL_DEBUG_INFO(drv, "f/w package hdr runtime inst size = %Zd\n",
+        IWL_DEBUG_INFO(drv, "f/w package hdr runtime inst size = %zd\n",
                 get_sec_size(pieces, IWL_UCODE_REGULAR,
                              IWL_UCODE_SECTION_INST));
-        IWL_DEBUG_INFO(drv, "f/w package hdr runtime data size = %Zd\n",
+        IWL_DEBUG_INFO(drv, "f/w package hdr runtime data size = %zd\n",
                 get_sec_size(pieces, IWL_UCODE_REGULAR,
                              IWL_UCODE_SECTION_DATA));
-        IWL_DEBUG_INFO(drv, "f/w package hdr init inst size = %Zd\n",
+        IWL_DEBUG_INFO(drv, "f/w package hdr init inst size = %zd\n",
                 get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_INST));
-        IWL_DEBUG_INFO(drv, "f/w package hdr init data size = %Zd\n",
+        IWL_DEBUG_INFO(drv, "f/w package hdr init data size = %zd\n",
                 get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_DATA));
 
         /* Verify that uCode images will fit in card's SRAM. */
         if (get_sec_size(pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_INST) >
             cfg->max_inst_size) {
-                IWL_ERR(drv, "uCode instr len %Zd too large to fit in\n",
+                IWL_ERR(drv, "uCode instr len %zd too large to fit in\n",
                         get_sec_size(pieces, IWL_UCODE_REGULAR,
                                      IWL_UCODE_SECTION_INST));
                 return -1;
@@ -1163,7 +1163,7 @@ static int validate_sec_sizes(struct iwl_drv *drv,
 
         if (get_sec_size(pieces, IWL_UCODE_REGULAR, IWL_UCODE_SECTION_DATA) >
             cfg->max_data_size) {
-                IWL_ERR(drv, "uCode data len %Zd too large to fit in\n",
+                IWL_ERR(drv, "uCode data len %zd too large to fit in\n",
                         get_sec_size(pieces, IWL_UCODE_REGULAR,
                                      IWL_UCODE_SECTION_DATA));
                 return -1;
@@ -1171,7 +1171,7 @@ static int validate_sec_sizes(struct iwl_drv *drv,
 
         if (get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_INST) >
              cfg->max_inst_size) {
-                IWL_ERR(drv, "uCode init instr len %Zd too large to fit in\n",
+                IWL_ERR(drv, "uCode init instr len %zd too large to fit in\n",
                         get_sec_size(pieces, IWL_UCODE_INIT,
                                      IWL_UCODE_SECTION_INST));
                 return -1;
@@ -1179,7 +1179,7 @@ static int validate_sec_sizes(struct iwl_drv *drv,
 
         if (get_sec_size(pieces, IWL_UCODE_INIT, IWL_UCODE_SECTION_DATA) >
             cfg->max_data_size) {
-                IWL_ERR(drv, "uCode init data len %Zd too large to fit in\n",
+                IWL_ERR(drv, "uCode init data len %zd too large to fit in\n",
                         get_sec_size(pieces, IWL_UCODE_REGULAR,
                                      IWL_UCODE_SECTION_DATA));
                 return -1;
diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.c b/drivers/net/wireless/marvell/mwifiex/wmm.c
index 28c2f6fae3e6..e4ff3b973850 100644
--- a/drivers/net/wireless/marvell/mwifiex/wmm.c
+++ b/drivers/net/wireless/marvell/mwifiex/wmm.c
@@ -673,8 +673,8 @@ void mwifiex_update_ralist_tx_pause(struct mwifiex_private *priv, u8 *mac,
         spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags);
 }
 
-/* This function update non-tdls peer ralist tx_pause while
- * tdls channel swithing
+/* This function updates non-tdls peer ralist tx_pause while
+ * tdls channel switching
  */
 void mwifiex_update_ralist_tx_pause_in_tdls_cs(struct mwifiex_private *priv,
                                                u8 *mac, u8 tx_pause)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c
index 1922e78ad6bd..89a0a28b8b20 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c
@@ -455,7 +455,7 @@ static u32 _rtl92s_fill_h2c_cmd(struct sk_buff *skb, u32 h2cbufferlen,
         u8 i = 0;
 
         do {
-                /* 8 - Byte aligment */
+                /* 8 - Byte alignment */
                 len = H2C_TX_CMD_HDR_LEN + N_BYTE_ALIGMENT(pcmd_len[i], 8);
 
                 /* Buffer length is not enough */
@@ -504,7 +504,7 @@ static u32 _rtl92s_get_h2c_cmdlen(u32 h2cbufferlen, u32 cmd_num, u32 *pcmd_len)
         u8 i = 0;
 
         do {
-                /* 8 - Byte aligment */
+                /* 8 - Byte alignment */
                 len = H2C_TX_CMD_HDR_LEN + N_BYTE_ALIGMENT(pcmd_len[i], 8);
 
                 /* Buffer length is not enough */
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index ef5d394f185b..cc8deecea8cb 100644
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -516,7 +516,7 @@ err:
 
 /**
  * rsi_disconnect() - This function performs the reverse of the probe function,
- *                    it deintialize the driver structure.
+ *                    it deinitialize the driver structure.
  * @pfunction: Pointer to the USB interface structure.
  *
  * Return: None.
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 5bdf7a03e3dd..d1aa3eee0e81 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -178,7 +178,7 @@ static struct wlcore_conf wl18xx_conf = {
         .sg = {
                 .params = {
                         [WL18XX_CONF_SG_PARAM_0] = 0,
-                        /* Configuartion Parameters */
+                        /* Configuration Parameters */
                         [WL18XX_CONF_SG_ANTENNA_CONFIGURATION] = 0,
                         [WL18XX_CONF_SG_ZIGBEE_COEX] = 0,
                         [WL18XX_CONF_SG_TIME_SYNC] = 0,
diff --git a/drivers/net/wireless/ti/wlcore/init.c b/drivers/net/wireless/ti/wlcore/init.c
index d0b7734030ef..58898b99d3f7 100644
--- a/drivers/net/wireless/ti/wlcore/init.c
+++ b/drivers/net/wireless/ti/wlcore/init.c
@@ -544,7 +544,7 @@ static int wl12xx_init_sta_role(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         return 0;
 }
 
-/* vif-specific intialization */
+/* vif-specific initialization */
 static int wl12xx_init_ap_role(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
         int ret;
diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c
index d9c55830b2b2..a966c6a85ea8 100644
--- a/drivers/nfc/pn533/pn533.c
+++ b/drivers/nfc/pn533/pn533.c
@@ -487,7 +487,7 @@ static int pn533_send_cmd_async(struct pn533 *dev, u8 cmd_code,
 /*
  * pn533_send_cmd_direct_async
  *
- * The function sends a piority cmd directly to the chip omiting the cmd
+ * The function sends a piority cmd directly to the chip omitting the cmd
  * queue. It's intended to be used by chaining mechanism of received responses
  * where the host has to request every single chunk of data before scheduling
  * next cmd from the queue.
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index bc20a2442a04..779f516e7a4e 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1051,7 +1051,7 @@ static int nvme_rdma_post_send(struct nvme_rdma_queue *queue,
          * sequencer is not allocated in our driver's tagset and it's
          * triggered to be freed by blk_cleanup_queue(). So we need to
          * always mark it as signaled to ensure that the "wr_cqe", which is
-         * embeded in request's payload, is not freed when __ib_process_cq()
+         * embedded in request's payload, is not freed when __ib_process_cq()
          * calls wr_cqe->done().
          */
         if ((++queue->sig_count % 32) == 0 || flush)
diff --git a/drivers/parport/ieee1284_ops.c b/drivers/parport/ieee1284_ops.c
index c0e7d21c88c2..75071605d22f 100644
--- a/drivers/parport/ieee1284_ops.c
+++ b/drivers/parport/ieee1284_ops.c
@@ -307,7 +307,7 @@ size_t parport_ieee1284_read_byte (struct parport *port,
                 if (parport_read_status (port) & PARPORT_STATUS_ERROR) {
                 end_of_data:
                         DPRINTK (KERN_DEBUG
-                                 "%s: No more byte data (%Zd bytes)\n",
+                                 "%s: No more byte data (%zd bytes)\n",
                                  port->name, count);
 
                         /* Go to reverse idle phase. */
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 78530d1714dc..3e56e7deab8e 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -902,7 +902,7 @@ static size_t parport_pc_ecp_write_block_pio(struct parport *port,
  *      ******************************************
  */
 
-/* GCC is not inlining extern inline function later overwriten to non-inline,
+/* GCC is not inlining extern inline function later overwritten to non-inline,
    so we use outlined_ variants here.  */
 static const struct parport_operations parport_pc_ops = {
         .write_data     = parport_pc_write_data,
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index ca77d235867f..f754453fe754 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3630,7 +3630,7 @@ static int __init pci_apply_final_quirks(void)
 fs_initcall_sync(pci_apply_final_quirks);
 
 /*
- * Followings are device-specific reset methods which can be used to
+ * Following are device-specific reset methods which can be used to
  * reset a single function if other methods (e.g. FLR, PM D0->D3) are
  * not available.
  */
diff --git a/drivers/pinctrl/bcm/Kconfig b/drivers/pinctrl/bcm/Kconfig
index 8968dd7aebed..e8c4e4f934a6 100644
--- a/drivers/pinctrl/bcm/Kconfig
+++ b/drivers/pinctrl/bcm/Kconfig
@@ -70,7 +70,7 @@ config PINCTRL_CYGNUS_MUX
 
           The Broadcom Cygnus IOMUX driver supports group based IOMUX
           configuration, with the exception that certain individual pins
-          can be overrided to GPIO function
+          can be overridden to GPIO function
 
 config PINCTRL_NSP_GPIO
         bool "Broadcom NSP GPIO (with PINCONF) driver"
diff --git a/drivers/power/avs/smartreflex.c b/drivers/power/avs/smartreflex.c
index fa0f19b975a6..974fd684bab2 100644
--- a/drivers/power/avs/smartreflex.c
+++ b/drivers/power/avs/smartreflex.c
@@ -195,7 +195,7 @@ static void sr_stop_vddautocomp(struct omap_sr *sr)
 }
 
 /*
- * This function handles the intializations which have to be done
+ * This function handles the initializations which have to be done
  * only when both sr device and class driver regiter has
  * completed. This will be attempted to be called from both sr class
  * driver register and sr device intializtion API's. Only one call
@@ -671,7 +671,7 @@ int sr_register_class(struct omap_sr_class_data *class_data)
         sr_class = class_data;
 
         /*
-         * Call into late init to do intializations that require
+         * Call into late init to do initializations that require
          * both sr driver and sr class driver to be initiallized.
          */
         list_for_each_entry(sr_info, &sr_list, node)
@@ -899,7 +899,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
         list_add(&sr_info->node, &sr_list);
 
         /*
-         * Call into late init to do intializations that require
+         * Call into late init to do initializations that require
          * both sr driver and sr class driver to be initiallized.
          */
         if (sr_class) {
diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 9013a585507e..50b617af81bd 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -889,17 +889,16 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
                         goto err_req;
                 }
 
-                down_read(&current->mm->mmap_sem);
-                pinned = get_user_pages(
+                pinned = get_user_pages_unlocked(
                                 (unsigned long)xfer->loc_addr & PAGE_MASK,
                                 nr_pages,
-                                dir == DMA_FROM_DEVICE ? FOLL_WRITE : 0,
-                                page_list, NULL);
-                up_read(&current->mm->mmap_sem);
+                                page_list,
+                                dir == DMA_FROM_DEVICE ? FOLL_WRITE : 0);
 
                 if (pinned != nr_pages) {
                         if (pinned < 0) {
-                                rmcd_error("get_user_pages err=%ld", pinned);
+                                rmcd_error("get_user_pages_unlocked err=%ld",
+                                           pinned);
                                 nr_pages = 0;
                         } else
                                 rmcd_error("pinned %ld out of %ld pages",
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 137d22d3a005..838347c44f32 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1630,7 +1630,7 @@ static int aac_acquire_resources(struct aac_dev *dev)
 
         if (!dev->sync_mode) {
                 /* After EEH recovery or suspend resume, max_msix count
-                 * may change, therfore updating in init as well.
+                 * may change, therefore updating in init as well.
                  */
                 dev->init->r7.no_of_msix_vectors = cpu_to_le32(dev->max_msix);
                 aac_adapter_start(dev);
diff --git a/drivers/scsi/bfa/bfi_ms.h b/drivers/scsi/bfa/bfi_ms.h
index ae5bfe039fcc..ccbd9e31a5de 100644
--- a/drivers/scsi/bfa/bfi_ms.h
+++ b/drivers/scsi/bfa/bfi_ms.h
@@ -680,7 +680,7 @@ struct bfi_ioim_req_s {
 
         /*
          * SG elements array within the IO request must be double word
-         * aligned. This aligment is required to optimize SGM setup for the IO.
+         * aligned. This alignment is required to optimize SGM setup for the IO.
          */
         struct bfi_sge_s        sges[BFI_SGE_INLINE_MAX];
         u8      io_timeout;
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index cea57e27e713..656463ff9ccb 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -1387,7 +1387,7 @@ static void fcoe_ctlr_recv_clr_vlink(struct fcoe_ctlr *fip,
         /*
          * Actually need to subtract 'sizeof(*mp) - sizeof(*wp)' from 'rlen'
          * before determining max Vx_Port descriptor but a buggy FCF could have
-         * omited either or both MAC Address and Name Identifier descriptors
+         * omitted either or both MAC Address and Name Identifier descriptors
          */
         num_vlink_desc = rlen / sizeof(*vp);
         if (num_vlink_desc)
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 835c59c777f2..b29afafc2885 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -9330,7 +9330,7 @@ static pci_ers_result_t ipr_pci_error_detected(struct pci_dev *pdev,
  * ipr_probe_ioa_part2 - Initializes IOAs found in ipr_probe_ioa(..)
  * @ioa_cfg:    ioa cfg struct
  *
- * Description: This is the second phase of adapter intialization
+ * Description: This is the second phase of adapter initialization
  * This function takes care of initilizing the adapter to the point
  * where it can accept new commands.
 
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 50cf402dea29..03cb05abc821 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -3329,7 +3329,7 @@ static DEVICE_ATTR(lpfc_static_vport, S_IRUGO,
  * @buf: Data buffer.
  * @count: Size of the data buffer.
  *
- * This function get called when an user write to the lpfc_stat_data_ctrl
+ * This function get called when a user write to the lpfc_stat_data_ctrl
  * sysfs file. This function parse the command written to the sysfs file
  * and take appropriate action. These commands are used for controlling
  * driver statistical data collection.
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index d977a472f89f..8e886caf2454 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -4510,7 +4510,7 @@ lpfc_sli4_rb_setup(struct lpfc_hba *phba)
  * @phba: Pointer to HBA context object.
  * @sli_mode: sli mode - 2/3
  *
- * This function is called by the sli intialization code path
+ * This function is called by the sli initialization code path
  * to issue config_port mailbox command. This function restarts the
  * HBA firmware and issues a config_port mailbox command to configure
  * the SLI interface in the sli mode specified by sli_mode
@@ -4650,11 +4650,11 @@ do_prep_failed:
 
 
 /**
- * lpfc_sli_hba_setup - SLI intialization function
+ * lpfc_sli_hba_setup - SLI initialization function
  * @phba: Pointer to HBA context object.
  *
- * This function is the main SLI intialization function. This function
- * is called by the HBA intialization code, HBA reset code and HBA
+ * This function is the main SLI initialization function. This function
+ * is called by the HBA initialization code, HBA reset code and HBA
  * error attention handler code. Caller is not required to hold any
  * locks. This function issues config_port mailbox command to configure
  * the SLI, setup iocb rings and HBQ rings. In the end the function
@@ -6324,11 +6324,11 @@ lpfc_set_host_data(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox)
 }
 
 /**
- * lpfc_sli4_hba_setup - SLI4 device intialization PCI function
+ * lpfc_sli4_hba_setup - SLI4 device initialization PCI function
  * @phba: Pointer to HBA context object.
  *
- * This function is the main SLI4 device intialization PCI function. This
- * function is called by the HBA intialization code, HBA reset code and
+ * This function is the main SLI4 device initialization PCI function. This
+ * function is called by the HBA initialization code, HBA reset code and
  * HBA error attention handler code. Caller is not required to hold any
  * locks.
  **/
@@ -12079,7 +12079,7 @@ lpfc_sli4_sp_handle_els_wcqe(struct lpfc_hba *phba, struct lpfc_queue *cq,
  * @phba: Pointer to HBA context object.
  * @wcqe: Pointer to work-queue completion queue entry.
  *
- * This routine handles slow-path WQ entry comsumed event by invoking the
+ * This routine handles slow-path WQ entry consumed event by invoking the
  * proper WQ release routine to the slow-path WQ.
  **/
 static void
@@ -12451,7 +12451,7 @@ lpfc_sli4_fp_handle_fcp_wcqe(struct lpfc_hba *phba, struct lpfc_queue *cq,
  * @cq: Pointer to completion queue.
  * @wcqe: Pointer to work-queue completion queue entry.
  *
- * This routine handles an fast-path WQ entry comsumed event by invoking the
+ * This routine handles an fast-path WQ entry consumed event by invoking the
  * proper WQ release routine to the slow-path WQ.
  **/
 static void
diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
index 02fe1c4aae2f..bdffb692bded 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
@@ -1925,7 +1925,7 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type,
  *
  * This allows ownership of the specified buffer to returned to the driver,
  * allowing an application to read the buffer without fear that firmware is
- * overwritting information in the buffer.
+ * overwriting information in the buffer.
  */
 static long
 _ctl_diag_release(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.h b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
index f3e17a8c1b07..a44046cff0f3 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
@@ -390,7 +390,7 @@ struct mpt3_diag_query {
  *
  * This allows ownership of the specified buffer to returned to the driver,
  * allowing an application to read the buffer without fear that firmware is
- * overwritting information in the buffer.
+ * overwriting information in the buffer.
  */
 struct mpt3_diag_release {
         struct mpt3_ioctl_header hdr;
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index 30b905080c61..6903f03c88af 100644
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -1290,7 +1290,7 @@ int osd_req_add_get_attr_list(struct osd_request *or,
         or->enc_get_attr.total_bytes = total_bytes;
 
         OSD_DEBUG(
-               "get_attr.total_bytes=%u(%u) enc_get_attr.total_bytes=%u(%Zu)\n",
+               "get_attr.total_bytes=%u(%u) enc_get_attr.total_bytes=%u(%zu)\n",
                or->get_attr.total_bytes,
                or->get_attr.total_bytes - _osd_req_sizeof_alist_header(or),
                or->enc_get_attr.total_bytes,
@@ -1677,7 +1677,7 @@ int osd_finalize_request(struct osd_request *or,
                 }
         } else {
                 /* TODO: I think that for the GET_ATTR command these 2 should
-                 * be reversed to keep them in execution order (for embeded
+                 * be reversed to keep them in execution order (for embedded
                  * targets with low memory footprint)
                  */
                 ret = _osd_req_finalize_set_attr_list(or);
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 451de6c5e3c9..75ac662793a3 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -3435,7 +3435,7 @@ static ssize_t osst_write(struct file * filp, const char __user * buf, size_t co
 
         /* Write must be integral number of blocks */
         if (STp->block_size != 0 && (count % STp->block_size) != 0) {
-                printk(KERN_ERR "%s:E: Write (%Zd bytes) not multiple of tape block size (%d%c).\n",
+                printk(KERN_ERR "%s:E: Write (%zd bytes) not multiple of tape block size (%d%c).\n",
                                        name, count, STp->block_size<1024?
                                        STp->block_size:STp->block_size/1024, STp->block_size<1024?'b':'k');
                 retval = (-EINVAL);
@@ -3756,7 +3756,7 @@ static ssize_t osst_read(struct file * filp, char __user * buf, size_t count, lo
 
         if ((count % STp->block_size) != 0) {
                 printk(KERN_WARNING
-                    "%s:W: Read (%Zd bytes) not multiple of tape block size (%d%c).\n", name, count,
+                    "%s:W: Read (%zd bytes) not multiple of tape block size (%d%c).\n", name, count,
                     STp->block_size<1024?STp->block_size:STp->block_size/1024, STp->block_size<1024?'b':'k');
         }
 
@@ -3815,7 +3815,7 @@ static ssize_t osst_read(struct file * filp, char __user * buf, size_t count, lo
 
                         if (transfer == 0) {
                                 printk(KERN_WARNING
-                                  "%s:W: Nothing can be transferred, requested %Zd, tape block size (%d%c).\n",
+                                  "%s:W: Nothing can be transferred, requested %zd, tape block size (%d%c).\n",
                                         name, count, STp->block_size < 1024?
                                         STp->block_size:STp->block_size/1024,
                                         STp->block_size<1024?'b':'k');
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 7b6317c8c2e9..265e1395bdb8 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5669,7 +5669,7 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)
         /* Validate firmware image by checking version. */
         if (blob->fw->size < 8 * sizeof(uint16_t)) {
                 ql_log(ql_log_fatal, vha, 0x0085,
-                    "Unable to verify integrity of firmware image (%Zd).\n",
+                    "Unable to verify integrity of firmware image (%zd).\n",
                     blob->fw->size);
                 goto fail_fw_integrity;
         }
@@ -5697,7 +5697,7 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)
                 if (blob->fw->size < fwclen) {
                         ql_log(ql_log_fatal, vha, 0x0088,
                             "Unable to verify integrity of firmware image "
-                            "(%Zd).\n", blob->fw->size);
+                            "(%zd).\n", blob->fw->size);
                         goto fail_fw_integrity;
                 }
 
@@ -5778,7 +5778,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)
         /* Validate firmware image by checking version. */
         if (blob->fw->size < 8 * sizeof(uint32_t)) {
                 ql_log(ql_log_fatal, vha, 0x0093,
-                    "Unable to verify integrity of firmware image (%Zd).\n",
+                    "Unable to verify integrity of firmware image (%zd).\n",
                     blob->fw->size);
                 return QLA_FUNCTION_FAILED;
         }
@@ -5789,7 +5789,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)
             (dcode[0] == 0 && dcode[1] == 0 && dcode[2] == 0 &&
                 dcode[3] == 0)) {
                 ql_log(ql_log_fatal, vha, 0x0094,
-                    "Unable to verify integrity of firmware image (%Zd).\n",
+                    "Unable to verify integrity of firmware image (%zd).\n",
                     blob->fw->size);
                 ql_log(ql_log_fatal, vha, 0x0095,
                     "Firmware data: %08x %08x %08x %08x.\n",
@@ -5807,7 +5807,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)
                 if (blob->fw->size < fwclen) {
                         ql_log(ql_log_fatal, vha, 0x0096,
                             "Unable to verify integrity of firmware image "
-                            "(%Zd).\n", blob->fw->size);
+                            "(%zd).\n", blob->fw->size);
                         return QLA_FUNCTION_FAILED;
                 }
 
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index f94535130a34..cdbb293aca08 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -1475,7 +1475,7 @@ static void sas_end_device_release(struct device *dev)
 }
 
 /**
- * sas_rphy_initialize - common rphy intialization
+ * sas_rphy_initialize - common rphy initialization
  * @rphy:       rphy to initialise
  *
  * Used by both sas_end_device_alloc() and sas_expander_alloc() to
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 585e54f6512c..638e5f427c90 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -280,7 +280,7 @@ static const struct vmstor_protocol vmstor_protocols[] = {
 
 
 /*
- * This structure is sent during the intialization phase to get the different
+ * This structure is sent during the initialization phase to get the different
  * properties of the channel.
  */
 
diff --git a/drivers/staging/gs_fpgaboot/gs_fpgaboot.h b/drivers/staging/gs_fpgaboot/gs_fpgaboot.h
index 7b8cc3a25214..cd1eb2c4c940 100644
--- a/drivers/staging/gs_fpgaboot/gs_fpgaboot.h
+++ b/drivers/staging/gs_fpgaboot/gs_fpgaboot.h
@@ -39,7 +39,7 @@ struct fpgaimage {
         const struct    firmware        *fw_entry;
 
         /*
-         * the followings can be read from bitstream,
+         * the following can be read from bitstream,
          * but other image format should have as well
          */
         char    filename[MAX_STR];
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index b0eb80d70c23..60b827eeefe2 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -1704,7 +1704,7 @@ struct ost_lvb {
  *   lquota data structures
  */
 
-/* The lquota_id structure is an union of all the possible identifier types that
+/* The lquota_id structure is a union of all the possible identifier types that
  * can be used with quota, this includes:
  * - 64-bit user ID
  * - 64-bit group ID
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index 0d247058bce4..097147071df0 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -1953,7 +1953,7 @@ struct ieee80211_device {
 
         /* ask to the driver to retune the radio .
          * This function can sleep. the driver should ensure
-         * the radio has been swithced before return.
+         * the radio has been switched before return.
          */
         void (*set_chan)(struct net_device *dev, short ch);
 
@@ -1964,7 +1964,7 @@ struct ieee80211_device {
          * The syncro version is similar to the start_scan but
          * does not return until all channels has been scanned.
          * this is called in user context and should sleep,
-         * it is called in a work_queue when swithcing to ad-hoc mode
+         * it is called in a work_queue when switching to ad-hoc mode
          * or in behalf of iwlist scan when the card is associated
          * and root user ask for a scan.
          * the function stop_scan should stop both the syncro and
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index 1bff0e91cc0c..0ea90aae4283 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -2364,7 +2364,7 @@ static void ieee80211_start_ibss_wq(struct work_struct *work)
 //      if((IS_DOT11D_ENABLE(ieee)) && (ieee->state == IEEE80211_NOLINK))
         if (ieee->state == IEEE80211_NOLINK)
                 ieee->current_network.channel = 6;
-        /* if not then the state is not linked. Maybe the user swithced to
+        /* if not then the state is not linked. Maybe the user switched to
          * ad-hoc mode just after being in monitor mode, or just after
          * being very few time in managed mode (so the card have had no
          * time to scan all the chans..) or we have just run up the iface
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 1dc8627e65b0..cb0b7ca36b1e 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -1875,8 +1875,8 @@ vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state)
 **
 ** VC_RESUME_IDLE - Initialise the resume completion at the same time.  The
 **                      resume completion is in it's 'done' state whenever
-**                      videcore is running.  Therfore, the VC_RESUME_IDLE state
-**                      implies that videocore is suspended.
+**                      videcore is running.  Therefore, the VC_RESUME_IDLE
+**                      state implies that videocore is suspended.
 **                      Hence, any thread which needs to wait until videocore is
 **                      running can wait on this completion - it will only block
 **                      if videocore is suspended.
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 9ab43935869e..2eebc6215cac 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -213,7 +213,7 @@ static void deinit_irq(struct net_device *dev)
         vif = netdev_priv(dev);
         wilc = vif->wilc;
 
-        /* Deintialize IRQ */
+        /* Deinitialize IRQ */
         if (wilc->dev_irq_num) {
                 free_irq(wilc->dev_irq_num, wilc);
                 gpio_free(wilc->gpio);
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index f7ce47cac2aa..7961d1c56847 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2357,7 +2357,7 @@ int wilc_deinit_host_int(struct net_device *net)
                 del_timer_sync(&wilc_during_ip_timer);
 
         if (s32Error)
-                netdev_err(net, "Error while deintializing host interface\n");
+                netdev_err(net, "Error while deinitializing host interface\n");
 
         return s32Error;
 }
diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
index eb278832f5ce..1bacbc3b19a0 100644
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
@@ -667,7 +667,7 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
         struct n_hdlc_buf *tbuf;
 
         if (debuglevel >= DEBUG_LEVEL_INFO)     
-                printk("%s(%d)n_hdlc_tty_write() called count=%Zd\n",
+                printk("%s(%d)n_hdlc_tty_write() called count=%zd\n",
                         __FILE__,__LINE__,count);
                 
         /* Verify pointers */
diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
index 6ad26f802b51..f96bcf9bee25 100644
--- a/drivers/tty/serial/ioc4_serial.c
+++ b/drivers/tty/serial/ioc4_serial.c
@@ -210,7 +210,7 @@
 #define IOC4_SSCR_PAUSE_STATE   0x40000000  /* Sets when PAUSE takes effect */
 #define IOC4_SSCR_RESET         0x80000000  /* Reset DMA channels */
 
-/* All producer/comsumer pointers are the same bitfield */
+/* All producer/consumer pointers are the same bitfield */
 #define IOC4_PROD_CONS_PTR_4K   0x00000ff8      /* For 4K buffers */
 #define IOC4_PROD_CONS_PTR_1K   0x000003f8      /* For 1K buffers */
 #define IOC4_PROD_CONS_PTR_OFF           3
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 52747b6ac89a..ca425e8099ea 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -2335,7 +2335,7 @@ static int proc_drop_privileges(struct usb_dev_state *ps, void __user *arg)
         if (copy_from_user(&data, arg, sizeof(data)))
                 return -EFAULT;
 
-        /* This is an one way operation. Once privileges are
+        /* This is a one way operation. Once privileges are
          * dropped, you cannot regain them. You may however reissue
          * this ioctl to shrink the allowed interfaces mask.
          */
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index 6bde4396927c..a2615d64d07c 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -1848,7 +1848,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
 
 fail:
         spin_unlock_irq (&dev->lock);
-        pr_debug ("%s: %s fail %Zd, %p\n", shortname, __func__, value, dev);
+        pr_debug ("%s: %s fail %zd, %p\n", shortname, __func__, value, dev);
         kfree (dev->buf);
         dev->buf = NULL;
         return value;
diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index 2e41ef36b944..b76fcdb763a0 100644
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -520,7 +520,7 @@ static void struct_ep_qh_setup(struct fsl_udc *udc, unsigned char ep_num,
 /* Setup qh structure and ep register for ep0. */
 static void ep0_setup(struct fsl_udc *udc)
 {
-        /* the intialization of an ep includes: fields in QH, Regs,
+        /* the initialization of an ep includes: fields in QH, Regs,
          * fsl_ep struct */
         struct_ep_qh_setup(udc, 0, USB_RECV, USB_ENDPOINT_XFER_CONTROL,
                         USB_MAX_CTRL_PAYLOAD, 0, 0);
@@ -2349,7 +2349,7 @@ static int struct_ep_setup(struct fsl_udc *udc, unsigned char index,
 }
 
 /* Driver probe function
- * all intialization operations implemented here except enabling usb_intr reg
+ * all initialization operations implemented here except enabling usb_intr reg
  * board setup should have been done in the platform code
  */
 static int fsl_udc_probe(struct platform_device *pdev)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
index fb8fc34827ab..2218f91e92a6 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -1791,7 +1791,7 @@ static int renesas_usb3_init_ep(struct renesas_usb3 *usb3, struct device *dev,
 
         dev_dbg(dev, "%s: num_usb3_eps = %d\n", __func__, usb3->num_usb3_eps);
         /*
-         * This driver prepares pipes as the followings:
+         * This driver prepares pipes as follows:
          *  - odd pipes = IN pipe
          *  - even pipes = OUT pipe (except pipe 0)
          */
@@ -1841,7 +1841,7 @@ static void renesas_usb3_init_ram(struct renesas_usb3 *usb3, struct device *dev,
         memset(basead, 0, sizeof(basead));
 
         /*
-         * This driver prepares pipes as the followings:
+         * This driver prepares pipes as follows:
          *  - all pipes = the same size as "ramsize_per_pipe"
          * Please refer to the "Method of Specifying RAM Mapping"
          */
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 063064801ceb..ac2c4eab478d 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1322,7 +1322,7 @@ static int __init ehci_hcd_init(void)
                 printk(KERN_WARNING "Warning! ehci_hcd should always be loaded"
                                 " before uhci_hcd and ohci_hcd, not after\n");
 
-        pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n",
+        pr_debug("%s: block sizes: qh %zd qtd %zd itd %zd sitd %zd\n",
                  hcd_name,
                  sizeof(struct ehci_qh), sizeof(struct ehci_qtd),
                  sizeof(struct ehci_itd), sizeof(struct ehci_sitd));
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
index 9d0b0518290a..1c5b34b74860 100644
--- a/drivers/usb/host/fotg210-hcd.c
+++ b/drivers/usb/host/fotg210-hcd.c
@@ -5697,7 +5697,7 @@ static int __init fotg210_hcd_init(void)
                         test_bit(USB_OHCI_LOADED, &usb_hcds_loaded))
                 pr_warn("Warning! fotg210_hcd should always be loaded before uhci_hcd and ohci_hcd, not after\n");
 
-        pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd\n",
+        pr_debug("%s: block sizes: qh %zd qtd %zd itd %zd\n",
                         hcd_name, sizeof(struct fotg210_qh),
                         sizeof(struct fotg210_qtd),
                         sizeof(struct fotg210_itd));
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 8685cf3e6292..b6daf2e69989 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1252,7 +1252,7 @@ static int __init ohci_hcd_mod_init(void)
                 return -ENODEV;
 
         printk(KERN_INFO "%s: " DRIVER_DESC "\n", hcd_name);
-        pr_debug ("%s: block sizes: ed %Zd td %Zd\n", hcd_name,
+        pr_debug ("%s: block sizes: ed %zd td %zd\n", hcd_name,
                 sizeof (struct ed), sizeof (struct td));
         set_bit(USB_OHCI_LOADED, &usb_hcds_loaded);
 
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index a540e4f206c4..c5fa584d8f0a 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -563,20 +563,20 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
                         }
 
                         dev_dbg(&dev->udev->dev,
-                                "%s : in progress, count = %Zd\n",
+                                "%s : in progress, count = %zd\n",
                                 __func__, count);
                 } else {
                         spin_unlock_irqrestore(&dev->buflock, flags);
                         set_current_state(TASK_RUNNING);
                         remove_wait_queue(&dev->write_wait, &waita);
-                        dev_dbg(&dev->udev->dev, "%s : sending, count = %Zd\n",
+                        dev_dbg(&dev->udev->dev, "%s : sending, count = %zd\n",
                                 __func__, count);
 
                         /* write the data into interrupt_out_buffer from userspace */
                         buffer_size = usb_endpoint_maxp(dev->interrupt_out_endpoint);
                         bytes_to_write = count > buffer_size ? buffer_size : count;
                         dev_dbg(&dev->udev->dev,
-                                "%s : buffer_size = %Zd, count = %Zd, bytes_to_write = %Zd\n",
+                                "%s : buffer_size = %zd, count = %zd, bytes_to_write = %zd\n",
                                 __func__, buffer_size, count, bytes_to_write);
 
                         if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write) != 0) {
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index b10e26c74a90..322a042d6e59 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -673,7 +673,7 @@ static ssize_t tower_write (struct file *file, const char __user *buffer, size_t
 
         /* write the data into interrupt_out_buffer from userspace */
         bytes_to_write = min_t(int, count, write_buffer_size);
-        dev_dbg(&dev->udev->dev, "%s: count = %Zd, bytes_to_write = %Zd\n",
+        dev_dbg(&dev->udev->dev, "%s: count = %zd, bytes_to_write = %zd\n",
                 __func__, count, bytes_to_write);
 
         if (copy_from_user (dev->interrupt_out_buffer, buffer, bytes_to_write)) {
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 356d312add57..0a643fa74cab 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -526,7 +526,7 @@ static size_t parport_uss720_epp_write_data(struct parport *pp, const void *buf,
                 return 0;
         i = usb_bulk_msg(usbdev, usb_sndbulkpipe(usbdev, 1), (void *)buf, length, &rlen, 20000);
         if (i)
-                printk(KERN_ERR "uss720: sendbulk ep 1 buf %p len %Zu rlen %u\n", buf, length, rlen);
+                printk(KERN_ERR "uss720: sendbulk ep 1 buf %p len %zu rlen %u\n", buf, length, rlen);
         change_mode(pp, ECR_PS2);
         return rlen;
 #endif
@@ -587,7 +587,7 @@ static size_t parport_uss720_ecp_write_data(struct parport *pp, const void *buff
                 return 0;
         i = usb_bulk_msg(usbdev, usb_sndbulkpipe(usbdev, 1), (void *)buffer, len, &rlen, 20000);
         if (i)
-                printk(KERN_ERR "uss720: sendbulk ep 1 buf %p len %Zu rlen %u\n", buffer, len, rlen);
+                printk(KERN_ERR "uss720: sendbulk ep 1 buf %p len %zu rlen %u\n", buffer, len, rlen);
         change_mode(pp, ECR_PS2);
         return rlen;
 }
@@ -605,7 +605,7 @@ static size_t parport_uss720_ecp_read_data(struct parport *pp, void *buffer, siz
                 return 0;
         i = usb_bulk_msg(usbdev, usb_rcvbulkpipe(usbdev, 2), buffer, len, &rlen, 20000);
         if (i)
-                printk(KERN_ERR "uss720: recvbulk ep 2 buf %p len %Zu rlen %u\n", buffer, len, rlen);
+                printk(KERN_ERR "uss720: recvbulk ep 2 buf %p len %zu rlen %u\n", buffer, len, rlen);
         change_mode(pp, ECR_PS2);
         return rlen;
 }
@@ -638,7 +638,7 @@ static size_t parport_uss720_write_compat(struct parport *pp, const void *buffer
                 return 0;
         i = usb_bulk_msg(usbdev, usb_sndbulkpipe(usbdev, 1), (void *)buffer, len, &rlen, 20000);
         if (i)
-                printk(KERN_ERR "uss720: sendbulk ep 1 buf %p len %Zu rlen %u\n", buffer, len, rlen);
+                printk(KERN_ERR "uss720: sendbulk ep 1 buf %p len %zu rlen %u\n", buffer, len, rlen);
         change_mode(pp, ECR_PS2);
         return rlen;
 }
diff --git a/drivers/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c
index 8b232290be6b..1a6f78d7d027 100644
--- a/drivers/usb/usbip/usbip_common.c
+++ b/drivers/usb/usbip/usbip_common.c
@@ -707,7 +707,7 @@ void usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
                 return;
 
         /*
-         * loop over all packets from last to first (to prevent overwritting
+         * loop over all packets from last to first (to prevent overwriting
          * memory when padding) and move them into the proper place
          */
         for (i = np-1; i > 0; i--) {
diff --git a/drivers/video/fbdev/aty/radeon_monitor.c b/drivers/video/fbdev/aty/radeon_monitor.c
index 278b421ab3fe..dd823f5fe4c9 100644
--- a/drivers/video/fbdev/aty/radeon_monitor.c
+++ b/drivers/video/fbdev/aty/radeon_monitor.c
@@ -646,7 +646,7 @@ void radeon_probe_screens(struct radeonfb_info *rinfo,
 
 
 /*
- * This functions applyes any arch/model/machine specific fixups
+ * This function applies any arch/model/machine specific fixups
  * to the panel info. It may eventually alter EDID block as
  * well or whatever is specific to a given model and not probed
  * properly by the default code
diff --git a/drivers/video/fbdev/metronomefb.c b/drivers/video/fbdev/metronomefb.c
index abb6bbf226d5..9085e9525341 100644
--- a/drivers/video/fbdev/metronomefb.c
+++ b/drivers/video/fbdev/metronomefb.c
@@ -187,7 +187,7 @@ static int load_waveform(u8 *mem, size_t size, int m, int t,
                 epd_frame_table[par->dt].wfm_size = user_wfm_size;
 
         if (size != epd_frame_table[par->dt].wfm_size) {
-                dev_err(dev, "Error: unexpected size %Zd != %d\n", size,
+                dev_err(dev, "Error: unexpected size %zd != %d\n", size,
                                         epd_frame_table[par->dt].wfm_size);
                 return -EINVAL;
         }
diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index 496f6c106bb1..b339e0e67b4c 100644
--- a/drivers/watchdog/bcm2835_wdt.c
+++ b/drivers/watchdog/bcm2835_wdt.c
@@ -36,9 +36,9 @@
 #define PM_RSTC_RESET                   0x00000102
 
 /*
- * The Raspberry Pi firmware uses the RSTS register to know which partiton
- * to boot from. The partiton value is spread into bits 0, 2, 4, 6, 8, 10.
- * Partiton 63 is a special partition used by the firmware to indicate halt.
+ * The Raspberry Pi firmware uses the RSTS register to know which partition
+ * to boot from. The partition value is spread into bits 0, 2, 4, 6, 8, 10.
+ * Partition 63 is a special partition used by the firmware to indicate halt.
  */
 #define PM_RSTS_RASPBERRYPI_HALT        0x555
 
diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index 2f088773f1c0..2f8bab390d13 100644
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -138,9 +138,9 @@ extern int	affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh);
 extern int      affs_remove_header(struct dentry *dentry);
 extern u32      affs_checksum_block(struct super_block *sb, struct buffer_head *bh);
 extern void     affs_fix_checksum(struct super_block *sb, struct buffer_head *bh);
-extern void     secs_to_datestamp(time64_t secs, struct affs_date *ds);
-extern umode_t  prot_to_mode(u32 prot);
-extern void     mode_to_prot(struct inode *inode);
+extern void     affs_secs_to_datestamp(time64_t secs, struct affs_date *ds);
+extern umode_t  affs_prot_to_mode(u32 prot);
+extern void     affs_mode_to_prot(struct inode *inode);
 __printf(3, 4)
 extern void     affs_error(struct super_block *sb, const char *function,
                            const char *fmt, ...);
@@ -162,6 +162,7 @@ extern void	affs_free_bitmap(struct super_block *sb);
 
 /* namei.c */
 
+extern const struct export_operations affs_export_ops;
 extern int      affs_hash_name(struct super_block *sb, const u8 *name, unsigned int len);
 extern struct dentry *affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int);
 extern int      affs_unlink(struct inode *dir, struct dentry *dentry);
@@ -178,7 +179,6 @@ extern int	affs_rename(struct inode *old_dir, struct dentry *old_dentry,
 
 /* inode.c */
 
-extern unsigned long             affs_parent_ino(struct inode *dir);
 extern struct inode             *affs_new_inode(struct inode *dir);
 extern int                       affs_notify_change(struct dentry *dentry, struct iattr *attr);
 extern void                      affs_evict_inode(struct inode *inode);
@@ -213,6 +213,12 @@ extern const struct address_space_operations	 affs_aops_ofs;
 extern const struct dentry_operations    affs_dentry_operations;
 extern const struct dentry_operations    affs_intl_dentry_operations;
 
+static inline bool affs_validblock(struct super_block *sb, int block)
+{
+        return(block >= AFFS_SB(sb)->s_reserved &&
+               block < AFFS_SB(sb)->s_partition_size);
+}
+
 static inline void
 affs_set_blocksize(struct super_block *sb, int size)
 {
@@ -222,7 +228,7 @@ static inline struct buffer_head *
 affs_bread(struct super_block *sb, int block)
 {
         pr_debug("%s: %d\n", __func__, block);
-        if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size)
+        if (affs_validblock(sb, block))
                 return sb_bread(sb, block);
         return NULL;
 }
@@ -230,7 +236,7 @@ static inline struct buffer_head *
 affs_getblk(struct super_block *sb, int block)
 {
         pr_debug("%s: %d\n", __func__, block);
-        if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size)
+        if (affs_validblock(sb, block))
                 return sb_getblk(sb, block);
         return NULL;
 }
@@ -239,7 +245,7 @@ affs_getzeroblk(struct super_block *sb, int block)
 {
         struct buffer_head *bh;
         pr_debug("%s: %d\n", __func__, block);
-        if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size) {
+        if (affs_validblock(sb, block)) {
                 bh = sb_getblk(sb, block);
                 lock_buffer(bh);
                 memset(bh->b_data, 0 , sb->s_blocksize);
@@ -254,7 +260,7 @@ affs_getemptyblk(struct super_block *sb, int block)
 {
         struct buffer_head *bh;
         pr_debug("%s: %d\n", __func__, block);
-        if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size) {
+        if (affs_validblock(sb, block)) {
                 bh = sb_getblk(sb, block);
                 wait_on_buffer(bh);
                 set_buffer_uptodate(bh);
diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index 0ec65c133b93..b573c3b9a328 100644
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -367,7 +367,7 @@ affs_fix_checksum(struct super_block *sb, struct buffer_head *bh)
 }
 
 void
-secs_to_datestamp(time64_t secs, struct affs_date *ds)
+affs_secs_to_datestamp(time64_t secs, struct affs_date *ds)
 {
         u32      days;
         u32      minute;
@@ -386,55 +386,55 @@ secs_to_datestamp(time64_t secs, struct affs_date *ds)
 }
 
 umode_t
-prot_to_mode(u32 prot)
+affs_prot_to_mode(u32 prot)
 {
         umode_t mode = 0;
 
         if (!(prot & FIBF_NOWRITE))
-                mode |= S_IWUSR;
+                mode |= 0200;
         if (!(prot & FIBF_NOREAD))
-                mode |= S_IRUSR;
+                mode |= 0400;
         if (!(prot & FIBF_NOEXECUTE))
-                mode |= S_IXUSR;
+                mode |= 0100;
         if (prot & FIBF_GRP_WRITE)
-                mode |= S_IWGRP;
+                mode |= 0020;
         if (prot & FIBF_GRP_READ)
-                mode |= S_IRGRP;
+                mode |= 0040;
         if (prot & FIBF_GRP_EXECUTE)
-                mode |= S_IXGRP;
+                mode |= 0010;
         if (prot & FIBF_OTR_WRITE)
-                mode |= S_IWOTH;
+                mode |= 0002;
         if (prot & FIBF_OTR_READ)
-                mode |= S_IROTH;
+                mode |= 0004;
         if (prot & FIBF_OTR_EXECUTE)
-                mode |= S_IXOTH;
+                mode |= 0001;
 
         return mode;
 }
 
 void
-mode_to_prot(struct inode *inode)
+affs_mode_to_prot(struct inode *inode)
 {
         u32 prot = AFFS_I(inode)->i_protect;
         umode_t mode = inode->i_mode;
 
-        if (!(mode & S_IXUSR))
+        if (!(mode & 0100))
                 prot |= FIBF_NOEXECUTE;
-        if (!(mode & S_IRUSR))
+        if (!(mode & 0400))
                 prot |= FIBF_NOREAD;
-        if (!(mode & S_IWUSR))
+        if (!(mode & 0200))
                 prot |= FIBF_NOWRITE;
-        if (mode & S_IXGRP)
+        if (mode & 0010)
                 prot |= FIBF_GRP_EXECUTE;
-        if (mode & S_IRGRP)
+        if (mode & 0040)
                 prot |= FIBF_GRP_READ;
-        if (mode & S_IWGRP)
+        if (mode & 0020)
                 prot |= FIBF_GRP_WRITE;
-        if (mode & S_IXOTH)
+        if (mode & 0001)
                 prot |= FIBF_OTR_EXECUTE;
-        if (mode & S_IROTH)
+        if (mode & 0004)
                 prot |= FIBF_OTR_READ;
-        if (mode & S_IWOTH)
+        if (mode & 0002)
                 prot |= FIBF_OTR_WRITE;
 
         AFFS_I(inode)->i_protect = prot;
diff --git a/fs/affs/inode.c b/fs/affs/inode.c
index fe4e1290dbb5..a5e6097eb5a9 100644
--- a/fs/affs/inode.c
+++ b/fs/affs/inode.c
@@ -69,7 +69,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
         if (affs_test_opt(sbi->s_flags, SF_SETMODE))
                 inode->i_mode = sbi->s_mode;
         else
-                inode->i_mode = prot_to_mode(prot);
+                inode->i_mode = affs_prot_to_mode(prot);
 
         id = be16_to_cpu(tail->uid);
         if (id == 0 || affs_test_opt(sbi->s_flags, SF_SETUID))
@@ -184,11 +184,12 @@ affs_write_inode(struct inode *inode, struct writeback_control *wbc)
         }
         tail = AFFS_TAIL(sb, bh);
         if (tail->stype == cpu_to_be32(ST_ROOT)) {
-                secs_to_datestamp(inode->i_mtime.tv_sec,&AFFS_ROOT_TAIL(sb, bh)->root_change);
+                affs_secs_to_datestamp(inode->i_mtime.tv_sec,
+                                       &AFFS_ROOT_TAIL(sb, bh)->root_change);
         } else {
                 tail->protect = cpu_to_be32(AFFS_I(inode)->i_protect);
                 tail->size = cpu_to_be32(inode->i_size);
-                secs_to_datestamp(inode->i_mtime.tv_sec,&tail->change);
+                affs_secs_to_datestamp(inode->i_mtime.tv_sec, &tail->change);
                 if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) {
                         uid = i_uid_read(inode);
                         gid = i_gid_read(inode);
@@ -249,7 +250,7 @@ affs_notify_change(struct dentry *dentry, struct iattr *attr)
         mark_inode_dirty(inode);
 
         if (attr->ia_valid & ATTR_MODE)
-                mode_to_prot(inode);
+                affs_mode_to_prot(inode);
 out:
         return error;
 }
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index 29186d29a3b6..96dd1d09a273 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -9,29 +9,10 @@
  */
 
 #include "affs.h"
+#include <linux/exportfs.h>
 
 typedef int (*toupper_t)(int);
 
-static int       affs_toupper(int ch);
-static int       affs_hash_dentry(const struct dentry *, struct qstr *);
-static int       affs_compare_dentry(const struct dentry *dentry,
-                unsigned int len, const char *str, const struct qstr *name);
-static int       affs_intl_toupper(int ch);
-static int       affs_intl_hash_dentry(const struct dentry *, struct qstr *);
-static int       affs_intl_compare_dentry(const struct dentry *dentry,
-                unsigned int len, const char *str, const struct qstr *name);
-
-const struct dentry_operations affs_dentry_operations = {
-        .d_hash         = affs_hash_dentry,
-        .d_compare      = affs_compare_dentry,
-};
-
-const struct dentry_operations affs_intl_dentry_operations = {
-        .d_hash         = affs_intl_hash_dentry,
-        .d_compare      = affs_intl_compare_dentry,
-};
-
-
 /* Simple toupper() for DOS\1 */
 
 static int
@@ -271,7 +252,7 @@ affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl)
                 return -ENOSPC;
 
         inode->i_mode = mode;
-        mode_to_prot(inode);
+        affs_mode_to_prot(inode);
         mark_inode_dirty(inode);
 
         inode->i_op = &affs_file_inode_operations;
@@ -301,7 +282,7 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
                 return -ENOSPC;
 
         inode->i_mode = S_IFDIR | mode;
-        mode_to_prot(inode);
+        affs_mode_to_prot(inode);
 
         inode->i_op = &affs_dir_inode_operations;
         inode->i_fop = &affs_dir_operations;
@@ -347,7 +328,7 @@ affs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
         inode_nohighmem(inode);
         inode->i_data.a_ops = &affs_symlink_aops;
         inode->i_mode = S_IFLNK | 0777;
-        mode_to_prot(inode);
+        affs_mode_to_prot(inode);
 
         error = -EIO;
         bh = affs_bread(sb, inode->i_ino);
@@ -465,3 +446,71 @@ done:
         affs_brelse(bh);
         return retval;
 }
+
+static struct dentry *affs_get_parent(struct dentry *child)
+{
+        struct inode *parent;
+        struct buffer_head *bh;
+
+        bh = affs_bread(child->d_sb, d_inode(child)->i_ino);
+        if (!bh)
+                return ERR_PTR(-EIO);
+
+        parent = affs_iget(child->d_sb,
+                           be32_to_cpu(AFFS_TAIL(child->d_sb, bh)->parent));
+        brelse(bh);
+        if (IS_ERR(parent))
+                return ERR_CAST(parent);
+
+        return d_obtain_alias(parent);
+}
+
+static struct inode *affs_nfs_get_inode(struct super_block *sb, u64 ino,
+                                        u32 generation)
+{
+        struct inode *inode;
+
+        if (!affs_validblock(sb, ino))
+                return ERR_PTR(-ESTALE);
+
+        inode = affs_iget(sb, ino);
+        if (IS_ERR(inode))
+                return ERR_CAST(inode);
+
+        if (generation && inode->i_generation != generation) {
+                iput(inode);
+                return ERR_PTR(-ESTALE);
+        }
+
+        return inode;
+}
+
+static struct dentry *affs_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,
+                                    affs_nfs_get_inode);
+}
+
+static struct dentry *affs_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,
+                                    affs_nfs_get_inode);
+}
+
+const struct export_operations affs_export_ops = {
+        .fh_to_dentry = affs_fh_to_dentry,
+        .fh_to_parent = affs_fh_to_parent,
+        .get_parent = affs_get_parent,
+};
+
+const struct dentry_operations affs_dentry_operations = {
+        .d_hash         = affs_hash_dentry,
+        .d_compare      = affs_compare_dentry,
+};
+
+const struct dentry_operations affs_intl_dentry_operations = {
+        .d_hash         = affs_intl_hash_dentry,
+        .d_compare      = affs_intl_compare_dentry,
+};
diff --git a/fs/affs/super.c b/fs/affs/super.c
index d6384863192c..37532538e8ab 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -32,7 +32,7 @@ affs_commit_super(struct super_block *sb, int wait)
         struct affs_root_tail *tail = AFFS_ROOT_TAIL(sb, bh);
 
         lock_buffer(bh);
-        secs_to_datestamp(ktime_get_real_seconds(), &tail->disk_change);
+        affs_secs_to_datestamp(ktime_get_real_seconds(), &tail->disk_change);
         affs_fix_checksum(sb, bh);
         unlock_buffer(bh);
 
@@ -507,6 +507,7 @@ got_root:
                 return -ENOMEM;
         }
 
+        sb->s_export_op = &affs_export_ops;
         pr_debug("s_flags=%lX\n", sb->s_flags);
         return 0;
 }
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index 51a241e09fbb..949f960337f5 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -252,7 +252,7 @@ static int afs_dir_iterate_block(struct dir_context *ctx,
                 /* skip entries marked unused in the bitmap */
                 if (!(block->pagehdr.bitmap[offset / 8] &
                       (1 << (offset % 8)))) {
-                        _debug("ENT[%Zu.%u]: unused",
+                        _debug("ENT[%zu.%u]: unused",
                                blkoff / sizeof(union afs_dir_block), offset);
                         if (offset >= curr)
                                 ctx->pos = blkoff +
@@ -266,7 +266,7 @@ static int afs_dir_iterate_block(struct dir_context *ctx,
                                sizeof(*block) -
                                offset * sizeof(union afs_dirent));
 
-                _debug("ENT[%Zu.%u]: %s %Zu \"%s\"",
+                _debug("ENT[%zu.%u]: %s %zu \"%s\"",
                        blkoff / sizeof(union afs_dir_block), offset,
                        (offset < curr ? "skip" : "fill"),
                        nlen, dire->u.name);
@@ -274,23 +274,23 @@ static int afs_dir_iterate_block(struct dir_context *ctx,
                 /* work out where the next possible entry is */
                 for (tmp = nlen; tmp > 15; tmp -= sizeof(union afs_dirent)) {
                         if (next >= AFS_DIRENT_PER_BLOCK) {
-                                _debug("ENT[%Zu.%u]:"
+                                _debug("ENT[%zu.%u]:"
                                        " %u travelled beyond end dir block"
-                                       " (len %u/%Zu)",
+                                       " (len %u/%zu)",
                                        blkoff / sizeof(union afs_dir_block),
                                        offset, next, tmp, nlen);
                                 return -EIO;
                         }
                         if (!(block->pagehdr.bitmap[next / 8] &
                               (1 << (next % 8)))) {
-                                _debug("ENT[%Zu.%u]:"
-                                       " %u unmarked extension (len %u/%Zu)",
+                                _debug("ENT[%zu.%u]:"
+                                       " %u unmarked extension (len %u/%zu)",
                                        blkoff / sizeof(union afs_dir_block),
                                        offset, next, tmp, nlen);
                                 return -EIO;
                         }
 
-                        _debug("ENT[%Zu.%u]: ext %u/%Zu",
+                        _debug("ENT[%zu.%u]: ext %u/%zu",
                                blkoff / sizeof(union afs_dir_block),
                                next, tmp, nlen);
                         next++;
diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index 6f48d670c941..806df746f1a9 100644
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -38,8 +38,6 @@
  * which have been left busy at at service shutdown.
  */
 
-#define AUTOFS_DEV_IOCTL_SIZE   sizeof(struct autofs_dev_ioctl)
-
 typedef int (*ioctl_fn)(struct file *, struct autofs_sb_info *,
                         struct autofs_dev_ioctl *);
 
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 82e8f6edfb48..d79ced925861 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -281,8 +281,8 @@ static int autofs4_mount_wait(const struct path *path, bool rcu_walk)
                 pr_debug("waiting for mount name=%pd\n", path->dentry);
                 status = autofs4_wait(sbi, path, NFY_MOUNT);
                 pr_debug("mount wait done status=%d\n", status);
+                ino->last_used = jiffies;
         }
-        ino->last_used = jiffies;
         return status;
 }
 
@@ -321,16 +321,21 @@ static struct dentry *autofs4_mountpoint_changed(struct path *path)
          */
         if (autofs_type_indirect(sbi->type) && d_unhashed(dentry)) {
                 struct dentry *parent = dentry->d_parent;
-                struct autofs_info *ino;
                 struct dentry *new;
 
                 new = d_lookup(parent, &dentry->d_name);
                 if (!new)
                         return NULL;
-                ino = autofs4_dentry_ino(new);
-                ino->last_used = jiffies;
-                dput(path->dentry);
-                path->dentry = new;
+                if (new == dentry)
+                        dput(new);
+                else {
+                        struct autofs_info *ino;
+
+                        ino = autofs4_dentry_ino(new);
+                        ino->last_used = jiffies;
+                        dput(path->dentry);
+                        path->dentry = new;
+                }
         }
         return path->dentry;
 }
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 1c62845a72c7..77c30f15a02c 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -989,7 +989,7 @@ struct block_device *bdget(dev_t dev)
                 bdev->bd_super = NULL;
                 bdev->bd_inode = inode;
                 bdev->bd_bdi = &noop_backing_dev_info;
-                bdev->bd_block_size = (1 << inode->i_blkbits);
+                bdev->bd_block_size = i_blocksize(inode);
                 bdev->bd_part_count = 0;
                 bdev->bd_invalidated = 0;
                 inode->i_mode = S_IFBLK;
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 18e5146df864..c1d2a07205da 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2875,7 +2875,7 @@ static long btrfs_fallocate(struct file *file, int mode,
                 if (!ret)
                         ret = btrfs_prealloc_file_range(inode, mode,
                                         range->start,
-                                        range->len, 1 << inode->i_blkbits,
+                                        range->len, i_blocksize(inode),
                                         offset + len, &alloc_hint);
                 else
                         btrfs_free_reserved_data_space(inode, range->start,
diff --git a/fs/buffer.c b/fs/buffer.c
index 0e87401cf335..28484b3ebc98 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2395,7 +2395,7 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,
                             loff_t pos, loff_t *bytes)
 {
         struct inode *inode = mapping->host;
-        unsigned blocksize = 1 << inode->i_blkbits;
+        unsigned int blocksize = i_blocksize(inode);
         struct page *page;
         void *fsdata;
         pgoff_t index, curidx;
@@ -2475,8 +2475,8 @@ int cont_write_begin(struct file *file, struct address_space *mapping,
                         get_block_t *get_block, loff_t *bytes)
 {
         struct inode *inode = mapping->host;
-        unsigned blocksize = 1 << inode->i_blkbits;
-        unsigned zerofrom;
+        unsigned int blocksize = i_blocksize(inode);
+        unsigned int zerofrom;
         int err;
 
         err = cont_expand_zero(file, mapping, pos, bytes);
@@ -2838,7 +2838,7 @@ int nobh_truncate_page(struct address_space *mapping,
         struct buffer_head map_bh;
         int err;
 
-        blocksize = 1 << inode->i_blkbits;
+        blocksize = i_blocksize(inode);
         length = offset & (blocksize - 1);
 
         /* Block boundary? Nothing to do */
@@ -2916,7 +2916,7 @@ int block_truncate_page(struct address_space *mapping,
         struct buffer_head *bh;
         int err;
 
-        blocksize = 1 << inode->i_blkbits;
+        blocksize = i_blocksize(inode);
         length = offset & (blocksize - 1);
 
         /* Block boundary? Nothing to do */
@@ -3028,7 +3028,7 @@ sector_t generic_block_bmap(struct address_space *mapping, sector_t block,
         struct inode *inode = mapping->host;
         tmp.b_state = 0;
         tmp.b_blocknr = 0;
-        tmp.b_size = 1 << inode->i_blkbits;
+        tmp.b_size = i_blocksize(inode);
         get_block(inode, block, &tmp, 0);
         return tmp.b_blocknr;
 }
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 09860c0ec7c1..7ce35aec8c76 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -751,7 +751,7 @@ static int ceph_writepages_start(struct address_space *mapping,
         struct pagevec pvec;
         int done = 0;
         int rc = 0;
-        unsigned wsize = 1 << inode->i_blkbits;
+        unsigned int wsize = i_blocksize(inode);
         struct ceph_osd_request *req = NULL;
         int do_sync = 0;
         loff_t snap_size, i_size;
diff --git a/fs/dax.c b/fs/dax.c
index 5ae8b71ebadc..7436c98b92c8 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1436,7 +1436,8 @@ out:
         return result;
 }
 #else
-static int dax_iomap_pmd_fault(struct vm_fault *vmf, struct iomap_ops *ops)
+static int dax_iomap_pmd_fault(struct vm_fault *vmf,
+                               const struct iomap_ops *ops)
 {
         return VM_FAULT_FALLBACK;
 }
diff --git a/fs/direct-io.c b/fs/direct-io.c
index c87bae4376b8..a04ebea77de8 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -587,7 +587,7 @@ static int dio_set_defer_completion(struct dio *dio)
 /*
  * Call into the fs to map some more disk blocks.  We record the current number
  * of available blocks at sdio->blocks_available.  These are in units of the
- * fs blocksize, (1 << inode->i_blkbits).
+ * fs blocksize, i_blocksize(inode).
  *
  * The fs is allowed to map lots of blocks at once.  If it wants to do that,
  * it uses the passed inode-relative block number as the file offset, as usual.
diff --git a/fs/ecryptfs/kthread.c b/fs/ecryptfs/kthread.c
index 866bb18efefe..e00d45af84ea 100644
--- a/fs/ecryptfs/kthread.c
+++ b/fs/ecryptfs/kthread.c
@@ -123,7 +123,7 @@ void ecryptfs_destroy_kthread(void)
  * @lower_dentry: Lower dentry for file to open
  * @lower_mnt: Lower vfsmount for file to open
  *
- * This function gets a r/w file opened againt the lower dentry.
+ * This function gets a r/w file opened against the lower dentry.
  *
  * Returns zero on success; non-zero otherwise
  */
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index bcb68fcc8445..5ec16313da1a 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1895,7 +1895,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
          * so EPOLLEXCLUSIVE is not allowed for a EPOLL_CTL_MOD operation.
          * Also, we do not currently supported nested exclusive wakeups.
          */
-        if (epds.events & EPOLLEXCLUSIVE) {
+        if (ep_op_has_event(op) && (epds.events & EPOLLEXCLUSIVE)) {
                 if (op == EPOLL_CTL_MOD)
                         goto error_tgt_fput;
                 if (op == EPOLL_CTL_ADD && (is_file_epoll(tf.file) ||
diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
index 37e059202cd2..e7f12a204cbc 100644
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@ -84,7 +84,7 @@
  *   -- writeout
  *      Writeout looks up whole page cache to see if a buffer is
  *      mapped, If there are not very many delayed buffers, then it is
- *      time comsuming.
+ *      time consuming.
  *
  * With extent status tree implementation, FIEMAP, SEEK_HOLE/DATA,
  * bigalloc and writeout can figure out if a block or a range of
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 41d8e53e5a7f..971f66342080 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2221,7 +2221,7 @@ static int mpage_process_page_bufs(struct mpage_da_data *mpd,
 {
         struct inode *inode = mpd->inode;
         int err;
-        ext4_lblk_t blocks = (i_size_read(inode) + (1 << inode->i_blkbits) - 1)
+        ext4_lblk_t blocks = (i_size_read(inode) + i_blocksize(inode) - 1)
                                                         >> inode->i_blkbits;
 
         do {
@@ -3577,7 +3577,7 @@ static ssize_t ext4_direct_IO_write(struct kiocb *iocb, struct iov_iter *iter)
         if (overwrite)
                 get_block_func = ext4_dio_get_block_overwrite;
         else if (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) ||
-                   round_down(offset, 1 << inode->i_blkbits) >= inode->i_size) {
+                   round_down(offset, i_blocksize(inode)) >= inode->i_size) {
                 get_block_func = ext4_dio_get_block;
                 dio_flags = DIO_LOCKING | DIO_SKIP_HOLES;
         } else if (is_sync_kiocb(iocb)) {
@@ -5179,7 +5179,7 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
          * do. We do the check mainly to optimize the common PAGE_SIZE ==
          * blocksize case
          */
-        if (offset > PAGE_SIZE - (1 << inode->i_blkbits))
+        if (offset > PAGE_SIZE - i_blocksize(inode))
                 return;
         while (1) {
                 page = find_lock_page(inode->i_mapping,
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 10c62de642c6..354dc1a894c2 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -838,7 +838,7 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)
         inode = page->mapping->host;
         sb = inode->i_sb;
         ngroups = ext4_get_groups_count(sb);
-        blocksize = 1 << inode->i_blkbits;
+        blocksize = i_blocksize(inode);
         blocks_per_page = PAGE_SIZE / blocksize;
 
         groups_per_page = blocks_per_page >> 1;
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 6fc14def0c70..578f8c33fb44 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -187,7 +187,7 @@ mext_page_mkuptodate(struct page *page, unsigned from, unsigned to)
         if (PageUptodate(page))
                 return 0;
 
-        blocksize = 1 << inode->i_blkbits;
+        blocksize = i_blocksize(inode);
         if (!page_has_buffers(page))
                 create_empty_buffers(page, blocksize, 0);
 
diff --git a/fs/hfs/mdb.c b/fs/hfs/mdb.c
index a3ec3ae7d347..482081bcdf70 100644
--- a/fs/hfs/mdb.c
+++ b/fs/hfs/mdb.c
@@ -38,7 +38,7 @@ static int hfs_get_last_session(struct super_block *sb,
 
         /* default values */
         *start = 0;
-        *size = sb->s_bdev->bd_inode->i_size >> 9;
+        *size = i_size_read(sb->s_bdev->bd_inode) >> 9;
 
         if (HFS_SB(sb)->session >= 0) {
                 te.cdte_track = HFS_SB(sb)->session;
diff --git a/fs/hfsplus/wrapper.c b/fs/hfsplus/wrapper.c
index ebb85e5f6549..e254fa0f0697 100644
--- a/fs/hfsplus/wrapper.c
+++ b/fs/hfsplus/wrapper.c
@@ -132,7 +132,7 @@ static int hfsplus_get_last_session(struct super_block *sb,
 
         /* default values */
         *start = 0;
-        *size = sb->s_bdev->bd_inode->i_size >> 9;
+        *size = i_size_read(sb->s_bdev->bd_inode) >> 9;
 
         if (HFSPLUS_SB(sb)->session >= 0) {
                 te.cdte_track = HFSPLUS_SB(sb)->session;
diff --git a/fs/iomap.c b/fs/iomap.c
index d209f42cdcb8..0f85f2410605 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -420,8 +420,8 @@ int
 iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
                 const struct iomap_ops *ops)
 {
-        unsigned blocksize = (1 << inode->i_blkbits);
-        unsigned off = pos & (blocksize - 1);
+        unsigned int blocksize = i_blocksize(inode);
+        unsigned int off = pos & (blocksize - 1);
 
         /* Block boundary? Nothing to do */
         if (!off)
@@ -735,9 +735,9 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length,
                 void *data, struct iomap *iomap)
 {
         struct iomap_dio *dio = data;
-        unsigned blkbits = blksize_bits(bdev_logical_block_size(iomap->bdev));
-        unsigned fs_block_size = (1 << inode->i_blkbits), pad;
-        unsigned align = iov_iter_alignment(dio->submit.iter);
+        unsigned int blkbits = blksize_bits(bdev_logical_block_size(iomap->bdev));
+        unsigned int fs_block_size = i_blocksize(inode), pad;
+        unsigned int align = iov_iter_alignment(dio->submit.iter);
         struct iov_iter iter;
         struct bio *bio;
         bool need_zeroout = false;
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 2be7c9ce6663..c64c2574a0aa 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -758,7 +758,7 @@ static ssize_t jfs_quota_read(struct super_block *sb, int type, char *data,
                                 sb->s_blocksize - offset : toread;
 
                 tmp_bh.b_state = 0;
-                tmp_bh.b_size = 1 << inode->i_blkbits;
+                tmp_bh.b_size = i_blocksize(inode);
                 err = jfs_get_block(inode, blk, &tmp_bh, 0);
                 if (err)
                         return err;
@@ -798,7 +798,7 @@ static ssize_t jfs_quota_write(struct super_block *sb, int type,
                                 sb->s_blocksize - offset : towrite;
 
                 tmp_bh.b_state = 0;
-                tmp_bh.b_size = 1 << inode->i_blkbits;
+                tmp_bh.b_size = i_blocksize(inode);
                 err = jfs_get_block(inode, blk, &tmp_bh, 1);
                 if (err)
                         goto out;
diff --git a/fs/mpage.c b/fs/mpage.c
index 28af984a3d96..baff8f820c29 100644
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -115,7 +115,7 @@ map_buffer_to_page(struct page *page, struct buffer_head *bh, int page_block)
                         SetPageUptodate(page);    
                         return;
                 }
-                create_empty_buffers(page, 1 << inode->i_blkbits, 0);
+                create_empty_buffers(page, i_blocksize(inode), 0);
         }
         head = page_buffers(page);
         page_bh = head;
diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c
index f32f272ee501..97b111d79489 100644
--- a/fs/ncpfs/sock.c
+++ b/fs/ncpfs/sock.c
@@ -525,7 +525,7 @@ static int do_tcp_rcv(struct ncp_server *server, void *buffer, size_t len)
                 return result;
         }
         if (result > len) {
-                pr_err("tcp: bug in recvmsg (%u > %Zu)\n", result, len);
+                pr_err("tcp: bug in recvmsg (%u > %zu)\n", result, len);
                 return -EIO;                    
         }
         return result;
@@ -619,7 +619,7 @@ skipdata:;
                                         goto skipdata2;
                                 }
                                 if (datalen > req->datalen + 8) {
-                                        pr_err("tcp: Unexpected reply len %d (expected at most %Zd)\n", datalen, req->datalen + 8);
+                                        pr_err("tcp: Unexpected reply len %d (expected at most %zd)\n", datalen, req->datalen + 8);
                                         server->rcv.state = 3;
                                         goto skipdata;
                                 }
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index 2905479f214a..0ca370d23ddb 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -381,7 +381,7 @@ bl_write_pagelist(struct nfs_pgio_header *header, int sync)
         struct blk_plug plug;
         int i;
 
-        dprintk("%s enter, %Zu@%lld\n", __func__, count, offset);
+        dprintk("%s enter, %zu@%lld\n", __func__, count, offset);
 
         /* At this point, header->page_aray is a (sequential) list of nfs_pages.
          * We want to write each, and if there is an error set pnfs_error
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index a3fc48ba4931..18f98e08544d 100644
--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -482,7 +482,7 @@ filelayout_read_pagelist(struct nfs_pgio_header *hdr)
         u32 j, idx;
         struct nfs_fh *fh;
 
-        dprintk("--> %s ino %lu pgbase %u req %Zu@%llu\n",
+        dprintk("--> %s ino %lu pgbase %u req %zu@%llu\n",
                 __func__, hdr->inode->i_ino,
                 hdr->args.pgbase, (size_t)hdr->args.count, offset);
 
@@ -540,7 +540,7 @@ filelayout_write_pagelist(struct nfs_pgio_header *hdr, int sync)
         if (IS_ERR(ds_clnt))
                 return PNFS_NOT_ATTEMPTED;
 
-        dprintk("%s ino %lu sync %d req %Zu@%llu DS: %s cl_count %d\n",
+        dprintk("%s ino %lu sync %d req %zu@%llu DS: %s cl_count %d\n",
                 __func__, hdr->inode->i_ino, sync, (size_t) hdr->args.count,
                 offset, ds->ds_remotestr, atomic_read(&ds->ds_clp->cl_count));
 
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index 0ca4af8cca5d..d6acc688df7e 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -1751,7 +1751,7 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr)
         int vers;
         struct nfs_fh *fh;
 
-        dprintk("--> %s ino %lu pgbase %u req %Zu@%llu\n",
+        dprintk("--> %s ino %lu pgbase %u req %zu@%llu\n",
                 __func__, hdr->inode->i_ino,
                 hdr->args.pgbase, (size_t)hdr->args.count, offset);
 
@@ -1828,7 +1828,7 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync)
 
         vers = nfs4_ff_layout_ds_version(lseg, idx);
 
-        dprintk("%s ino %lu sync %d req %Zu@%llu DS: %s cl_count %d vers %d\n",
+        dprintk("%s ino %lu sync %d req %zu@%llu DS: %s cl_count %d vers %d\n",
                 __func__, hdr->inode->i_ino, sync, (size_t) hdr->args.count,
                 offset, ds->ds_remotestr, atomic_read(&ds->ds_clp->cl_count),
                 vers);
diff --git a/fs/nfs/objlayout/objlayout.c b/fs/nfs/objlayout/objlayout.c
index 2a4cdce939a0..8f3d2acb81c3 100644
--- a/fs/nfs/objlayout/objlayout.c
+++ b/fs/nfs/objlayout/objlayout.c
@@ -291,7 +291,7 @@ objlayout_read_pagelist(struct nfs_pgio_header *hdr)
                               &hdr->args.pgbase,
                               hdr->args.offset, hdr->args.count);
 
-        dprintk("%s: inode(%lx) offset 0x%llx count 0x%Zx eof=%d\n",
+        dprintk("%s: inode(%lx) offset 0x%llx count 0x%zx eof=%d\n",
                 __func__, inode->i_ino, offset, count, hdr->res.eof);
 
         err = objio_read_pagelist(hdr);
diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index a06115e31612..92b4b41d19d2 100644
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -24,7 +24,7 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,
 {
         struct nfsd4_layout_seg *seg = &args->lg_seg;
         struct super_block *sb = inode->i_sb;
-        u32 block_size = (1 << inode->i_blkbits);
+        u32 block_size = i_blocksize(inode);
         struct pnfs_block_extent *bex;
         struct iomap iomap;
         u32 device_generation = 0;
@@ -181,7 +181,7 @@ nfsd4_block_proc_layoutcommit(struct inode *inode,
         int nr_iomaps;
 
         nr_iomaps = nfsd4_block_decode_layoutupdate(lcp->lc_up_layout,
-                        lcp->lc_up_len, &iomaps, 1 << inode->i_blkbits);
+                        lcp->lc_up_len, &iomaps, i_blocksize(inode));
         if (nr_iomaps < 0)
                 return nfserrno(nr_iomaps);
 
@@ -375,7 +375,7 @@ nfsd4_scsi_proc_layoutcommit(struct inode *inode,
         int nr_iomaps;
 
         nr_iomaps = nfsd4_scsi_decode_layoutupdate(lcp->lc_up_layout,
-                        lcp->lc_up_len, &iomaps, 1 << inode->i_blkbits);
+                        lcp->lc_up_len, &iomaps, i_blocksize(inode));
         if (nr_iomaps < 0)
                 return nfserrno(nr_iomaps);
 
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index d6b97b424ad1..96fd15979cbd 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -578,7 +578,7 @@ nfsd_cache_append(struct svc_rqst *rqstp, struct kvec *data)
         struct kvec     *vec = &rqstp->rq_res.head[0];
 
         if (vec->iov_len + data->iov_len > PAGE_SIZE) {
-                printk(KERN_WARNING "nfsd: cached reply too large (%Zd).\n",
+                printk(KERN_WARNING "nfsd: cached reply too large (%zd).\n",
                                 data->iov_len);
                 return 0;
         }
diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c
index 2c90e285d7c6..03b8ba933eb2 100644
--- a/fs/nilfs2/alloc.c
+++ b/fs/nilfs2/alloc.c
@@ -34,7 +34,7 @@
 static inline unsigned long
 nilfs_palloc_groups_per_desc_block(const struct inode *inode)
 {
-        return (1UL << inode->i_blkbits) /
+        return i_blocksize(inode) /
                 sizeof(struct nilfs_palloc_group_desc);
 }
 
diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c
index d5c23da43513..c21e0b4454a6 100644
--- a/fs/nilfs2/btnode.c
+++ b/fs/nilfs2/btnode.c
@@ -50,7 +50,7 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr)
                 brelse(bh);
                 BUG();
         }
-        memset(bh->b_data, 0, 1 << inode->i_blkbits);
+        memset(bh->b_data, 0, i_blocksize(inode));
         bh->b_bdev = inode->i_sb->s_bdev;
         bh->b_blocknr = blocknr;
         set_buffer_mapped(bh);
diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index 2e315f9f2e51..06ffa135dfa6 100644
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -119,7 +119,7 @@ nilfs_btree_node_set_nchildren(struct nilfs_btree_node *node, int nchildren)
 
 static int nilfs_btree_node_size(const struct nilfs_bmap *btree)
 {
-        return 1 << btree->b_inode->i_blkbits;
+        return i_blocksize(btree->b_inode);
 }
 
 static int nilfs_btree_nchildren_per_block(const struct nilfs_bmap *btree)
@@ -1870,7 +1870,7 @@ int nilfs_btree_convert_and_insert(struct nilfs_bmap *btree,
                 di = &dreq;
                 ni = NULL;
         } else if ((n + 1) <= NILFS_BTREE_NODE_NCHILDREN_MAX(
-                           1 << btree->b_inode->i_blkbits)) {
+                           nilfs_btree_node_size(btree))) {
                 di = &dreq;
                 ni = &nreq;
         } else {
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index c7f4fef9ebf5..7ffe71a8dfb9 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -51,7 +51,7 @@ void nilfs_inode_add_blocks(struct inode *inode, int n)
 {
         struct nilfs_root *root = NILFS_I(inode)->i_root;
 
-        inode_add_bytes(inode, (1 << inode->i_blkbits) * n);
+        inode_add_bytes(inode, i_blocksize(inode) * n);
         if (root)
                 atomic64_add(n, &root->blocks_count);
 }
@@ -60,7 +60,7 @@ void nilfs_inode_sub_blocks(struct inode *inode, int n)
 {
         struct nilfs_root *root = NILFS_I(inode)->i_root;
 
-        inode_sub_bytes(inode, (1 << inode->i_blkbits) * n);
+        inode_sub_bytes(inode, i_blocksize(inode) * n);
         if (root)
                 atomic64_sub(n, &root->blocks_count);
 }
diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index d56d3a5bea88..98835ed6bef4 100644
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -57,7 +57,7 @@ nilfs_mdt_insert_new_block(struct inode *inode, unsigned long block,
         set_buffer_mapped(bh);
 
         kaddr = kmap_atomic(bh->b_page);
-        memset(kaddr + bh_offset(bh), 0, 1 << inode->i_blkbits);
+        memset(kaddr + bh_offset(bh), 0, i_blocksize(inode));
         if (init_block)
                 init_block(inode, bh, kaddr);
         flush_dcache_page(bh->b_page);
@@ -501,7 +501,7 @@ void nilfs_mdt_set_entry_size(struct inode *inode, unsigned int entry_size,
         struct nilfs_mdt_info *mi = NILFS_MDT(inode);
 
         mi->mi_entry_size = entry_size;
-        mi->mi_entries_per_block = (1 << inode->i_blkbits) / entry_size;
+        mi->mi_entries_per_block = i_blocksize(inode) / entry_size;
         mi->mi_first_entry_offset = DIV_ROUND_UP(header_size, entry_size);
 }
 
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index bedcae2c28e6..7d18d62e8e07 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -723,7 +723,7 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,
 
                 lock_page(page);
                 if (!page_has_buffers(page))
-                        create_empty_buffers(page, 1 << inode->i_blkbits, 0);
+                        create_empty_buffers(page, i_blocksize(inode), 0);
                 unlock_page(page);
 
                 bh = head = page_buffers(page);
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 11556b7d93ec..88a31e9340a0 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -608,7 +608,7 @@ int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno,
         int ret = 0;
         struct buffer_head *head, *bh, *wait[2], **wait_bh = wait;
         unsigned int block_end, block_start;
-        unsigned int bsize = 1 << inode->i_blkbits;
+        unsigned int bsize = i_blocksize(inode);
 
         if (!page_has_buffers(page))
                 create_empty_buffers(page, bsize, 0);
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 7025d8c27999..3e04279446e8 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -2924,7 +2924,7 @@ again:
         /*
          * if target is down, we need to clear DLM_LOCK_RES_BLOCK_DIRTY for
          * another try; otherwise, we are sure the MIGRATING state is there,
-         * drop the unneded state which blocked threads trying to DIRTY
+         * drop the unneeded state which blocked threads trying to DIRTY
          */
         spin_lock(&res->spinlock);
         BUG_ON(!(res->state & DLM_LOCK_RES_BLOCK_DIRTY));
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 7b6a146327d7..8836305eb378 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -808,7 +808,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
         /* We know that zero_from is block aligned */
         for (block_start = zero_from; block_start < zero_to;
              block_start = block_end) {
-                block_end = block_start + (1 << inode->i_blkbits);
+                block_end = block_start + i_blocksize(inode);
 
                 /*
                  * block_start is block-aligned.  Bump it by one to force
diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c
index 06af81f71e10..9b96b99539d6 100644
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -306,7 +306,7 @@ int orangefs_inode_getattr(struct inode *inode, int new, int bypass)
                 break;
         case S_IFDIR:
                 inode->i_size = PAGE_SIZE;
-                orangefs_inode->blksize = (1 << inode->i_blkbits);
+                orangefs_inode->blksize = i_blocksize(inode);
                 spin_lock(&inode->i_lock);
                 inode_set_bytes(inode, inode->i_size);
                 spin_unlock(&inode->i_lock);
@@ -316,7 +316,7 @@ int orangefs_inode_getattr(struct inode *inode, int new, int bypass)
                 if (new) {
                         inode->i_size = (loff_t)strlen(new_op->
                             downcall.resp.getattr.link_target);
-                        orangefs_inode->blksize = (1 << inode->i_blkbits);
+                        orangefs_inode->blksize = i_blocksize(inode);
                         ret = strscpy(orangefs_inode->link_target,
                             new_op->downcall.resp.getattr.link_target,
                             ORANGEFS_NAME_MAX);
diff --git a/fs/proc/base.c b/fs/proc/base.c
index b8f06273353e..1e1e182d571b 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -766,7 +766,7 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
 
                 if (!IS_ERR_OR_NULL(mm)) {
                         /* ensure this mm_struct can't be freed */
-                        atomic_inc(&mm->mm_count);
+                        mmgrab(mm);
                         /* but do not pin its memory */
                         mmput(mm);
                 }
@@ -813,7 +813,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
                 return -ENOMEM;
 
         copied = 0;
-        if (!atomic_inc_not_zero(&mm->mm_users))
+        if (!mmget_not_zero(mm))
                 goto free;
 
         /* Maybe we should limit FOLL_FORCE to actual ptrace users? */
@@ -921,7 +921,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
                 return -ENOMEM;
 
         ret = 0;
-        if (!atomic_inc_not_zero(&mm->mm_users))
+        if (!mmget_not_zero(mm))
                 goto free;
 
         down_read(&mm->mmap_sem);
@@ -1064,7 +1064,7 @@ static int __set_oom_adj(struct file *file, int oom_adj, bool legacy)
                 if (p) {
                         if (atomic_read(&p->mm->mm_users) > 1) {
                                 mm = p->mm;
-                                atomic_inc(&mm->mm_count);
+                                mmgrab(mm);
                         }
                         task_unlock(p);
                 }
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
index 0b80ad87b4d6..ea9f3d1ae830 100644
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@ -373,7 +373,10 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff)
                 phdr->p_flags   = PF_R|PF_W|PF_X;
                 phdr->p_offset  = kc_vaddr_to_offset(m->addr) + dataoff;
                 phdr->p_vaddr   = (size_t)m->addr;
-                phdr->p_paddr   = 0;
+                if (m->type == KCORE_RAM || m->type == KCORE_TEXT)
+                        phdr->p_paddr   = __pa(m->addr);
+                else
+                        phdr->p_paddr   = (elf_addr_t)-1;
                 phdr->p_filesz  = phdr->p_memsz = m->size;
                 phdr->p_align   = PAGE_SIZE;
         }
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 8f96a49178d0..ee3efb229ef6 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -167,7 +167,7 @@ static void *m_start(struct seq_file *m, loff_t *ppos)
                 return ERR_PTR(-ESRCH);
 
         mm = priv->mm;
-        if (!mm || !atomic_inc_not_zero(&mm->mm_users))
+        if (!mm || !mmget_not_zero(mm))
                 return NULL;
 
         down_read(&mm->mmap_sem);
@@ -1352,7 +1352,7 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,
         unsigned long end_vaddr;
         int ret = 0, copied = 0;
 
-        if (!mm || !atomic_inc_not_zero(&mm->mm_users))
+        if (!mm || !mmget_not_zero(mm))
                 goto out;
 
         ret = -EINVAL;
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 37175621e890..1ef97cfcf422 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -219,7 +219,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
                 return ERR_PTR(-ESRCH);
 
         mm = priv->mm;
-        if (!mm || !atomic_inc_not_zero(&mm->mm_users))
+        if (!mm || !mmget_not_zero(mm))
                 return NULL;
 
         down_read(&mm->mmap_sem);
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 2f8c5c9bdaf6..b396eb09f288 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -189,7 +189,7 @@ int reiserfs_commit_page(struct inode *inode, struct page *page,
         int ret = 0;
 
         th.t_trans_id = 0;
-        blocksize = 1 << inode->i_blkbits;
+        blocksize = i_blocksize(inode);
 
         if (logit) {
                 reiserfs_write_lock(s);
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index cfeae9b0a2b7..a6ab9d64ea1b 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -525,7 +525,7 @@ static int reiserfs_get_blocks_direct_io(struct inode *inode,
          * referenced in convert_tail_for_hole() that may be called from
          * reiserfs_get_block()
          */
-        bh_result->b_size = (1 << inode->i_blkbits);
+        bh_result->b_size = i_blocksize(inode);
 
         ret = reiserfs_get_block(inode, iblock, bh_result,
                                  create | GET_BLOCK_NO_DANGLE);
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index e314cb30a181..feabcde0290d 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -1166,7 +1166,7 @@ static int reiserfs_parse_options(struct super_block *s,
                         if (!strcmp(arg, "auto")) {
                                 /* From JFS code, to auto-get the size. */
                                 *blocks =
-                                    s->s_bdev->bd_inode->i_size >> s->
+                                    i_size_read(s->s_bdev->bd_inode) >> s->
                                     s_blocksize_bits;
                         } else {
                                 *blocks = simple_strtoul(arg, &p, 0);
diff --git a/fs/stat.c b/fs/stat.c
index a268b7f27adf..3f14d1ef0868 100644
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -31,7 +31,7 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
         stat->atime = inode->i_atime;
         stat->mtime = inode->i_mtime;
         stat->ctime = inode->i_ctime;
-        stat->blksize = (1 << inode->i_blkbits);
+        stat->blksize = i_blocksize(inode);
         stat->blocks = inode->i_blocks;
 }
 
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 8ec6b3df0bc7..a8d8f71ef8bd 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1193,7 +1193,7 @@ int udf_setsize(struct inode *inode, loff_t newsize)
 {
         int err;
         struct udf_inode_info *iinfo;
-        int bsize = 1 << inode->i_blkbits;
+        int bsize = i_blocksize(inode);
 
         if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
               S_ISLNK(inode->i_mode)))
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 625b7285a37b..3c421d06a18e 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -1807,17 +1807,17 @@ static void init_once_userfaultfd_ctx(void *mem)
 }
 
 /**
- * userfaultfd_file_create - Creates an userfaultfd file pointer.
+ * userfaultfd_file_create - Creates a userfaultfd file pointer.
  * @flags: Flags for the userfaultfd file.
  *
- * This function creates an userfaultfd file pointer, w/out installing
+ * This function creates a userfaultfd file pointer, w/out installing
  * it into the fd table. This is useful when the userfaultfd file is
  * used during the initialization of data structures that require
  * extra setup after the userfaultfd creation. So the userfaultfd
  * creation is split into the file pointer creation phase, and the
  * file descriptor installation phase.  In this way races with
  * userspace closing the newly installed file descriptor can be
- * avoided.  Returns an userfaultfd file pointer, or a proper error
+ * avoided.  Returns a userfaultfd file pointer, or a proper error
  * pointer.
  */
 static struct file *userfaultfd_file_create(int flags)
@@ -1847,7 +1847,7 @@ static struct file *userfaultfd_file_create(int flags)
         ctx->released = false;
         ctx->mm = current->mm;
         /* prevent the mm struct to be freed */
-        atomic_inc(&ctx->mm->mm_count);
+        mmgrab(ctx->mm);
 
         file = anon_inode_getfile("[userfaultfd]", &userfaultfd_fops, ctx,
                                   O_RDWR | (flags & UFFD_SHARED_FCNTL_FLAGS));
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 1ff9df7a3ce8..bf65a9ea8642 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -103,9 +103,9 @@ xfs_finish_page_writeback(
         unsigned int            bsize;
 
         ASSERT(bvec->bv_offset < PAGE_SIZE);
-        ASSERT((bvec->bv_offset & ((1 << inode->i_blkbits) - 1)) == 0);
+        ASSERT((bvec->bv_offset & (i_blocksize(inode) - 1)) == 0);
         ASSERT(end < PAGE_SIZE);
-        ASSERT((bvec->bv_len & ((1 << inode->i_blkbits) - 1)) == 0);
+        ASSERT((bvec->bv_len & (i_blocksize(inode) - 1)) == 0);
 
         bh = head = page_buffers(bvec->bv_page);
 
@@ -349,7 +349,7 @@ xfs_map_blocks(
 {
         struct xfs_inode        *ip = XFS_I(inode);
         struct xfs_mount        *mp = ip->i_mount;
-        ssize_t                 count = 1 << inode->i_blkbits;
+        ssize_t                 count = i_blocksize(inode);
         xfs_fileoff_t           offset_fsb, end_fsb;
         int                     error = 0;
         int                     bmapi_flags = XFS_BMAPI_ENTIRE;
@@ -758,7 +758,7 @@ xfs_aops_discard_page(
                         break;
                 }
 next_buffer:
-                offset += 1 << inode->i_blkbits;
+                offset += i_blocksize(inode);
 
         } while ((bh = bh->b_this_page) != head);
 
@@ -846,7 +846,7 @@ xfs_writepage_map(
         LIST_HEAD(submit_list);
         struct xfs_ioend        *ioend, *next;
         struct buffer_head      *bh, *head;
-        ssize_t                 len = 1 << inode->i_blkbits;
+        ssize_t                 len = i_blocksize(inode);
         int                     error = 0;
         int                     count = 0;
         int                     uptodate = 1;
@@ -1210,7 +1210,7 @@ xfs_map_trim_size(
             offset + mapping_size >= i_size_read(inode)) {
                 /* limit mapping to block that spans EOF */
                 mapping_size = roundup_64(i_size_read(inode) - offset,
-                                          1 << inode->i_blkbits);
+                                          i_blocksize(inode));
         }
         if (mapping_size > LONG_MAX)
                 mapping_size = LONG_MAX;
@@ -1241,7 +1241,7 @@ xfs_get_blocks(
                 return -EIO;
 
         offset = (xfs_off_t)iblock << inode->i_blkbits;
-        ASSERT(bh_result->b_size >= (1 << inode->i_blkbits));
+        ASSERT(bh_result->b_size >= i_blocksize(inode));
         size = bh_result->b_size;
 
         if (offset >= i_size_read(inode))
@@ -1389,7 +1389,7 @@ xfs_vm_set_page_dirty(
                         if (offset < end_offset)
                                 set_buffer_dirty(bh);
                         bh = bh->b_this_page;
-                        offset += 1 << inode->i_blkbits;
+                        offset += i_blocksize(inode);
                 } while (bh != head);
         }
         /*
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index a50eca676670..35703a801372 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -754,7 +754,7 @@ xfs_file_fallocate(
                 if (error)
                         goto out_unlock;
         } else if (mode & FALLOC_FL_COLLAPSE_RANGE) {
-                unsigned blksize_mask = (1 << inode->i_blkbits) - 1;
+                unsigned int blksize_mask = i_blocksize(inode) - 1;
 
                 if (offset & blksize_mask || len & blksize_mask) {
                         error = -EINVAL;
@@ -776,7 +776,7 @@ xfs_file_fallocate(
                 if (error)
                         goto out_unlock;
         } else if (mode & FALLOC_FL_INSERT_RANGE) {
-                unsigned blksize_mask = (1 << inode->i_blkbits) - 1;
+                unsigned int blksize_mask = i_blocksize(inode) - 1;
 
                 new_size = i_size_read(inode) + len;
                 if (offset & blksize_mask || len & blksize_mask) {
diff --git a/include/asm-generic/kprobes.h b/include/asm-generic/kprobes.h
new file mode 100644
index 000000000000..57af9f21d148
--- /dev/null
+++ b/include/asm-generic/kprobes.h
@@ -0,0 +1,25 @@
+#ifndef _ASM_GENERIC_KPROBES_H
+#define _ASM_GENERIC_KPROBES_H
+
+#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+#ifdef CONFIG_KPROBES
+/*
+ * Blacklist ganerating macro. Specify functions which is not probed
+ * by using this macro.
+ */
+# define __NOKPROBE_SYMBOL(fname)                               \
+static unsigned long __used                                     \
+        __attribute__((__section__("_kprobe_blacklist")))       \
+        _kbl_addr_##fname = (unsigned long)fname;
+# define NOKPROBE_SYMBOL(fname) __NOKPROBE_SYMBOL(fname)
+/* Use this to forbid a kprobes attach on very low level functions */
+# define __kprobes      __attribute__((__section__(".kprobes.text")))
+# define nokprobe_inline        __always_inline
+#else
+# define NOKPROBE_SYMBOL(fname)
+# define __kprobes
+# define nokprobe_inline        inline
+#endif
+#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
+
+#endif /* _ASM_GENERIC_KPROBES_H */
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 9e40be522793..aef47be2a5c1 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -711,8 +711,10 @@ int __compat_save_altstack(compat_stack_t __user *, unsigned long);
         compat_stack_t __user *__uss = uss; \
         struct task_struct *t = current; \
         put_user_ex(ptr_to_compat((void __user *)t->sas_ss_sp), &__uss->ss_sp); \
-        put_user_ex(sas_ss_flags(sp), &__uss->ss_flags); \
+        put_user_ex(t->sas_ss_flags, &__uss->ss_flags); \
         put_user_ex(t->sas_ss_size, &__uss->ss_size); \
+        if (t->sas_ss_flags & SS_AUTODISARM) \
+                sas_ss_reset(t); \
 } while (0);
 
 asmlinkage long compat_sys_sched_rr_get_interval(compat_pid_t pid,
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 627e697e5d25..f8110051188f 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -577,12 +577,4 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
         (_________p1); \
 })
 
-/* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
-#ifdef CONFIG_KPROBES
-# define __kprobes      __attribute__((__section__(".kprobes.text")))
-# define nokprobe_inline        __always_inline
-#else
-# define __kprobes
-# define nokprobe_inline        inline
-#endif
 #endif /* __LINUX_COMPILER_H */
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index c965e4469499..591b6c16f9c1 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -562,7 +562,7 @@ static inline struct dentry *d_backing_dentry(struct dentry *upper)
  * @inode: inode to select the dentry from multiple layers (can be NULL)
  * @flags: open flags to control copy-up behavior
  *
- * If dentry is on an union/overlay, then return the underlying, real dentry.
+ * If dentry is on a union/overlay, then return the underlying, real dentry.
  * Otherwise return the dentry itself.
  *
  * See also: Documentation/filesystems/vfs.txt
@@ -581,7 +581,7 @@ static inline struct dentry *d_real(struct dentry *dentry,
  * d_real_inode - Return the real inode
  * @dentry: The dentry to query
  *
- * If dentry is on an union/overlay, then return the underlying, real inode.
+ * If dentry is on a union/overlay, then return the underlying, real inode.
  * Otherwise return d_inode().
  */
 static inline struct inode *d_real_inode(const struct dentry *dentry)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index c930cbc19342..c64f2cb7d364 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -655,6 +655,11 @@ struct inode {
         void                    *i_private; /* fs or device private pointer */
 };
 
+static inline unsigned int i_blocksize(const struct inode *node)
+{
+        return (1 << node->i_blkbits);
+}
+
 static inline int inode_unhashed(struct inode *inode)
 {
         return hlist_unhashed(&inode->i_hash);
diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h
index 8f2e059e4d45..4d748603e818 100644
--- a/include/linux/kconfig.h
+++ b/include/linux/kconfig.h
@@ -8,7 +8,7 @@
 
 /*
  * The use of "&&" / "||" is limited in certain expressions.
- * The followings enable to calculate "and" / "or" with macro expansion only.
+ * The following enable to calculate "and" / "or" with macro expansion only.
  */
 #define __and(x, y)                     ___and(x, y)
 #define ___and(x, y)                    ____and(__ARG_PLACEHOLDER_##x, y)
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 16ddfb8b304a..c328e4f7dcad 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -29,7 +29,7 @@
  *              <jkenisto@us.ibm.com>  and Prasanna S Panchamukhi
  *              <prasanna@in.ibm.com> added function-return probes.
  */
-#include <linux/compiler.h>     /* for __kprobes */
+#include <linux/compiler.h>
 #include <linux/linkage.h>
 #include <linux/list.h>
 #include <linux/notifier.h>
@@ -40,9 +40,9 @@
 #include <linux/rcupdate.h>
 #include <linux/mutex.h>
 #include <linux/ftrace.h>
+#include <asm/kprobes.h>
 
 #ifdef CONFIG_KPROBES
-#include <asm/kprobes.h>
 
 /* kprobe_status settings */
 #define KPROBE_HIT_ACTIVE       0x00000001
@@ -51,6 +51,7 @@
 #define KPROBE_HIT_SSDONE       0x00000008
 
 #else /* CONFIG_KPROBES */
+#include <asm-generic/kprobes.h>
 typedef int kprobe_opcode_t;
 struct arch_specific_insn {
         int dummy;
@@ -509,18 +510,4 @@ static inline bool is_kprobe_optinsn_slot(unsigned long addr)
 }
 #endif
 
-#ifdef CONFIG_KPROBES
-/*
- * Blacklist ganerating macro. Specify functions which is not probed
- * by using this macro.
- */
-#define __NOKPROBE_SYMBOL(fname)                        \
-static unsigned long __used                             \
-        __attribute__((section("_kprobe_blacklist")))   \
-        _kbl_addr_##fname = (unsigned long)fname;
-#define NOKPROBE_SYMBOL(fname)  __NOKPROBE_SYMBOL(fname)
-#else
-#define NOKPROBE_SYMBOL(fname)
-#endif
-
 #endif /* _LINUX_KPROBES_H */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 808751d7b737..4f6d440ad785 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -407,8 +407,27 @@ struct mm_struct {
         unsigned long task_size;                /* size of task vm space */
         unsigned long highest_vm_end;           /* highest vma end address */
         pgd_t * pgd;
-        atomic_t mm_users;                      /* How many users with user space? */
-        atomic_t mm_count;                      /* How many references to "struct mm_struct" (users count as 1) */
+
+        /**
+         * @mm_users: The number of users including userspace.
+         *
+         * Use mmget()/mmget_not_zero()/mmput() to modify. When this drops
+         * to 0 (i.e. when the task exits and there are no other temporary
+         * reference holders), we also release a reference on @mm_count
+         * (which may then free the &struct mm_struct if @mm_count also
+         * drops to 0).
+         */
+        atomic_t mm_users;
+
+        /**
+         * @mm_count: The number of references to &struct mm_struct
+         * (@mm_users count as 1).
+         *
+         * Use mmgrab()/mmdrop() to modify. When this drops to 0, the
+         * &struct mm_struct is freed.
+         */
+        atomic_t mm_count;
+
         atomic_long_t nr_ptes;                  /* PTE page table pages */
 #if CONFIG_PGTABLE_LEVELS > 2
         atomic_long_t nr_pmds;                  /* PMD page table pages */
diff --git a/include/linux/mtd/qinfo.h b/include/linux/mtd/qinfo.h
index 7b3d487d8b3f..b532ce524dae 100644
--- a/include/linux/mtd/qinfo.h
+++ b/include/linux/mtd/qinfo.h
@@ -14,7 +14,7 @@
  * @DevId - Chip Device ID
  * @qinfo - pointer to qinfo records describing the chip
  * @numchips - number of chips including virual RWW partitions
- * @chipshift - Chip/partiton size 2^chipshift
+ * @chipshift - Chip/partition size 2^chipshift
  * @chips - per-chip data structure
  */
 struct lpddr_private {
diff --git a/include/linux/pid.h b/include/linux/pid.h
index 23705a53abba..298ead5512e5 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -191,10 +191,10 @@ pid_t pid_vnr(struct pid *pid);
 #define do_each_pid_thread(pid, type, task)                             \
         do_each_pid_task(pid, type, task) {                             \
                 struct task_struct *tg___ = task;                       \
-                do {
+                for_each_thread(tg___, task) {
 
 #define while_each_pid_thread(pid, type, task)                          \
-                } while_each_thread(tg___, task);                       \
+                }                                                       \
                 task = tg___;                                           \
         } while_each_pid_task(pid, type, task)
 #endif /* _LINUX_PID_H */
diff --git a/include/linux/rodata_test.h b/include/linux/rodata_test.h
new file mode 100644
index 000000000000..ea05f6c51413
--- /dev/null
+++ b/include/linux/rodata_test.h
@@ -0,0 +1,23 @@
+/*
+ * rodata_test.h: functional test for mark_rodata_ro function
+ *
+ * (C) Copyright 2008 Intel Corporation
+ * Author: Arjan van de Ven <arjan@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+
+#ifndef _RODATA_TEST_H
+#define _RODATA_TEST_H
+
+#ifdef CONFIG_DEBUG_RODATA_TEST
+extern const int rodata_test_data;
+void rodata_test(void);
+#else
+static inline void rodata_test(void) {}
+#endif
+
+#endif /* _RODATA_TEST_H */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 451e241f32c5..4a28deb5f210 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2904,6 +2904,28 @@ static inline unsigned long sigsp(unsigned long sp, struct ksignal *ksig)
  */
 extern struct mm_struct * mm_alloc(void);
 
+/**
+ * mmgrab() - Pin a &struct mm_struct.
+ * @mm: The &struct mm_struct to pin.
+ *
+ * Make sure that @mm will not get freed even after the owning task
+ * exits. This doesn't guarantee that the associated address space
+ * will still exist later on and mmget_not_zero() has to be used before
+ * accessing it.
+ *
+ * This is a preferred way to to pin @mm for a longer/unbounded amount
+ * of time.
+ *
+ * Use mmdrop() to release the reference acquired by mmgrab().
+ *
+ * See also <Documentation/vm/active_mm.txt> for an in-depth explanation
+ * of &mm_struct.mm_count vs &mm_struct.mm_users.
+ */
+static inline void mmgrab(struct mm_struct *mm)
+{
+        atomic_inc(&mm->mm_count);
+}
+
 /* mmdrop drops the mm and the page tables */
 extern void __mmdrop(struct mm_struct *);
 static inline void mmdrop(struct mm_struct *mm)
@@ -2926,6 +2948,27 @@ static inline void mmdrop_async(struct mm_struct *mm)
         }
 }
 
+/**
+ * mmget() - Pin the address space associated with a &struct mm_struct.
+ * @mm: The address space to pin.
+ *
+ * Make sure that the address space of the given &struct mm_struct doesn't
+ * go away. This does not protect against parts of the address space being
+ * modified or freed, however.
+ *
+ * Never use this function to pin this address space for an
+ * unbounded/indefinite amount of time.
+ *
+ * Use mmput() to release the reference acquired by mmget().
+ *
+ * See also <Documentation/vm/active_mm.txt> for an in-depth explanation
+ * of &mm_struct.mm_count vs &mm_struct.mm_users.
+ */
+static inline void mmget(struct mm_struct *mm)
+{
+        atomic_inc(&mm->mm_users);
+}
+
 static inline bool mmget_not_zero(struct mm_struct *mm)
 {
         return atomic_inc_not_zero(&mm->mm_users);
diff --git a/include/linux/sem.h b/include/linux/sem.h
index d0efd6e6c20a..4fc222f8755d 100644
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -21,7 +21,7 @@ struct sem_array {
         struct list_head        list_id;        /* undo requests on this array */
         int                     sem_nsems;      /* no. of semaphores in array */
         int                     complex_count;  /* pending complex operations */
-        bool                    complex_mode;   /* no parallel simple ops */
+        unsigned int            use_global_lock;/* >0: global lock required */
 };
 
 #ifdef CONFIG_SYSVIPC
diff --git a/include/linux/spi/flash.h b/include/linux/spi/flash.h
index 3f22932e67a4..f4199e758f97 100644
--- a/include/linux/spi/flash.h
+++ b/include/linux/spi/flash.h
@@ -7,7 +7,7 @@ struct mtd_partition;
  * struct flash_platform_data: board-specific flash data
  * @name: optional flash device name (eg, as used with mtdparts=)
  * @parts: optional array of mtd_partitions for static partitioning
- * @nr_parts: number of mtd_partitions for static partitoning
+ * @nr_parts: number of mtd_partitions for static partitioning
  * @type: optional flash device type (e.g. m25p80 vs m25p64), for use
  *      with chips that can't be queried for JEDEC or other IDs
  *
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index e1006b391cdc..bee1404391dd 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -174,10 +174,10 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
  *              not freed when the control is deleted. Should this be needed
  *              then a new internal bitfield can be added to tell the framework
  *              to free this pointer.
- * @p_cur:      The control's current value represented via an union with
+ * @p_cur:      The control's current value represented via a union with
  *              provides a standard way of accessing control types
  *              through a pointer.
- * @p_new:      The control's new value represented via an union with provides
+ * @p_new:      The control's new value represented via a union with provides
  *              a standard way of accessing control types
  *              through a pointer.
  */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index c92dc03c8528..ead1aa6d003e 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1948,7 +1948,7 @@ struct cfg80211_deauth_request {
  * struct cfg80211_disassoc_request - Disassociation request data
  *
  * This structure provides information needed to complete IEEE 802.11
- * disassocation.
+ * disassociation.
  *
  * @bss: the BSS to disassociate from
  * @ie: Extra IEs to add to Disassociation frame or %NULL
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index b9a08cd1d97d..a3bab3c5ecfb 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -3392,7 +3392,7 @@ enum ieee80211_reconfig_type {
  *      since there won't be any time to beacon before the switch anyway.
  * @pre_channel_switch: This is an optional callback that is called
  *      before a channel switch procedure is started (ie. when a STA
- *      gets a CSA or an userspace initiated channel-switch), allowing
+ *      gets a CSA or a userspace initiated channel-switch), allowing
  *      the driver to prepare for the channel switch.
  * @post_channel_switch: This is an optional callback that is called
  *      after a channel switch procedure is completed, allowing the
diff --git a/include/uapi/linux/auto_dev-ioctl.h b/include/uapi/linux/auto_dev-ioctl.h
index 021ed331dd71..744b3d060968 100644
--- a/include/uapi/linux/auto_dev-ioctl.h
+++ b/include/uapi/linux/auto_dev-ioctl.h
@@ -113,17 +113,13 @@ struct autofs_dev_ioctl {
 
 static inline void init_autofs_dev_ioctl(struct autofs_dev_ioctl *in)
 {
-        memset(in, 0, sizeof(struct autofs_dev_ioctl));
+        memset(in, 0, AUTOFS_DEV_IOCTL_SIZE);
         in->ver_major = AUTOFS_DEV_IOCTL_VERSION_MAJOR;
         in->ver_minor = AUTOFS_DEV_IOCTL_VERSION_MINOR;
-        in->size = sizeof(struct autofs_dev_ioctl);
+        in->size = AUTOFS_DEV_IOCTL_SIZE;
         in->ioctlfd = -1;
 }
 
-/*
- * If you change this make sure you make the corresponding change
- * to autofs-dev-ioctl.c:lookup_ioctl()
- */
 enum {
         /* Get various version info */
         AUTOFS_DEV_IOCTL_VERSION_CMD = 0x71,
@@ -160,8 +156,6 @@ enum {
         AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD,
 };
 
-#define AUTOFS_IOCTL 0x93
-
 #define AUTOFS_DEV_IOCTL_VERSION \
         _IOWR(AUTOFS_IOCTL, \
               AUTOFS_DEV_IOCTL_VERSION_CMD, struct autofs_dev_ioctl)
diff --git a/include/uapi/linux/auto_fs.h b/include/uapi/linux/auto_fs.h
index 1bfc3ed8b284..aa63451ef20a 100644
--- a/include/uapi/linux/auto_fs.h
+++ b/include/uapi/linux/auto_fs.h
@@ -61,12 +61,23 @@ struct autofs_packet_expire {
         char name[NAME_MAX+1];
 };
 
-#define AUTOFS_IOC_READY      _IO(0x93, 0x60)
-#define AUTOFS_IOC_FAIL       _IO(0x93, 0x61)
-#define AUTOFS_IOC_CATATONIC  _IO(0x93, 0x62)
-#define AUTOFS_IOC_PROTOVER   _IOR(0x93, 0x63, int)
-#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93, 0x64, compat_ulong_t)
-#define AUTOFS_IOC_SETTIMEOUT _IOWR(0x93, 0x64, unsigned long)
-#define AUTOFS_IOC_EXPIRE     _IOR(0x93, 0x65, struct autofs_packet_expire)
+#define AUTOFS_IOCTL 0x93
+
+enum {
+        AUTOFS_IOC_READY_CMD = 0x60,
+        AUTOFS_IOC_FAIL_CMD,
+        AUTOFS_IOC_CATATONIC_CMD,
+        AUTOFS_IOC_PROTOVER_CMD,
+        AUTOFS_IOC_SETTIMEOUT_CMD,
+        AUTOFS_IOC_EXPIRE_CMD,
+};
+
+#define AUTOFS_IOC_READY        _IO(AUTOFS_IOCTL, AUTOFS_IOC_READY_CMD)
+#define AUTOFS_IOC_FAIL         _IO(AUTOFS_IOCTL, AUTOFS_IOC_FAIL_CMD)
+#define AUTOFS_IOC_CATATONIC    _IO(AUTOFS_IOCTL, AUTOFS_IOC_CATATONIC_CMD)
+#define AUTOFS_IOC_PROTOVER     _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOVER_CMD, int)
+#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(AUTOFS_IOCTL, AUTOFS_IOC_SETTIMEOUT_CMD, compat_ulong_t)
+#define AUTOFS_IOC_SETTIMEOUT   _IOWR(AUTOFS_IOCTL, AUTOFS_IOC_SETTIMEOUT_CMD, unsigned long)
+#define AUTOFS_IOC_EXPIRE       _IOR(AUTOFS_IOCTL, AUTOFS_IOC_EXPIRE_CMD, struct autofs_packet_expire)
 
 #endif /* _UAPI_LINUX_AUTO_FS_H */
diff --git a/include/uapi/linux/auto_fs4.h b/include/uapi/linux/auto_fs4.h
index 8f8f1bdcca8c..7c6da423d54e 100644
--- a/include/uapi/linux/auto_fs4.h
+++ b/include/uapi/linux/auto_fs4.h
@@ -148,10 +148,16 @@ union autofs_v5_packet_union {
         autofs_packet_expire_direct_t expire_direct;
 };
 
-#define AUTOFS_IOC_EXPIRE_MULTI         _IOW(0x93, 0x66, int)
-#define AUTOFS_IOC_EXPIRE_INDIRECT      AUTOFS_IOC_EXPIRE_MULTI
-#define AUTOFS_IOC_EXPIRE_DIRECT        AUTOFS_IOC_EXPIRE_MULTI
-#define AUTOFS_IOC_PROTOSUBVER          _IOR(0x93, 0x67, int)
-#define AUTOFS_IOC_ASKUMOUNT            _IOR(0x93, 0x70, int)
+enum {
+        AUTOFS_IOC_EXPIRE_MULTI_CMD = 0x66, /* AUTOFS_IOC_EXPIRE_CMD + 1 */
+        AUTOFS_IOC_PROTOSUBVER_CMD,
+        AUTOFS_IOC_ASKUMOUNT_CMD = 0x70, /* AUTOFS_DEV_IOCTL_VERSION_CMD - 1 */
+};
+
+#define AUTOFS_IOC_EXPIRE_MULTI    _IOW(AUTOFS_IOCTL, AUTOFS_IOC_EXPIRE_MULTI_CMD, int)
+#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI
+#define AUTOFS_IOC_EXPIRE_DIRECT   AUTOFS_IOC_EXPIRE_MULTI
+#define AUTOFS_IOC_PROTOSUBVER     _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOSUBVER_CMD, int)
+#define AUTOFS_IOC_ASKUMOUNT       _IOR(AUTOFS_IOCTL, AUTOFS_IOC_ASKUMOUNT_CMD, int)
 
 #endif /* _LINUX_AUTO_FS4_H */
diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
index 56806bc90c2f..7fb7112d667c 100644
--- a/include/xen/interface/grant_table.h
+++ b/include/xen/interface/grant_table.h
@@ -181,7 +181,7 @@ struct grant_entry_header {
 };
 
 /*
- * Version 2 of the grant entry structure, here is an union because three
+ * Version 2 of the grant entry structure, here is a union because three
  * different types are suppotted: full_page, sub_page and transitive.
  */
 union grant_entry_v2 {
diff --git a/init/initramfs.c b/init/initramfs.c
index b32ad7d97ac9..981f286c1d16 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -18,6 +18,7 @@
 #include <linux/dirent.h>
 #include <linux/syscalls.h>
 #include <linux/utime.h>
+#include <linux/file.h>
 
 static ssize_t __init xwrite(int fd, const char *p, size_t count)
 {
@@ -647,6 +648,7 @@ static int __init populate_rootfs(void)
                         printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
                 free_initrd();
 #endif
+                flush_delayed_fput();
                 /*
                  * Try loading default modules from initramfs.  This gives
                  * us a chance to load before device_initcalls.
diff --git a/init/main.c b/init/main.c
index 24ea48745061..47ea22d181ef 100644
--- a/init/main.c
+++ b/init/main.c
@@ -71,7 +71,6 @@
 #include <linux/shmem_fs.h>
 #include <linux/slab.h>
 #include <linux/perf_event.h>
-#include <linux/file.h>
 #include <linux/ptrace.h>
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
@@ -83,6 +82,7 @@
 #include <linux/proc_ns.h>
 #include <linux/io.h>
 #include <linux/cache.h>
+#include <linux/rodata_test.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -936,9 +936,10 @@ __setup("rodata=", set_debug_rodata);
 #ifdef CONFIG_STRICT_KERNEL_RWX
 static void mark_readonly(void)
 {
-        if (rodata_enabled)
+        if (rodata_enabled) {
                 mark_rodata_ro();
-        else
+                rodata_test();
+        } else
                 pr_info("Kernel memory protection disabled.\n");
 }
 #else
@@ -960,8 +961,6 @@ static int __ref kernel_init(void *unused)
         system_state = SYSTEM_RUNNING;
         numa_default_policy();
 
-        flush_delayed_fput();
-
         rcu_end_inkernel_boot();
 
         if (ramdisk_execute_command) {
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 7a2d8f0c8ae5..4fdd97031431 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -558,6 +558,7 @@ static void wq_add(struct mqueue_inode_info *info, int sr,
  */
 static int wq_sleep(struct mqueue_inode_info *info, int sr,
                     ktime_t *timeout, struct ext_wait_queue *ewp)
+        __releases(&info->lock)
 {
         int retval;
         signed long time;
diff --git a/ipc/sem.c b/ipc/sem.c
index 3ec5742b5640..e468cd1c12f0 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -159,22 +159,42 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it);
 #define SEMOPM_FAST     64  /* ~ 372 bytes on stack */
 
 /*
+ * Switching from the mode suitable for simple ops
+ * to the mode for complex ops is costly. Therefore:
+ * use some hysteresis
+ */
+#define USE_GLOBAL_LOCK_HYSTERESIS      10
+
+/*
  * Locking:
  * a) global sem_lock() for read/write
  *      sem_undo.id_next,
  *      sem_array.complex_count,
- *      sem_array.complex_mode
  *      sem_array.pending{_alter,_const},
  *      sem_array.sem_undo
  *
  * b) global or semaphore sem_lock() for read/write:
  *      sem_array.sem_base[i].pending_{const,alter}:
- *      sem_array.complex_mode (for read)
  *
  * c) special:
  *      sem_undo_list.list_proc:
  *      * undo_list->lock for write
  *      * rcu for read
+ *      use_global_lock:
+ *      * global sem_lock() for write
+ *      * either local or global sem_lock() for read.
+ *
+ * Memory ordering:
+ * Most ordering is enforced by using spin_lock() and spin_unlock().
+ * The special case is use_global_lock:
+ * Setting it from non-zero to 0 is a RELEASE, this is ensured by
+ * using smp_store_release().
+ * Testing if it is non-zero is an ACQUIRE, this is ensured by using
+ * smp_load_acquire().
+ * Setting it from 0 to non-zero must be ordered with regards to
+ * this smp_load_acquire(), this is guaranteed because the smp_load_acquire()
+ * is inside a spin_lock() and after a write from 0 to non-zero a
+ * spin_lock()+spin_unlock() is done.
  */
 
 #define sc_semmsl       sem_ctls[0]
@@ -273,29 +293,22 @@ static void complexmode_enter(struct sem_array *sma)
         int i;
         struct sem *sem;
 
-        if (sma->complex_mode)  {
-                /* We are already in complex_mode. Nothing to do */
+        if (sma->use_global_lock > 0)  {
+                /*
+                 * We are already in global lock mode.
+                 * Nothing to do, just reset the
+                 * counter until we return to simple mode.
+                 */
+                sma->use_global_lock = USE_GLOBAL_LOCK_HYSTERESIS;
                 return;
         }
-
-        /* We need a full barrier after seting complex_mode:
-         * The write to complex_mode must be visible
-         * before we read the first sem->lock spinlock state.
-         */
-        smp_store_mb(sma->complex_mode, true);
+        sma->use_global_lock = USE_GLOBAL_LOCK_HYSTERESIS;
 
         for (i = 0; i < sma->sem_nsems; i++) {
                 sem = sma->sem_base + i;
-                spin_unlock_wait(&sem->lock);
+                spin_lock(&sem->lock);
+                spin_unlock(&sem->lock);
         }
-        /*
-         * spin_unlock_wait() is not a memory barriers, it is only a
-         * control barrier. The code must pair with spin_unlock(&sem->lock),
-         * thus just the control barrier is insufficient.
-         *
-         * smp_rmb() is sufficient, as writes cannot pass the control barrier.
-         */
-        smp_rmb();
 }
 
 /*
@@ -310,13 +323,17 @@ static void complexmode_tryleave(struct sem_array *sma)
                  */
                 return;
         }
-        /*
-         * Immediately after setting complex_mode to false,
-         * a simple op can start. Thus: all memory writes
-         * performed by the current operation must be visible
-         * before we set complex_mode to false.
-         */
-        smp_store_release(&sma->complex_mode, false);
+        if (sma->use_global_lock == 1) {
+                /*
+                 * Immediately after setting use_global_lock to 0,
+                 * a simple op can start. Thus: all memory writes
+                 * performed by the current operation must be visible
+                 * before we set use_global_lock to 0.
+                 */
+                smp_store_release(&sma->use_global_lock, 0);
+        } else {
+                sma->use_global_lock--;
+        }
 }
 
 #define SEM_GLOBAL_LOCK (-1)
@@ -346,30 +363,23 @@ static inline int sem_lock(struct sem_array *sma, struct sembuf *sops,
          * Optimized locking is possible if no complex operation
          * is either enqueued or processed right now.
          *
-         * Both facts are tracked by complex_mode.
+         * Both facts are tracked by use_global_mode.
          */
         sem = sma->sem_base + sops->sem_num;
 
         /*
-         * Initial check for complex_mode. Just an optimization,
+         * Initial check for use_global_lock. Just an optimization,
          * no locking, no memory barrier.
          */
-        if (!sma->complex_mode) {
+        if (!sma->use_global_lock) {
                 /*
                  * It appears that no complex operation is around.
                  * Acquire the per-semaphore lock.
                  */
                 spin_lock(&sem->lock);
 
-                /*
-                 * See 51d7d5205d33
-                 * ("powerpc: Add smp_mb() to arch_spin_is_locked()"):
-                 * A full barrier is required: the write of sem->lock
-                 * must be visible before the read is executed
-                 */
-                smp_mb();
-
-                if (!smp_load_acquire(&sma->complex_mode)) {
+                /* pairs with smp_store_release() */
+                if (!smp_load_acquire(&sma->use_global_lock)) {
                         /* fast path successful! */
                         return sops->sem_num;
                 }
@@ -379,19 +389,26 @@ static inline int sem_lock(struct sem_array *sma, struct sembuf *sops,
         /* slow path: acquire the full lock */
         ipc_lock_object(&sma->sem_perm);
 
-        if (sma->complex_count == 0) {
-                /* False alarm:
-                 * There is no complex operation, thus we can switch
-                 * back to the fast path.
+        if (sma->use_global_lock == 0) {
+                /*
+                 * The use_global_lock mode ended while we waited for
+                 * sma->sem_perm.lock. Thus we must switch to locking
+                 * with sem->lock.
+                 * Unlike in the fast path, there is no need to recheck
+                 * sma->use_global_lock after we have acquired sem->lock:
+                 * We own sma->sem_perm.lock, thus use_global_lock cannot
+                 * change.
                  */
                 spin_lock(&sem->lock);
+
                 ipc_unlock_object(&sma->sem_perm);
                 return sops->sem_num;
         } else {
-                /* Not a false alarm, thus complete the sequence for a
-                 * full lock.
+                /*
+                 * Not a false alarm, thus continue to use the global lock
+                 * mode. No need for complexmode_enter(), this was done by
+                 * the caller that has set use_global_mode to non-zero.
                  */
-                complexmode_enter(sma);
                 return SEM_GLOBAL_LOCK;
         }
 }
@@ -495,7 +512,7 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
         }
 
         sma->complex_count = 0;
-        sma->complex_mode = true; /* dropped by sem_unlock below */
+        sma->use_global_lock = USE_GLOBAL_LOCK_HYSTERESIS;
         INIT_LIST_HEAD(&sma->pending_alter);
         INIT_LIST_HEAD(&sma->pending_const);
         INIT_LIST_HEAD(&sma->list_id);
diff --git a/ipc/shm.c b/ipc/shm.c
index d7805acb44fd..06ea9ef7f54a 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1091,8 +1091,8 @@ out_unlock1:
  * "raddr" thing points to kernel space, and there has to be a wrapper around
  * this.
  */
-long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
-              unsigned long shmlba)
+long do_shmat(int shmid, char __user *shmaddr, int shmflg,
+              ulong *raddr, unsigned long shmlba)
 {
         struct shmid_kernel *shp;
         unsigned long addr;
@@ -1113,8 +1113,13 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
                 goto out;
         else if ((addr = (ulong)shmaddr)) {
                 if (addr & (shmlba - 1)) {
-                        if (shmflg & SHM_RND)
-                                addr &= ~(shmlba - 1);     /* round down */
+                        /*
+                         * Round down to the nearest multiple of shmlba.
+                         * For sane do_mmap_pgoff() parameters, avoid
+                         * round downs that trigger nil-page and MAP_FIXED.
+                         */
+                        if ((shmflg & SHM_RND) && addr >= shmlba)
+                                addr &= ~(shmlba - 1);
                         else
 #ifndef __ARCH_FORCE_SHMLBA
                                 if (addr & ~PAGE_MASK)
diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config
index 1a8f34f63601..26a06e09a5bd 100644
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -21,6 +21,7 @@ CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_DEFAULT_SECURITY_SELINUX=y
 CONFIG_EMBEDDED=y
 CONFIG_FB=y
+CONFIG_HARDENED_USERCOPY=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
@@ -129,6 +130,7 @@ CONFIG_PPP_DEFLATE=y
 CONFIG_PPP_MPPE=y
 CONFIG_PREEMPT=y
 CONFIG_QUOTA=y
+CONFIG_RANDOMIZE_BASE=y
 CONFIG_RTC_CLASS=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_SECCOMP=y
diff --git a/kernel/configs/android-recommended.config b/kernel/configs/android-recommended.config
index 99127edc5204..28ee064b6744 100644
--- a/kernel/configs/android-recommended.config
+++ b/kernel/configs/android-recommended.config
@@ -1,4 +1,5 @@
 #  KEEP ALPHABETICALLY SORTED
+# CONFIG_AIO is not set
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_LEGACY_PTYS is not set
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 18c6b23edd3c..d630f8ac4d2f 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -747,7 +747,7 @@ build_map_info(struct address_space *mapping, loff_t offset, bool is_register)
                         continue;
                 }
 
-                if (!atomic_inc_not_zero(&vma->vm_mm->mm_users))
+                if (!mmget_not_zero(vma->vm_mm))
                         continue;
 
                 info = prev;
diff --git a/kernel/exit.c b/kernel/exit.c
index 90b09ca35c84..8a768a3672a5 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -539,7 +539,7 @@ static void exit_mm(void)
                 __set_current_state(TASK_RUNNING);
                 down_read(&mm->mmap_sem);
         }
-        atomic_inc(&mm->mm_count);
+        mmgrab(mm);
         BUG_ON(mm != current->active_mm);
         /* more a memory barrier than a real lock */
         task_lock(current);
diff --git a/kernel/fork.c b/kernel/fork.c
index 348fe73155bc..246bf9aaf9df 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1000,7 +1000,7 @@ struct mm_struct *get_task_mm(struct task_struct *task)
                 if (task->flags & PF_KTHREAD)
                         mm = NULL;
                 else
-                        atomic_inc(&mm->mm_users);
+                        mmget(mm);
         }
         task_unlock(task);
         return mm;
@@ -1188,7 +1188,7 @@ static int copy_mm(unsigned long clone_flags, struct task_struct *tsk)
         vmacache_flush(tsk);
 
         if (clone_flags & CLONE_VM) {
-                atomic_inc(&oldmm->mm_users);
+                mmget(oldmm);
                 mm = oldmm;
                 goto good_mm;
         }
diff --git a/kernel/futex.c b/kernel/futex.c
index cdf365036141..b687cb22301c 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -338,7 +338,7 @@ static inline bool should_fail_futex(bool fshared)
 
 static inline void futex_get_mm(union futex_key *key)
 {
-        atomic_inc(&key->private.mm->mm_count);
+        mmgrab(key->private.mm);
         /*
          * Ensure futex_get_mm() implies a full barrier such that
          * get_futex_key() implies a full barrier. This is relied upon
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 6b669593e7eb..944d068b6c48 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -353,7 +353,7 @@ static int setup_affinity(struct irq_desc *desc, struct cpumask *mask)
                 return 0;
 
         /*
-         * Preserve the managed affinity setting and an userspace affinity
+         * Preserve the managed affinity setting and a userspace affinity
          * setup, but make sure that one of the targets is online.
          */
         if (irqd_affinity_is_managed(&desc->irq_data) ||
diff --git a/kernel/relay.c b/kernel/relay.c
index 8f8dc91db680..0e413d9eec8a 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -847,7 +847,7 @@ void relay_close(struct rchan *chan)
 
         if (chan->last_toobig)
                 printk(KERN_WARNING "relay: one or more items not logged "
-                       "[item size (%Zd) > sub-buffer size (%Zd)]\n",
+                       "[item size (%zd) > sub-buffer size (%zd)]\n",
                        chan->last_toobig, chan->subbuf_size);
 
         list_del(&chan->list);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index e1ae6ac15eac..6ea1925ac5c0 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2847,7 +2847,7 @@ context_switch(struct rq *rq, struct task_struct *prev,
 
         if (!mm) {
                 next->active_mm = oldmm;
-                atomic_inc(&oldmm->mm_count);
+                mmgrab(oldmm);
                 enter_lazy_tlb(oldmm, next);
         } else
                 switch_mm_irqs_off(oldmm, mm, next);
@@ -6098,7 +6098,7 @@ void __init sched_init(void)
         /*
          * The boot idle thread does lazy MMU switching as well:
          */
-        atomic_inc(&init_mm.mm_count);
+        mmgrab(&init_mm);
         enter_lazy_tlb(&init_mm, current);
 
         /*
diff --git a/kernel/signal.c b/kernel/signal.c
index 13f9def8b24a..214a8feeb771 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3239,10 +3239,17 @@ int compat_restore_altstack(const compat_stack_t __user *uss)
 
 int __compat_save_altstack(compat_stack_t __user *uss, unsigned long sp)
 {
+        int err;
         struct task_struct *t = current;
-        return  __put_user(ptr_to_compat((void __user *)t->sas_ss_sp), &uss->ss_sp) |
-                __put_user(sas_ss_flags(sp), &uss->ss_flags) |
+        err = __put_user(ptr_to_compat((void __user *)t->sas_ss_sp),
+                         &uss->ss_sp) |
+                __put_user(t->sas_ss_flags, &uss->ss_flags) |
                 __put_user(t->sas_ss_size, &uss->ss_size);
+        if (err)
+                return err;
+        if (t->sas_ss_flags & SS_AUTODISARM)
+                sas_ss_reset(t);
+        return 0;
 }
 #endif
 
diff --git a/kernel/torture.c b/kernel/torture.c
index 0d887eb62856..01a99976f072 100644
--- a/kernel/torture.c
+++ b/kernel/torture.c
@@ -311,7 +311,7 @@ EXPORT_SYMBOL_GPL(torture_random);
 /*
  * Variables for shuffling.  The idea is to ensure that each CPU stays
  * idle for an extended period to test interactions with dyntick idle,
- * as well as interactions with any per-CPU varibles.
+ * as well as interactions with any per-CPU variables.
  */
 struct shuffle_task {
         struct list_head st_l;
diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig
index e77dfe00de36..8fa0791e8a1e 100644
--- a/lib/fonts/Kconfig
+++ b/lib/fonts/Kconfig
@@ -87,6 +87,14 @@ config FONT_6x10
           embedded devices with a 320x240 screen, to get a reasonable number
           of characters (53x24) that are still at a readable size.
 
+config FONT_10x18
+        bool "console 10x18 font (not supported by all drivers)" if FONTS
+        depends on FRAMEBUFFER_CONSOLE
+        help
+          This is a high resolution console font for machines with very
+          big letters. It fits between the sun 12x22 and the normal 8x16 font.
+          If other fonts are too big or too small for you, say Y, otherwise say N.
+
 config FONT_SUN8x16
         bool "Sparc console 8x16 font"
         depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
@@ -101,14 +109,6 @@ config FONT_SUN12x22
           big letters (like the letters used in the SPARC PROM). If the
           standard font is unreadable for you, say Y, otherwise say N.
 
-config FONT_10x18
-        bool "console 10x18 font (not supported by all drivers)" if FONTS
-        depends on FRAMEBUFFER_CONSOLE
-        help
-          This is a high resolution console font for machines with very
-          big letters. It fits between the sun 12x22 and the normal 8x16 font.
-          If other fonts are too big or too small for you, say Y, otherwise say N.
-
 config FONT_AUTOSELECT
         def_bool y
         depends on !FONT_8x8
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index 004fc70fc56a..c6cf82242d65 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -651,7 +651,6 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
 {
         unsigned int offset = 0;
         struct sg_mapping_iter miter;
-        unsigned long flags;
         unsigned int sg_flags = SG_MITER_ATOMIC;
 
         if (to_buffer)
@@ -664,9 +663,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
         if (!sg_miter_skip(&miter, skip))
                 return false;
 
-        local_irq_save(flags);
-
-        while (sg_miter_next(&miter) && offset < buflen) {
+        while ((offset < buflen) && sg_miter_next(&miter)) {
                 unsigned int len;
 
                 len = min(miter.length, buflen - offset);
@@ -681,7 +678,6 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
 
         sg_miter_stop(&miter);
 
-        local_irq_restore(flags);
         return offset;
 }
 EXPORT_SYMBOL(sg_copy_buffer);
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 0967771d8f7f..e3bf4e0f10b5 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1739,6 +1739,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
  * 'h', 'l', or 'L' for integer fields
  * 'z' support added 23/7/1999 S.H.
  * 'z' changed to 'Z' --davidm 1/25/99
+ * 'Z' changed to 'z' --adobriyan 2017-01-25
  * 't' added for ptrdiff_t
  *
  * @fmt: the format string
@@ -1838,7 +1839,7 @@ qualifier:
         /* get the conversion qualifier */
         qualifier = 0;
         if (*fmt == 'h' || _tolower(*fmt) == 'l' ||
-            _tolower(*fmt) == 'z' || *fmt == 't') {
+            *fmt == 'z' || *fmt == 't') {
                 qualifier = *fmt++;
                 if (unlikely(qualifier == *fmt)) {
                         if (qualifier == 'l') {
@@ -1907,7 +1908,7 @@ qualifier:
         else if (qualifier == 'l') {
                 BUILD_BUG_ON(FORMAT_TYPE_ULONG + SIGN != FORMAT_TYPE_LONG);
                 spec->type = FORMAT_TYPE_ULONG + (spec->flags & SIGN);
-        } else if (_tolower(qualifier) == 'z') {
+        } else if (qualifier == 'z') {
                 spec->type = FORMAT_TYPE_SIZE_T;
         } else if (qualifier == 't') {
                 spec->type = FORMAT_TYPE_PTRDIFF;
@@ -2657,7 +2658,7 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                 /* get conversion qualifier */
                 qualifier = -1;
                 if (*fmt == 'h' || _tolower(*fmt) == 'l' ||
-                    _tolower(*fmt) == 'z') {
+                    *fmt == 'z') {
                         qualifier = *fmt++;
                         if (unlikely(qualifier == *fmt)) {
                                 if (qualifier == 'h') {
@@ -2851,7 +2852,6 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                         else
                                 *va_arg(args, unsigned long long *) = val.u;
                         break;
-                case 'Z':
                 case 'z':
                         *va_arg(args, size_t *) = val.u;
                         break;
diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index afcc550877ff..79d0fd13b5b3 100644
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -90,3 +90,9 @@ config DEBUG_PAGE_REF
           careful when enabling this feature because it adds about 30 KB to the
           kernel code.  However the runtime performance overhead is virtually
           nil until the tracepoints are actually enabled.
+
+config DEBUG_RODATA_TEST
+    bool "Testcase for the marking rodata read-only"
+    depends on STRICT_KERNEL_RWX
+    ---help---
+      This option enables a testcase for the setting rodata read-only.
diff --git a/mm/Makefile b/mm/Makefile
index aa0aa17cb413..026f6a828a50 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -85,6 +85,7 @@ obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o
 obj-$(CONFIG_HWPOISON_INJECT) += hwpoison-inject.o
 obj-$(CONFIG_DEBUG_KMEMLEAK) += kmemleak.o
 obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak-test.o
+obj-$(CONFIG_DEBUG_RODATA_TEST) += rodata_test.o
 obj-$(CONFIG_PAGE_OWNER) += page_owner.o
 obj-$(CONFIG_CLEANCACHE) += cleancache.o
 obj-$(CONFIG_MEMORY_ISOLATION) += page_isolation.o
diff --git a/mm/dmapool.c b/mm/dmapool.c
index cef82b8a9291..4d90a64b2fdc 100644
--- a/mm/dmapool.c
+++ b/mm/dmapool.c
@@ -93,7 +93,7 @@ show_pools(struct device *dev, struct device_attribute *attr, char *buf)
                 spin_unlock_irq(&pool->lock);
 
                 /* per-pool info, no real statistics yet */
-                temp = scnprintf(next, size, "%-16s %4u %4Zu %4Zu %2u\n",
+                temp = scnprintf(next, size, "%-16s %4u %4zu %4zu %2u\n",
                                  pool->name, blocks,
                                  pages * (pool->allocation / pool->size),
                                  pool->size, pages);
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 77ae3239c3de..34bce5c308e3 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -420,7 +420,7 @@ int __khugepaged_enter(struct mm_struct *mm)
         list_add_tail(&mm_slot->mm_node, &khugepaged_scan.mm_head);
         spin_unlock(&khugepaged_mm_lock);
 
-        atomic_inc(&mm->mm_count);
+        mmgrab(mm);
         if (wakeup)
                 wake_up_interruptible(&khugepaged_wait);
 
diff --git a/mm/ksm.c b/mm/ksm.c
index cf211c01ceac..520e4c37fec7 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1854,7 +1854,7 @@ int __ksm_enter(struct mm_struct *mm)
         spin_unlock(&ksm_mmlist_lock);
 
         set_bit(MMF_VM_MERGEABLE, &mm->flags);
-        atomic_inc(&mm->mm_count);
+        mmgrab(mm);
 
         if (needs_wakeup)
                 wake_up_interruptible(&ksm_thread_wait);
diff --git a/mm/mmu_context.c b/mm/mmu_context.c
index 6f4d27c5bb32..daf67bb02b4a 100644
--- a/mm/mmu_context.c
+++ b/mm/mmu_context.c
@@ -25,7 +25,7 @@ void use_mm(struct mm_struct *mm)
         task_lock(tsk);
         active_mm = tsk->active_mm;
         if (active_mm != mm) {
-                atomic_inc(&mm->mm_count);
+                mmgrab(mm);
                 tsk->active_mm = mm;
         }
         tsk->mm = mm;
diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c
index f4259e496f83..32bc9f2ff7eb 100644
--- a/mm/mmu_notifier.c
+++ b/mm/mmu_notifier.c
@@ -275,7 +275,7 @@ static int do_mmu_notifier_register(struct mmu_notifier *mn,
                 mm->mmu_notifier_mm = mmu_notifier_mm;
                 mmu_notifier_mm = NULL;
         }
-        atomic_inc(&mm->mm_count);
+        mmgrab(mm);
 
         /*
          * Serialize the update against mmu_notifier_unregister. A
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 578321f1c070..51c091849dcb 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -653,7 +653,7 @@ static void mark_oom_victim(struct task_struct *tsk)
 
         /* oom_mm is bound to the signal struct life time. */
         if (!cmpxchg(&tsk->signal->oom_mm, NULL, mm))
-                atomic_inc(&tsk->signal->oom_mm->mm_count);
+                mmgrab(tsk->signal->oom_mm);
 
         /*
          * Make sure that the task is woken up from uninterruptible sleep
@@ -870,7 +870,7 @@ static void oom_kill_process(struct oom_control *oc, const char *message)
 
         /* Get a reference to safely compare mm after task_unlock(victim) */
         mm = victim->mm;
-        atomic_inc(&mm->mm_count);
+        mmgrab(mm);
         /*
          * We should send SIGKILL before setting TIF_MEMDIE in order to prevent
          * the OOM victim from depleting the memory reserves from the user
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index ae6e601f0a58..26a60818a8fc 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1797,7 +1797,7 @@ pause:
                  * pages exceeds dirty_thresh, give the other good wb's a pipe
                  * to go through, so that tasks on them still remain responsive.
                  *
-                 * In theory 1 page is enough to keep the comsumer-producer
+                 * In theory 1 page is enough to keep the consumer-producer
                  * pipe going: the flusher cleans 1 page => the task dirties 1
                  * more page. However wb_dirty has accounting errors.  So use
                  * the larger and more IO friendly wb_stat_error.
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 9f9623d690d6..a7a6aac95a6d 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5925,7 +5925,7 @@ static unsigned long __paginginit calc_memmap_size(unsigned long spanned_pages,
          * the zone and SPARSEMEM is in use. If there are holes within the
          * zone, each populated memory region may cost us one or two extra
          * memmap pages due to alignment because memmap pages for each
-         * populated regions may not naturally algined on page boundary.
+         * populated regions may not be naturally aligned on page boundary.
          * So the (present_pages >> 4) heuristic is a tradeoff for that.
          */
         if (spanned_pages > present_pages + (present_pages >> 4) &&
diff --git a/mm/percpu.c b/mm/percpu.c
index 0686f566d347..5696039b5c07 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -43,7 +43,7 @@
  * Chunks can be determined from the address using the index field
  * in the page struct. The index field contains a pointer to the chunk.
  *
- * To use this allocator, arch code should do the followings.
+ * To use this allocator, arch code should do the following:
  *
  * - define __addr_to_pcpu_ptr() and __pcpu_ptr_to_addr() to translate
  *   regular address to percpu pointer and back if they need to be
diff --git a/mm/rodata_test.c b/mm/rodata_test.c
new file mode 100644
index 000000000000..0fd21670b513
--- /dev/null
+++ b/mm/rodata_test.c
@@ -0,0 +1,56 @@
+/*
+ * rodata_test.c: functional test for mark_rodata_ro function
+ *
+ * (C) Copyright 2008 Intel Corporation
+ * Author: Arjan van de Ven <arjan@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/uaccess.h>
+#include <asm/sections.h>
+
+const int rodata_test_data = 0xC3;
+EXPORT_SYMBOL_GPL(rodata_test_data);
+
+void rodata_test(void)
+{
+        unsigned long start, end;
+        int zero = 0;
+
+        /* test 1: read the value */
+        /* If this test fails, some previous testrun has clobbered the state */
+        if (!rodata_test_data) {
+                pr_err("rodata_test: test 1 fails (start data)\n");
+                return;
+        }
+
+        /* test 2: write to the variable; this should fault */
+        if (!probe_kernel_write((void *)&rodata_test_data,
+                                                (void *)&zero, sizeof(zero))) {
+                pr_err("rodata_test: test data was not read only\n");
+                return;
+        }
+
+        /* test 3: check the value hasn't changed */
+        if (rodata_test_data == zero) {
+                pr_err("rodata_test: test data was changed\n");
+                return;
+        }
+
+        /* test 4: check if the rodata section is PAGE_SIZE aligned */
+        start = (unsigned long)__start_rodata;
+        end = (unsigned long)__end_rodata;
+        if (start & (PAGE_SIZE - 1)) {
+                pr_err("rodata_test: start of .rodata is not page size aligned\n");
+                return;
+        }
+        if (end & (PAGE_SIZE - 1)) {
+                pr_err("rodata_test: end of .rodata is not page size aligned\n");
+                return;
+        }
+
+        pr_info("rodata_test: all tests were successful\n");
+}
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 2cac12cc9abe..fadc6a1c0da0 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1671,7 +1671,7 @@ int try_to_unuse(unsigned int type, bool frontswap,
          * that.
          */
         start_mm = &init_mm;
-        atomic_inc(&init_mm.mm_users);
+        mmget(&init_mm);
 
         /*
          * Keep on scanning until all entries have gone.  Usually,
@@ -1720,7 +1720,7 @@ int try_to_unuse(unsigned int type, bool frontswap,
                 if (atomic_read(&start_mm->mm_users) == 1) {
                         mmput(start_mm);
                         start_mm = &init_mm;
-                        atomic_inc(&init_mm.mm_users);
+                        mmget(&init_mm);
                 }
 
                 /*
@@ -1757,13 +1757,13 @@ int try_to_unuse(unsigned int type, bool frontswap,
                         struct mm_struct *prev_mm = start_mm;
                         struct mm_struct *mm;
 
-                        atomic_inc(&new_start_mm->mm_users);
-                        atomic_inc(&prev_mm->mm_users);
+                        mmget(new_start_mm);
+                        mmget(prev_mm);
                         spin_lock(&mmlist_lock);
                         while (swap_count(*swap_map) && !retval &&
                                         (p = p->next) != &start_mm->mmlist) {
                                 mm = list_entry(p, struct mm_struct, mmlist);
-                                if (!atomic_inc_not_zero(&mm->mm_users))
+                                if (!mmget_not_zero(mm))
                                         continue;
                                 spin_unlock(&mmlist_lock);
                                 mmput(prev_mm);
@@ -1781,7 +1781,7 @@ int try_to_unuse(unsigned int type, bool frontswap,
 
                                 if (set_start_mm && *swap_map < swcount) {
                                         mmput(new_start_mm);
-                                        atomic_inc(&mm->mm_users);
+                                        mmget(mm);
                                         new_start_mm = mm;
                                         set_start_mm = 0;
                                 }
diff --git a/mm/truncate.c b/mm/truncate.c
index f2db67465495..6263affdef88 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -786,7 +786,7 @@ EXPORT_SYMBOL(truncate_setsize);
  */
 void pagecache_isize_extended(struct inode *inode, loff_t from, loff_t to)
 {
-        int bsize = 1 << inode->i_blkbits;
+        int bsize = i_blocksize(inode);
         loff_t rounded_from;
         struct page *page;
         pgoff_t index;
diff --git a/mm/zswap.c b/mm/zswap.c
index cabf09e0128b..eedc27894b10 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -76,6 +76,8 @@ static u64 zswap_duplicate_entry;
 * tunables
 **********************************/
 
+#define ZSWAP_PARAM_UNSET ""
+
 /* Enable/disable zswap (disabled by default) */
 static bool zswap_enabled;
 static int zswap_enabled_param_set(const char *,
@@ -185,6 +187,9 @@ static bool zswap_init_started;
 /* fatal error during init */
 static bool zswap_init_failed;
 
+/* init completed, but couldn't create the initial pool */
+static bool zswap_has_pool;
+
 /*********************************
 * helpers and fwd declarations
 **********************************/
@@ -424,7 +429,8 @@ static struct zswap_pool *__zswap_pool_current(void)
         struct zswap_pool *pool;
 
         pool = list_first_or_null_rcu(&zswap_pools, typeof(*pool), list);
-        WARN_ON(!pool);
+        WARN_ONCE(!pool && zswap_has_pool,
+                  "%s: no page storage pool!\n", __func__);
 
         return pool;
 }
@@ -443,7 +449,7 @@ static struct zswap_pool *zswap_pool_current_get(void)
         rcu_read_lock();
 
         pool = __zswap_pool_current();
-        if (!pool || !zswap_pool_get(pool))
+        if (!zswap_pool_get(pool))
                 pool = NULL;
 
         rcu_read_unlock();
@@ -459,7 +465,9 @@ static struct zswap_pool *zswap_pool_last_get(void)
 
         list_for_each_entry_rcu(pool, &zswap_pools, list)
                 last = pool;
-        if (!WARN_ON(!last) && !zswap_pool_get(last))
+        WARN_ONCE(!last && zswap_has_pool,
+                  "%s: no page storage pool!\n", __func__);
+        if (!zswap_pool_get(last))
                 last = NULL;
 
         rcu_read_unlock();
@@ -495,6 +503,17 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor)
         gfp_t gfp = __GFP_NORETRY | __GFP_NOWARN | __GFP_KSWAPD_RECLAIM;
         int ret;
 
+        if (!zswap_has_pool) {
+                /* if either are unset, pool initialization failed, and we
+                 * need both params to be set correctly before trying to
+                 * create a pool.
+                 */
+                if (!strcmp(type, ZSWAP_PARAM_UNSET))
+                        return NULL;
+                if (!strcmp(compressor, ZSWAP_PARAM_UNSET))
+                        return NULL;
+        }
+
         pool = kzalloc(sizeof(*pool), GFP_KERNEL);
         if (!pool) {
                 pr_err("pool alloc failed\n");
@@ -544,29 +563,41 @@ error:
 
 static __init struct zswap_pool *__zswap_pool_create_fallback(void)
 {
-        if (!crypto_has_comp(zswap_compressor, 0, 0)) {
-                if (!strcmp(zswap_compressor, ZSWAP_COMPRESSOR_DEFAULT)) {
-                        pr_err("default compressor %s not available\n",
-                               zswap_compressor);
-                        return NULL;
-                }
+        bool has_comp, has_zpool;
+
+        has_comp = crypto_has_comp(zswap_compressor, 0, 0);
+        if (!has_comp && strcmp(zswap_compressor, ZSWAP_COMPRESSOR_DEFAULT)) {
                 pr_err("compressor %s not available, using default %s\n",
                        zswap_compressor, ZSWAP_COMPRESSOR_DEFAULT);
                 param_free_charp(&zswap_compressor);
                 zswap_compressor = ZSWAP_COMPRESSOR_DEFAULT;
+                has_comp = crypto_has_comp(zswap_compressor, 0, 0);
         }
-        if (!zpool_has_pool(zswap_zpool_type)) {
-                if (!strcmp(zswap_zpool_type, ZSWAP_ZPOOL_DEFAULT)) {
-                        pr_err("default zpool %s not available\n",
-                               zswap_zpool_type);
-                        return NULL;
-                }
+        if (!has_comp) {
+                pr_err("default compressor %s not available\n",
+                       zswap_compressor);
+                param_free_charp(&zswap_compressor);
+                zswap_compressor = ZSWAP_PARAM_UNSET;
+        }
+
+        has_zpool = zpool_has_pool(zswap_zpool_type);
+        if (!has_zpool && strcmp(zswap_zpool_type, ZSWAP_ZPOOL_DEFAULT)) {
                 pr_err("zpool %s not available, using default %s\n",
                        zswap_zpool_type, ZSWAP_ZPOOL_DEFAULT);
                 param_free_charp(&zswap_zpool_type);
                 zswap_zpool_type = ZSWAP_ZPOOL_DEFAULT;
+                has_zpool = zpool_has_pool(zswap_zpool_type);
+        }
+        if (!has_zpool) {
+                pr_err("default zpool %s not available\n",
+                       zswap_zpool_type);
+                param_free_charp(&zswap_zpool_type);
+                zswap_zpool_type = ZSWAP_PARAM_UNSET;
         }
 
+        if (!has_comp || !has_zpool)
+                return NULL;
+
         return zswap_pool_create(zswap_zpool_type, zswap_compressor);
 }
 
@@ -582,6 +613,9 @@ static void zswap_pool_destroy(struct zswap_pool *pool)
 
 static int __must_check zswap_pool_get(struct zswap_pool *pool)
 {
+        if (!pool)
+                return 0;
+
         return kref_get_unless_zero(&pool->kref);
 }
 
@@ -639,7 +673,7 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp,
         }
 
         /* no change required */
-        if (!strcmp(s, *(char **)kp->arg))
+        if (!strcmp(s, *(char **)kp->arg) && zswap_has_pool)
                 return 0;
 
         /* if this is load-time (pre-init) param setting,
@@ -670,21 +704,26 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp,
         pool = zswap_pool_find_get(type, compressor);
         if (pool) {
                 zswap_pool_debug("using existing", pool);
+                WARN_ON(pool == zswap_pool_current());
                 list_del_rcu(&pool->list);
-        } else {
-                spin_unlock(&zswap_pools_lock);
-                pool = zswap_pool_create(type, compressor);
-                spin_lock(&zswap_pools_lock);
         }
 
+        spin_unlock(&zswap_pools_lock);
+
+        if (!pool)
+                pool = zswap_pool_create(type, compressor);
+
         if (pool)
                 ret = param_set_charp(s, kp);
         else
                 ret = -EINVAL;
 
+        spin_lock(&zswap_pools_lock);
+
         if (!ret) {
                 put_pool = zswap_pool_current();
                 list_add_rcu(&pool->list, &zswap_pools);
+                zswap_has_pool = true;
         } else if (pool) {
                 /* add the possibly pre-existing pool to the end of the pools
                  * list; if it's new (and empty) then it'll be removed and
@@ -696,6 +735,17 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp,
 
         spin_unlock(&zswap_pools_lock);
 
+        if (!zswap_has_pool && !pool) {
+                /* if initial pool creation failed, and this pool creation also
+                 * failed, maybe both compressor and zpool params were bad.
+                 * Allow changing this param, so pool creation will succeed
+                 * when the other param is changed. We already verified this
+                 * param is ok in the zpool_has_pool() or crypto_has_comp()
+                 * checks above.
+                 */
+                ret = param_set_charp(s, kp);
+        }
+
         /* drop the ref from either the old current pool,
          * or the new pool we failed to add
          */
@@ -724,6 +774,10 @@ static int zswap_enabled_param_set(const char *val,
                 pr_err("can't enable, initialization failed\n");
                 return -ENODEV;
         }
+        if (!zswap_has_pool && zswap_init_started) {
+                pr_err("can't enable, no pool configured\n");
+                return -ENODEV;
+        }
 
         return param_set_bool(val, kp);
 }
@@ -1205,22 +1259,21 @@ static int __init init_zswap(void)
                 goto hp_fail;
 
         pool = __zswap_pool_create_fallback();
-        if (!pool) {
+        if (pool) {
+                pr_info("loaded using pool %s/%s\n", pool->tfm_name,
+                        zpool_get_type(pool->zpool));
+                list_add(&pool->list, &zswap_pools);
+                zswap_has_pool = true;
+        } else {
                 pr_err("pool creation failed\n");
-                goto pool_fail;
+                zswap_enabled = false;
         }
-        pr_info("loaded using pool %s/%s\n", pool->tfm_name,
-                zpool_get_type(pool->zpool));
-
-        list_add(&pool->list, &zswap_pools);
 
         frontswap_register_ops(&zswap_frontswap_ops);
         if (zswap_debugfs_init())
                 pr_warn("debugfs initialization failed\n");
         return 0;
 
-pool_fail:
-        cpuhp_remove_state_nocalls(CPUHP_MM_ZSWP_POOL_PREPARE);
 hp_fail:
         cpuhp_remove_state(CPUHP_MM_ZSWP_MEM_PREPARE);
 dstmem_fail:
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 10d2bdce686e..465cc24b41e5 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1656,7 +1656,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
         ddp->deh_dport = usat->sat_port;
         ddp->deh_sport = at->src_port;
 
-        SOCK_DEBUG(sk, "SK %p: Copy user data (%Zd bytes).\n", sk, len);
+        SOCK_DEBUG(sk, "SK %p: Copy user data (%zd bytes).\n", sk, len);
 
         err = memcpy_from_msg(skb_put(skb, len), msg, len);
         if (err) {
@@ -1720,7 +1720,7 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
                  */
                 aarp_send_ddp(dev, skb, &usat->sat_addr, NULL);
         }
-        SOCK_DEBUG(sk, "SK %p: Done write (%Zd).\n", sk, len);
+        SOCK_DEBUG(sk, "SK %p: Done write (%zd).\n", sk, len);
 
 out:
         release_sock(sk);
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 3b3b1a292ec8..a190800572bd 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -451,7 +451,7 @@ static void lane2_assoc_ind(struct net_device *dev, const u8 *mac_addr,
                         return;
         }
         if (end_of_tlvs - tlvs != 0)
-                pr_info("(%s) ignoring %Zd bytes of trailing TLV garbage\n",
+                pr_info("(%s) ignoring %zd bytes of trailing TLV garbage\n",
                         dev->name, end_of_tlvs - tlvs);
 }
 
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 48f9471e7c85..f64d6566021f 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -851,7 +851,7 @@ static int hci_sock_release(struct socket *sock)
 
         if (hdev) {
                 if (hci_pi(sk)->channel == HCI_CHANNEL_USER) {
-                        /* When releasing an user channel exclusive access,
+                        /* When releasing a user channel exclusive access,
                          * call hci_dev_do_close directly instead of calling
                          * hci_dev_close to ensure the exclusive access will
                          * be released and the controller brought back down.
@@ -1172,7 +1172,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,
                                 /* In case the transport is already up and
                                  * running, clear the error here.
                                  *
-                                 * This can happen when opening an user
+                                 * This can happen when opening a user
                                  * channel and HCI_AUTO_OFF grace period
                                  * is still active.
                                  */
@@ -1190,7 +1190,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,
                 if (!hci_sock_gen_cookie(sk)) {
                         /* In the case when a cookie has already been assigned,
                          * this socket will transition from a raw socket into
-                         * an user channel socket. For a clean transition, send
+                         * a user channel socket. For a clean transition, send
                          * the close notification first.
                          */
                         skb = create_monitor_ctrl_close(sk);
diff --git a/net/bridge/netfilter/ebt_among.c b/net/bridge/netfilter/ebt_among.c
index 9024283d2bca..279527f8b1fe 100644
--- a/net/bridge/netfilter/ebt_among.c
+++ b/net/bridge/netfilter/ebt_among.c
@@ -187,7 +187,7 @@ static int ebt_among_mt_check(const struct xt_mtchk_param *par)
         expected_length += ebt_mac_wormhash_size(wh_src);
 
         if (em->match_size != EBT_ALIGN(expected_length)) {
-                pr_info("wrong size: %d against expected %d, rounded to %Zd\n",
+                pr_info("wrong size: %d against expected %d, rounded to %zd\n",
                         em->match_size, expected_length,
                         EBT_ALIGN(expected_length));
                 return -EINVAL;
diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
index e0bd013a1e5e..eedba7670b51 100644
--- a/net/ieee802154/socket.c
+++ b/net/ieee802154/socket.c
@@ -279,7 +279,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
         pr_debug("name = %s, mtu = %u\n", dev->name, mtu);
 
         if (size > mtu) {
-                pr_debug("size = %Zu, mtu = %u\n", size, mtu);
+                pr_debug("size = %zu, mtu = %u\n", size, mtu);
                 err = -EMSGSIZE;
                 goto out_dev;
         }
@@ -645,7 +645,7 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
         pr_debug("name = %s, mtu = %u\n", dev->name, mtu);
 
         if (size > mtu) {
-                pr_debug("size = %Zu, mtu = %u\n", size, mtu);
+                pr_debug("size = %zu, mtu = %u\n", size, mtu);
                 err = -EMSGSIZE;
                 goto out_dev;
         }
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index d8cea210af0e..2f0d8233950f 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2388,7 +2388,7 @@ static int fib_triestat_seq_show(struct seq_file *seq, void *v)
 
         seq_printf(seq,
                    "Basic info: size of leaf:"
-                   " %Zd bytes, size of tnode: %Zd bytes.\n",
+                   " %zd bytes, size of tnode: %zd bytes.\n",
                    LEAF_SIZE, TNODE_SIZE(0));
 
         for (h = 0; h < FIB_TABLE_HASHSZ; h++) {
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index beacd028848c..c0317c940bcd 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -2596,7 +2596,7 @@ static int ipmr_vif_seq_show(struct seq_file *seq, void *v)
                 const char *name =  vif->dev ? vif->dev->name : "none";
 
                 seq_printf(seq,
-                           "%2Zd %-10s %8ld %7ld  %8ld %7ld %05X %08X %08X\n",
+                           "%2zd %-10s %8ld %7ld  %8ld %7ld %05X %08X %08X\n",
                            vif - mrt->vif_table,
                            name, vif->bytes_in, vif->pkt_in,
                            vif->bytes_out, vif->pkt_out,
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index fcfd071f4705..bc1486f2c064 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -235,7 +235,7 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len)
         }
 
         if ((unsigned int) *len < sizeof(struct sockaddr_in)) {
-                pr_debug("SO_ORIGINAL_DST: len %d not %Zu\n",
+                pr_debug("SO_ORIGINAL_DST: len %d not %zu\n",
                          *len, sizeof(struct sockaddr_in));
                 return -EINVAL;
         }
diff --git a/net/ipv4/netfilter/nf_log_arp.c b/net/ipv4/netfilter/nf_log_arp.c
index f6f713376e6e..2f3895ddc275 100644
--- a/net/ipv4/netfilter/nf_log_arp.c
+++ b/net/ipv4/netfilter/nf_log_arp.c
@@ -69,7 +69,7 @@ static void dump_arp_packet(struct nf_log_buf *m,
 
         ap = skb_header_pointer(skb, sizeof(_arph), sizeof(_arpp), &_arpp);
         if (ap == NULL) {
-                nf_log_buf_add(m, " INCOMPLETE [%Zu bytes]",
+                nf_log_buf_add(m, " INCOMPLETE [%zu bytes]",
                                skb->len - sizeof(_arph));
                 return;
         }
diff --git a/net/ipv6/netfilter/nf_log_ipv6.c b/net/ipv6/netfilter/nf_log_ipv6.c
index 055c51b80f5d..97c724224da7 100644
--- a/net/ipv6/netfilter/nf_log_ipv6.c
+++ b/net/ipv6/netfilter/nf_log_ipv6.c
@@ -64,7 +64,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m,
         nf_log_buf_add(m, "SRC=%pI6 DST=%pI6 ", &ih->saddr, &ih->daddr);
 
         /* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */
-        nf_log_buf_add(m, "LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
+        nf_log_buf_add(m, "LEN=%zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
                ntohs(ih->payload_len) + sizeof(struct ipv6hdr),
                (ntohl(*(__be32 *)ih) & 0x0ff00000) >> 20,
                ih->hop_limit,
diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c
index 1215693fdd22..35dbf3dc3d28 100644
--- a/net/irda/irnet/irnet_ppp.c
+++ b/net/irda/irnet/irnet_ppp.c
@@ -51,7 +51,7 @@ irnet_ctrl_write(irnet_socket *	ap,
   char *        next;           /* Next command to process */
   int           length;         /* Length of current command */
 
-  DENTER(CTRL_TRACE, "(ap=0x%p, count=%Zd)\n", ap, count);
+  DENTER(CTRL_TRACE, "(ap=0x%p, count=%zd)\n", ap, count);
 
   /* Check for overflow... */
   DABORT(count >= IRNET_MAX_COMMAND, -ENOMEM,
@@ -66,7 +66,7 @@ irnet_ctrl_write(irnet_socket *	ap,
 
   /* Safe terminate the string */
   command[count] = '\0';
-  DEBUG(CTRL_INFO, "Command line received is ``%s'' (%Zd).\n",
+  DEBUG(CTRL_INFO, "Command line received is ``%s'' (%zd).\n",
         command, count);
 
   /* Check every commands in the command line */
@@ -285,7 +285,7 @@ irnet_ctrl_read(irnet_socket *	ap,
   char          event[75];
   ssize_t       ret = 0;
 
-  DENTER(CTRL_TRACE, "(ap=0x%p, count=%Zd)\n", ap, count);
+  DENTER(CTRL_TRACE, "(ap=0x%p, count=%zd)\n", ap, count);
 
 #ifdef INITIAL_DISCOVERY
   /* Check if we have read the log */
@@ -328,7 +328,7 @@ irnet_ctrl_read(irnet_socket *	ap,
   if(ret != 0)
     {
       /* No, return the error code */
-      DEXIT(CTRL_TRACE, " - ret %Zd\n", ret);
+      DEXIT(CTRL_TRACE, " - ret %zd\n", ret);
       return ret;
     }
 
@@ -568,7 +568,7 @@ dev_irnet_write(struct file *	file,
 {
   irnet_socket *        ap = file->private_data;
 
-  DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%Zd)\n",
+  DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%zd)\n",
         file, ap, count);
   DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n");
 
@@ -592,7 +592,7 @@ dev_irnet_read(struct file *	file,
 {
   irnet_socket *        ap = file->private_data;
 
-  DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%Zd)\n",
+  DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%zd)\n",
         file, ap, count);
   DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n");
 
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index b58000efee73..8adab6335ced 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1058,10 +1058,10 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb,
 
         /* Debug */
         if (session->send_seq)
-                l2tp_dbg(session, L2TP_MSG_DATA, "%s: send %Zd bytes, ns=%u\n",
+                l2tp_dbg(session, L2TP_MSG_DATA, "%s: send %zd bytes, ns=%u\n",
                          session->name, data_len, session->ns - 1);
         else
-                l2tp_dbg(session, L2TP_MSG_DATA, "%s: send %Zd bytes\n",
+                l2tp_dbg(session, L2TP_MSG_DATA, "%s: send %zd bytes\n",
                          session->name, data_len);
 
         if (session->debug & L2TP_MSG_DATA) {
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index c28b0af9c1f2..6e7b6a07b7d5 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -681,7 +681,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh)
                    2 + /* NULL SSID */
                    /* Channel Switch Announcement */
                    2 + sizeof(struct ieee80211_channel_sw_ie) +
-                   /* Mesh Channel Swith Parameters */
+                   /* Mesh Channel Switch Parameters */
                    2 + sizeof(struct ieee80211_mesh_chansw_params_ie) +
                    2 + 8 + /* supported rates */
                    2 + 3; /* DS params */
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 096a45103f14..e6a2753dff9e 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -1429,7 +1429,7 @@ int __init ip_vs_conn_init(void)
                 "(size=%d, memory=%ldKbytes)\n",
                 ip_vs_conn_tab_size,
                 (long)(ip_vs_conn_tab_size*sizeof(struct list_head))/1024);
-        IP_VS_DBG(0, "Each connection entry needs %Zd bytes at least\n",
+        IP_VS_DBG(0, "Each connection entry needs %zd bytes at least\n",
                   sizeof(struct ip_vs_conn));
 
         for (idx = 0; idx < ip_vs_conn_tab_size; idx++)
diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c
index 6be5c538b71e..75f798f8e83b 100644
--- a/net/netfilter/ipvs/ip_vs_dh.c
+++ b/net/netfilter/ipvs/ip_vs_dh.c
@@ -163,7 +163,7 @@ static int ip_vs_dh_init_svc(struct ip_vs_service *svc)
                 return -ENOMEM;
 
         svc->sched_data = s;
-        IP_VS_DBG(6, "DH hash table (memory=%Zdbytes) allocated for "
+        IP_VS_DBG(6, "DH hash table (memory=%zdbytes) allocated for "
                   "current service\n",
                   sizeof(struct ip_vs_dh_bucket)*IP_VS_DH_TAB_SIZE);
 
@@ -183,7 +183,7 @@ static void ip_vs_dh_done_svc(struct ip_vs_service *svc)
 
         /* release the table itself */
         kfree_rcu(s, rcu_head);
-        IP_VS_DBG(6, "DH hash table (memory=%Zdbytes) released\n",
+        IP_VS_DBG(6, "DH hash table (memory=%zdbytes) released\n",
                   sizeof(struct ip_vs_dh_bucket)*IP_VS_DH_TAB_SIZE);
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index cccf4d637412..5824927cf8e0 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -356,7 +356,7 @@ static int ip_vs_lblc_init_svc(struct ip_vs_service *svc)
                 return -ENOMEM;
 
         svc->sched_data = tbl;
-        IP_VS_DBG(6, "LBLC hash table (memory=%Zdbytes) allocated for "
+        IP_VS_DBG(6, "LBLC hash table (memory=%zdbytes) allocated for "
                   "current service\n", sizeof(*tbl));
 
         /*
@@ -393,7 +393,7 @@ static void ip_vs_lblc_done_svc(struct ip_vs_service *svc)
 
         /* release the table itself */
         kfree_rcu(tbl, rcu_head);
-        IP_VS_DBG(6, "LBLC hash table (memory=%Zdbytes) released\n",
+        IP_VS_DBG(6, "LBLC hash table (memory=%zdbytes) released\n",
                   sizeof(*tbl));
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index 796d70e47ddd..703f11877bee 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -519,7 +519,7 @@ static int ip_vs_lblcr_init_svc(struct ip_vs_service *svc)
                 return -ENOMEM;
 
         svc->sched_data = tbl;
-        IP_VS_DBG(6, "LBLCR hash table (memory=%Zdbytes) allocated for "
+        IP_VS_DBG(6, "LBLCR hash table (memory=%zdbytes) allocated for "
                   "current service\n", sizeof(*tbl));
 
         /*
@@ -556,7 +556,7 @@ static void ip_vs_lblcr_done_svc(struct ip_vs_service *svc)
 
         /* release the table itself */
         kfree_rcu(tbl, rcu_head);
-        IP_VS_DBG(6, "LBLCR hash table (memory=%Zdbytes) released\n",
+        IP_VS_DBG(6, "LBLCR hash table (memory=%zdbytes) released\n",
                   sizeof(*tbl));
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
index 1e373a5e44e3..16aaac6eedc9 100644
--- a/net/netfilter/ipvs/ip_vs_sh.c
+++ b/net/netfilter/ipvs/ip_vs_sh.c
@@ -239,7 +239,7 @@ static int ip_vs_sh_init_svc(struct ip_vs_service *svc)
                 return -ENOMEM;
 
         svc->sched_data = s;
-        IP_VS_DBG(6, "SH hash table (memory=%Zdbytes) allocated for "
+        IP_VS_DBG(6, "SH hash table (memory=%zdbytes) allocated for "
                   "current service\n",
                   sizeof(struct ip_vs_sh_bucket)*IP_VS_SH_TAB_SIZE);
 
@@ -259,7 +259,7 @@ static void ip_vs_sh_done_svc(struct ip_vs_service *svc)
 
         /* release the table itself */
         kfree_rcu(s, rcu_head);
-        IP_VS_DBG(6, "SH hash table (memory=%Zdbytes) released\n",
+        IP_VS_DBG(6, "SH hash table (memory=%zdbytes) released\n",
                   sizeof(struct ip_vs_sh_bucket)*IP_VS_SH_TAB_SIZE);
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 9350530c16c1..b03c28084f81 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1791,7 +1791,7 @@ int start_sync_thread(struct netns_ipvs *ipvs, struct ipvs_sync_daemon_cfg *c,
         u16 mtu, min_mtu;
 
         IP_VS_DBG(7, "%s(): pid %d\n", __func__, task_pid_nr(current));
-        IP_VS_DBG(7, "Each ip_vs_sync_conn entry needs %Zd bytes\n",
+        IP_VS_DBG(7, "Each ip_vs_sync_conn entry needs %zd bytes\n",
                   sizeof(struct ip_vs_sync_conn_v0));
 
         if (!ipvs->sync_state) {
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index e3ed20060878..4aecef4a89fb 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -300,7 +300,7 @@ static int find_pattern(const char *data, size_t dlen,
 {
         size_t i = plen;
 
-        pr_debug("find_pattern `%s': dlen = %Zu\n", pattern, dlen);
+        pr_debug("find_pattern `%s': dlen = %zu\n", pattern, dlen);
 
         if (dlen <= plen) {
                 /* Short packet: try for partial? */
diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c
index 3b79f34b5095..de8782345c86 100644
--- a/net/netfilter/nfnetlink_cthelper.c
+++ b/net/netfilter/nfnetlink_cthelper.c
@@ -48,7 +48,7 @@ nfnl_userspace_cthelper(struct sk_buff *skb, unsigned int protoff,
         if (helper == NULL)
                 return NF_DROP;
 
-        /* This is an user-space helper not yet configured, skip. */
+        /* This is a user-space helper not yet configured, skip. */
         if ((helper->flags &
             (NF_CT_HELPER_F_USERSPACE | NF_CT_HELPER_F_CONFIGURED)) ==
              NF_CT_HELPER_F_USERSPACE)
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 016db6be94b9..14857afc9937 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -667,7 +667,7 @@ int xt_compat_check_entry_offsets(const void *base, const char *elems,
             COMPAT_XT_ALIGN(target_offset + sizeof(struct compat_xt_standard_target)) != next_offset)
                 return -EINVAL;
 
-        /* compat_xt_entry match has less strict aligment requirements,
+        /* compat_xt_entry match has less strict alignment requirements,
          * otherwise they are identical.  In case of padding differences
          * we need to add compat version of xt_check_entry_match.
          */
diff --git a/net/sctp/output.c b/net/sctp/output.c
index 85406d5f8f41..71ce6b945dcb 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -177,7 +177,7 @@ sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *packet,
 {
         sctp_xmit_t retval;
 
-        pr_debug("%s: packet:%p size:%Zu chunk:%p size:%d\n", __func__,
+        pr_debug("%s: packet:%p size:%zu chunk:%p size:%d\n", __func__,
                  packet, packet->size, chunk, chunk->skb ? chunk->skb->len : -1);
 
         switch ((retval = (sctp_packet_append_chunk(packet, chunk)))) {
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 5b63ceb3bf37..3379668af368 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -643,9 +643,7 @@ void sctp_transport_reset(struct sctp_transport *t)
         t->srtt = 0;
         t->rttvar = 0;
 
-        /* Reset these additional varibles so that we have a clean
-         * slate.
-         */
+        /* Reset these additional variables so that we have a clean slate. */
         t->partial_bytes_acked = 0;
         t->flight_size = 0;
         t->error_count = 0;
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index cdeb1d814833..4f16953e4954 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -763,7 +763,7 @@ err_put_ctx:
 err:
         kfree(buf);
 out:
-        dprintk("RPC:       %s returning %Zd\n", __func__, err);
+        dprintk("RPC:       %s returning %zd\n", __func__, err);
         return err;
 }
 
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 75f290bddca1..2e22889a8837 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1260,7 +1260,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
         return 0;
 
 err_short_len:
-        svc_printk(rqstp, "short len %Zd, dropping request\n",
+        svc_printk(rqstp, "short len %zd, dropping request\n",
                         argv->iov_len);
         goto close;
 
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index de066acdb34e..d227d97f7ad4 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -278,7 +278,7 @@ static int svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
                                rqstp->rq_respages[0], tailoff);
 
 out:
-        dprintk("svc: socket %p sendto([%p %Zu... ], %d) = %d (addr %s)\n",
+        dprintk("svc: socket %p sendto([%p %zu... ], %d) = %d (addr %s)\n",
                 svsk, xdr->head[0].iov_base, xdr->head[0].iov_len,
                 xdr->len, len, svc_print_addr(rqstp, buf, sizeof(buf)));
 
@@ -346,7 +346,7 @@ static int svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr,
         if (len == buflen)
                 set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
 
-        dprintk("svc: socket %p recvfrom(%p, %Zu) = %d\n",
+        dprintk("svc: socket %p recvfrom(%p, %zu) = %d\n",
                 svsk, iov[0].iov_base, iov[0].iov_len, len);
         return len;
 }
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index af392d9b9cec..956c7bce80d1 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1188,7 +1188,7 @@ static inline void xs_tcp_read_xid(struct sock_xprt *transport, struct xdr_skb_r
         char *p;
 
         len = sizeof(transport->tcp_xid) - transport->tcp_offset;
-        dprintk("RPC:       reading XID (%Zu bytes)\n", len);
+        dprintk("RPC:       reading XID (%zu bytes)\n", len);
         p = ((char *) &transport->tcp_xid) + transport->tcp_offset;
         used = xdr_skb_read_bits(desc, p, len);
         transport->tcp_offset += used;
@@ -1219,7 +1219,7 @@ static inline void xs_tcp_read_calldir(struct sock_xprt *transport,
          */
         offset = transport->tcp_offset - sizeof(transport->tcp_xid);
         len = sizeof(transport->tcp_calldir) - offset;
-        dprintk("RPC:       reading CALL/REPLY flag (%Zu bytes)\n", len);
+        dprintk("RPC:       reading CALL/REPLY flag (%zu bytes)\n", len);
         p = ((char *) &transport->tcp_calldir) + offset;
         used = xdr_skb_read_bits(desc, p, len);
         transport->tcp_offset += used;
@@ -1310,7 +1310,7 @@ static inline void xs_tcp_read_common(struct rpc_xprt *xprt,
                 return;
         }
 
-        dprintk("RPC:       XID %08x read %Zd bytes\n",
+        dprintk("RPC:       XID %08x read %zd bytes\n",
                         ntohl(transport->tcp_xid), r);
         dprintk("RPC:       xprt = %p, tcp_copied = %lu, tcp_offset = %u, "
                         "tcp_reclen = %u\n", xprt, transport->tcp_copied,
@@ -1456,7 +1456,7 @@ static inline void xs_tcp_read_discard(struct sock_xprt *transport, struct xdr_s
         desc->count -= len;
         desc->offset += len;
         transport->tcp_offset += len;
-        dprintk("RPC:       discarded %Zu bytes\n", len);
+        dprintk("RPC:       discarded %zu bytes\n", len);
         xs_tcp_check_fraghdr(transport);
 }
 
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 918259a55f65..baa3c7be04ad 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1848,6 +1848,8 @@ my $prefix = '';
 sub show_type {
         my ($type) = @_;
 
+        $type =~ tr/[a-z]/[A-Z]/;
+
         return defined $use_type{$type} if (scalar keys %use_type > 0);
 
         return !defined $ignore_type{$type};
@@ -5204,18 +5206,27 @@ sub process {
                              "Consecutive strings are generally better as a single string\n" . $herecurr);
                 }
 
-# check for %L{u,d,i} and 0x%[udi] in strings
-                my $string;
+# check for non-standard and hex prefixed decimal printf formats
+                my $show_L = 1; #don't show the same defect twice
+                my $show_Z = 1;
                 while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
-                        $string = substr($rawline, $-[1], $+[1] - $-[1]);
+                        my $string = substr($rawline, $-[1], $+[1] - $-[1]);
                         $string =~ s/%%/__/g;
-                        if ($string =~ /(?<!%)%[\*\d\.\$]*L[udi]/) {
+                        # check for %L
+                        if ($show_L && $string =~ /%[\*\d\.\$]*L([diouxX])/) {
                                 WARN("PRINTF_L",
-                                     "\%Ld/%Lu are not-standard C, use %lld/%llu\n" . $herecurr);
-                                last;
-                        }
-                        if ($string =~ /0x%[\*\d\.\$\Llzth]*[udi]/) {
-                                ERROR("PRINTF_0xDECIMAL",
+                                     "\%L$1 is non-standard C, use %ll$1\n" . $herecurr);
+                                $show_L = 0;
+                        }
+                        # check for %Z
+                        if ($show_Z && $string =~ /%[\*\d\.\$]*Z([diouxX])/) {
+                                WARN("PRINTF_Z",
+                                     "%Z$1 is non-standard C, use %z$1\n" . $herecurr);
+                                $show_Z = 0;
+                        }
+                        # check for 0x<decimal>
+                        if ($string =~ /0x%[\*\d\.\$\Llzth]*[diou]/) {
+                                ERROR("PRINTF_0XDECIMAL",
                                       "Prefixing 0x with decimal output is defective\n" . $herecurr);
                         }
                 }
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index faac4b10d8ea..0b6002b36f20 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -318,7 +318,7 @@ if ($arch eq "x86_64") {
     # instruction or the addiu one. herein, we record the address of the
     # first one, and then we can replace this instruction by a branch
     # instruction to jump over the profiling function to filter the
-    # indicated functions, or swith back to the lui instruction to trace
+    # indicated functions, or switch back to the lui instruction to trace
     # them, which means dynamic tracing.
     #
     #       c:  3c030000        lui     v1,0x0
diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index b3a1994b5df7..0458b037c8a1 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -62,15 +62,19 @@ adress||address
 adresses||addresses
 adviced||advised
 afecting||affecting
+againt||against
 agaist||against
 albumns||albums
 alegorical||allegorical
+algined||aligned
 algorith||algorithm
 algorithmical||algorithmically
 algoritm||algorithm
 algoritms||algorithms
 algorrithm||algorithm
 algorritm||algorithm
+aligment||alignment
+alignement||alignment
 allign||align
 allocatrd||allocated
 allocte||allocate
@@ -86,6 +90,10 @@ alue||value
 ambigious||ambiguous
 amoung||among
 amout||amount
+an union||a union
+an user||a user
+an userspace||a userspace
+an one||a one
 analysator||analyzer
 ang||and
 anniversery||anniversary
@@ -98,6 +106,7 @@ appearence||appearance
 applicaion||application
 appliction||application
 applictions||applications
+applys||applies
 appplications||applications
 appropiate||appropriate
 appropriatly||appropriately
@@ -237,6 +246,9 @@ commited||committed
 commiting||committing
 committ||commit
 commoditiy||commodity
+comsume||consume
+comsumer||consumer
+comsuming||consuming
 compability||compatibility
 compaibility||compatibility
 compatability||compatibility
@@ -258,6 +270,7 @@ comunication||communication
 conbination||combination
 conditionaly||conditionally
 conected||connected
+configuartion||configuration
 configuratoin||configuration
 configuraton||configuration
 configuretion||configuration
@@ -310,6 +323,9 @@ defintion||definition
 defintions||definitions
 defualt||default
 defult||default
+deintializing||deinitializing
+deintialize||deinitialize
+deintialized||deinitialized
 deivce||device
 delared||declared
 delare||declare
@@ -352,6 +368,7 @@ differrence||difference
 difinition||definition
 diplay||display
 direectly||directly
+disassocation||disassociation
 disapear||disappear
 disapeared||disappeared
 disappared||disappeared
@@ -375,10 +392,12 @@ easilly||easily
 ecspecially||especially
 edditable||editable
 editting||editing
+efective||effective
 efficently||efficiently
 ehther||ether
 eigth||eight
 eletronic||electronic
+embeded||embedded
 enabledi||enabled
 enchanced||enhanced
 encorporating||incorporating
@@ -414,6 +433,7 @@ expecially||especially
 explicite||explicit
 explicitely||explicitly
 explict||explicit
+explictely||explicitly
 explictly||explicitly
 expresion||expression
 exprimental||experimental
@@ -445,6 +465,7 @@ finsih||finish
 flusing||flushing
 folloing||following
 followign||following
+followings||following
 follwing||following
 forseeable||foreseeable
 forse||force
@@ -537,6 +558,7 @@ initalise||initialize
 initalize||initialize
 initation||initiation
 initators||initiators
+initialiazation||initialization
 initializiation||initialization
 initialzed||initialized
 initilization||initialization
@@ -566,6 +588,7 @@ interruptted||interrupted
 interupted||interrupted
 interupt||interrupt
 intial||initial
+intialization||initialization
 intialized||initialized
 intialize||initialize
 intregral||integral
@@ -666,6 +689,7 @@ neccecary||necessary
 neccesary||necessary
 neccessary||necessary
 necesary||necessary
+neded||needed
 negaive||negative
 negoitation||negotiation
 negotation||negotiation
@@ -688,6 +712,8 @@ occure||occurred
 occured||occurred
 occuring||occurring
 offet||offset
+omited||omitted
+omiting||omitting
 omitt||omit
 ommiting||omitting
 ommitted||omitted
@@ -706,8 +732,11 @@ oustanding||outstanding
 overaall||overall
 overhread||overhead
 overlaping||overlapping
+overrided||overridden
 overriden||overridden
 overun||overrun
+overwritting||overwriting
+overwriten||overwritten
 pacakge||package
 pachage||package
 packacge||package
@@ -718,6 +747,7 @@ pakage||package
 pallette||palette
 paln||plan
 paramameters||parameters
+paramaters||parameters
 paramater||parameter
 parametes||parameters
 parametised||parametrised
@@ -962,6 +992,7 @@ straming||streaming
 struc||struct
 structres||structures
 stuct||struct
+strucuture||structure
 stucture||structure
 sturcture||structure
 subdirectoires||subdirectories
@@ -991,6 +1022,13 @@ suspeneded||suspended
 suspicously||suspiciously
 swaping||swapping
 switchs||switches
+swith||switch
+swithable||switchable
+swithc||switch
+swithced||switched
+swithcing||switching
+swithed||switched
+swithing||switching
 symetric||symmetric
 synax||syntax
 synchonized||synchronized
@@ -1007,6 +1045,7 @@ targetting||targeting
 teh||the
 temorary||temporary
 temproarily||temporarily
+therfore||therefore
 thier||their
 threds||threads
 threshhold||threshold
@@ -1050,6 +1089,7 @@ unkmown||unknown
 unknonw||unknown
 unknow||unknown
 unkown||unknown
+unneded||unneeded
 unneedingly||unnecessarily
 unnsupported||unsupported
 unmached||unmatched
@@ -1078,6 +1118,7 @@ vaid||valid
 vaild||valid
 valide||valid
 variantions||variations
+varible||variable
 varient||variant
 vaule||value
 verbse||verbose
diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c
index 7d10e5d418bb..9db4709a6877 100644
--- a/security/selinux/ss/ebitmap.c
+++ b/security/selinux/ss/ebitmap.c
@@ -360,7 +360,7 @@ int ebitmap_read(struct ebitmap *e, void *fp)
 
         if (mapunit != BITS_PER_U64) {
                 printk(KERN_ERR "SELinux: ebitmap: map size %u does not "
-                       "match my size %Zd (high bit was %d)\n",
+                       "match my size %zd (high bit was %d)\n",
                        mapunit, BITS_PER_U64, e->highbit);
                 goto bad;
         }
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index d719db4219cd..9c92f29a38ea 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -2266,7 +2266,7 @@ int policydb_read(struct policydb *p, void *fp)
         len = le32_to_cpu(buf[1]);
         if (len != strlen(POLICYDB_STRING)) {
                 printk(KERN_ERR "SELinux:  policydb string length %d does not "
-                       "match expected length %Zu\n",
+                       "match expected length %zu\n",
                        len, strlen(POLICYDB_STRING));
                 goto bad;
         }
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index f4234edb878c..8cf0dc7a07a4 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -3093,7 +3093,7 @@ static int patch_cm9739(struct snd_ac97 * ac97)
         /* set-up multi channel */
         /* bit 14: 0 = SPDIF, 1 = EAPD */
         /* bit 13: enable internal vref output for mic */
-        /* bit 12: disable center/lfe (swithable) */
+        /* bit 12: disable center/lfe (switchable) */
         /* bit 10: disable surround/line (switchable) */
         /* bit 9: mix 2 surround off */
         /* bit 4: undocumented; 0 mutes the CM9739A, which defaults to 1 */
diff --git a/sound/pci/cs46xx/cs46xx_dsp_task_types.h b/sound/pci/cs46xx/cs46xx_dsp_task_types.h
index 5cf920bfda27..be5694718546 100644
--- a/sound/pci/cs46xx/cs46xx_dsp_task_types.h
+++ b/sound/pci/cs46xx/cs46xx_dsp_task_types.h
@@ -203,7 +203,7 @@ struct dsp_task_tree_context_block {
 
         u32       saverfe;                                      
 
-        /* Value may be overwriten by stack save algorithm.
+        /* Value may be overwritten by stack save algorithm.
            Retain the size of the stack data saved here if used */
         ___DSP_DUAL_16BIT_ALLOC(
              reserved1, 
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 9ec4dba8a793..07a9deb17477 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -2866,7 +2866,7 @@ static unsigned int ca0132_capture_pcm_delay(struct hda_pcm_stream *info,
 #define CA0132_CODEC_MUTE(xname, nid, dir) \
         CA0132_CODEC_MUTE_MONO(xname, nid, 3, dir)
 
-/* The followings are for tuning of products */
+/* The following are for tuning of products */
 #ifdef ENABLE_TUNING_CONTROLS
 
 static unsigned int voice_focus_vals_lookup[] = {
diff --git a/sound/pci/ice1712/wm8766.c b/sound/pci/ice1712/wm8766.c
index f7ac8d5e862c..27c03e40c9b1 100644
--- a/sound/pci/ice1712/wm8766.c
+++ b/sound/pci/ice1712/wm8766.c
@@ -254,7 +254,7 @@ static int snd_wm8766_ctl_put(struct snd_kcontrol *kcontrol,
         int n = kcontrol->private_value;
         u16 val, regval1, regval2;
 
-        /* this also works for enum because value is an union */
+        /* this also works for enum because value is a union */
         regval1 = ucontrol->value.integer.value[0];
         regval2 = ucontrol->value.integer.value[1];
         if (wm->ctl[n].flags & WM8766_FLAG_INVERT) {
diff --git a/sound/pci/ice1712/wm8776.c b/sound/pci/ice1712/wm8776.c
index ebd2fe4b4a57..553669b103c2 100644
--- a/sound/pci/ice1712/wm8776.c
+++ b/sound/pci/ice1712/wm8776.c
@@ -528,7 +528,7 @@ static int snd_wm8776_ctl_put(struct snd_kcontrol *kcontrol,
         int n = kcontrol->private_value;
         u16 val, regval1, regval2;
 
-        /* this also works for enum because value is an union */
+        /* this also works for enum because value is a union */
         regval1 = ucontrol->value.integer.value[0];
         regval2 = ucontrol->value.integer.value[1];
         if (wm->ctl[n].flags & WM8776_FLAG_INVERT) {
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 565f7f55c3ca..1e25095fd144 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -2051,7 +2051,7 @@ static void snd_korg1212_proc_read(struct snd_info_entry *entry,
         snd_iprintf(buffer, korg1212->card->longname);
         snd_iprintf(buffer, " (index #%d)\n", korg1212->card->number + 1);
         snd_iprintf(buffer, "\nGeneral settings\n");
-        snd_iprintf(buffer, "    period size: %Zd bytes\n", K1212_PERIOD_BYTES);
+        snd_iprintf(buffer, "    period size: %zd bytes\n", K1212_PERIOD_BYTES);
         snd_iprintf(buffer, "     clock mode: %s\n", clockSourceName[korg1212->clkSrcRate] );
         snd_iprintf(buffer, "  left ADC Sens: %d\n", korg1212->leftADCInSens );
         snd_iprintf(buffer, " right ADC Sens: %d\n", korg1212->rightADCInSens );
@@ -2276,7 +2276,7 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci,
 
         if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
                                 sizeof(struct KorgSharedBuffer), &korg1212->dma_shared) < 0) {
-                snd_printk(KERN_ERR "korg1212: can not allocate shared buffer memory (%Zd bytes)\n", sizeof(struct KorgSharedBuffer));
+                snd_printk(KERN_ERR "korg1212: can not allocate shared buffer memory (%zd bytes)\n", sizeof(struct KorgSharedBuffer));
                 snd_korg1212_free(korg1212);
                 return -ENOMEM;
         }
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c
index 80633055e17e..a99808ab01fe 100644
--- a/sound/pci/pcxhr/pcxhr_hwdep.c
+++ b/sound/pci/pcxhr/pcxhr_hwdep.c
@@ -292,7 +292,7 @@ static int pcxhr_dsp_load(struct pcxhr_mgr *mgr, int index,
         int err, card_index;
 
         dev_dbg(&mgr->pci->dev,
-                "loading dsp [%d] size = %Zd\n", index, dsp->size);
+                "loading dsp [%d] size = %zd\n", index, dsp->size);
 
         switch (index) {
         case PCXHR_FIRMWARE_XLX_INT_INDEX:
diff --git a/sound/pcmcia/vx/vxp_ops.c b/sound/pcmcia/vx/vxp_ops.c
index 56aa1ba73ccc..5f97791f00d7 100644
--- a/sound/pcmcia/vx/vxp_ops.c
+++ b/sound/pcmcia/vx/vxp_ops.c
@@ -201,7 +201,7 @@ static int vxp_load_xilinx_binary(struct vx_core *_chip, const struct firmware *
         c |= (int)vx_inb(chip, RXM) << 8;
         c |= vx_inb(chip, RXL);
 
-        snd_printdd(KERN_DEBUG "xilinx: dsp size received 0x%x, orig 0x%Zx\n", c, fw->size);
+        snd_printdd(KERN_DEBUG "xilinx: dsp size received 0x%x, orig 0x%zx\n", c, fw->size);
 
         vx_outb(chip, ICR, ICR_HF0);
 
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index b84d7d34f188..cdd44abfc9e0 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -883,7 +883,7 @@ static void snd_ps3_audio_set_base_addr(uint64_t ioaddr_start)
 static void snd_ps3_audio_fixup(struct snd_ps3_card_info *card)
 {
         /*
-         * avsetting driver seems to never change the followings
+         * avsetting driver seems to never change the following
          * so, init them here once
          */
 
diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c
index 818b052377f3..ec1067a679da 100644
--- a/sound/soc/amd/acp-pcm-dma.c
+++ b/sound/soc/amd/acp-pcm-dma.c
@@ -506,7 +506,7 @@ static int acp_init(void __iomem *acp_mmio)
         return 0;
 }
 
-/* Deintialize ACP */
+/* Deinitialize ACP */
 static int acp_deinit(void __iomem *acp_mmio)
 {
         u32 val;
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 624b3b9cb079..63b2745f8169 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -1269,7 +1269,7 @@ void wm_hubs_set_bias_level(struct snd_soc_codec *codec,
                 break;
 
         case SND_SOC_BIAS_ON:
-                /* Turn off any unneded single ended outputs */
+                /* Turn off any unneeded single ended outputs */
                 val = 0;
                 mask = 0;
 
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
index 1d82f68305c3..8cfffa70c144 100644
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
@@ -368,7 +368,7 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair)
         fsl_asrc_set_watermarks(pair, ASRC_INPUTFIFO_THRESHOLD,
                                 ASRC_INPUTFIFO_THRESHOLD);
 
-        /* Configure the followings only for Ideal Ratio mode */
+        /* Configure the following only for Ideal Ratio mode */
         if (!ideal)
                 return 0;
 
diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h
index 924971b6ded5..9b031352ea3c 100644
--- a/sound/soc/qcom/lpass.h
+++ b/sound/soc/qcom/lpass.h
@@ -82,7 +82,7 @@ struct lpass_variant {
          **/
         u32     dmactl_audif_start;
         u32     wrdma_channel_start;
-        /* SOC specific intialization like clocks */
+        /* SOC specific initialization like clocks */
         int (*init)(struct platform_device *pdev);
         int (*exit)(struct platform_device *pdev);
         int (*alloc_dma_channel)(struct lpass_data *data, int direction);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a110d3987d4a..6dca408faae3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3041,7 +3041,7 @@ static int snd_soc_register_dais(struct snd_soc_component *component,
         unsigned int i;
         int ret;
 
-        dev_dbg(dev, "ASoC: dai register %s #%Zu\n", dev_name(dev), count);
+        dev_dbg(dev, "ASoC: dai register %s #%zu\n", dev_name(dev), count);
 
         component->dai_drv = dai_drv;
 
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index aff3d8129ac9..3e9b1c0bb1ce 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -344,7 +344,7 @@ static int soc_tplg_widget_load(struct soc_tplg *tplg,
         return 0;
 }
 
-/* pass DAI configurations to component driver for extra intialization */
+/* pass DAI configurations to component driver for extra initialization */
 static int soc_tplg_dai_load(struct soc_tplg *tplg,
         struct snd_soc_dai_driver *dai_drv)
 {
@@ -354,7 +354,7 @@ static int soc_tplg_dai_load(struct soc_tplg *tplg,
         return 0;
 }
 
-/* pass link configurations to component driver for extra intialization */
+/* pass link configurations to component driver for extra initialization */
 static int soc_tplg_dai_link_load(struct soc_tplg *tplg,
         struct snd_soc_dai_link *link)
 {
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index d48b70ceb25a..207c2eeddab0 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -27,7 +27,7 @@
 #include "bpf.h"
 
 /*
- * When building perf, unistd.h is overrided. __NR_bpf is
+ * When building perf, unistd.h is overridden. __NR_bpf is
  * required to be defined explicitly.
  */
 #ifndef __NR_bpf
diff --git a/tools/perf/Documentation/tips.txt b/tools/perf/Documentation/tips.txt
index 8a6479c0eac9..170b0289a7bc 100644
--- a/tools/perf/Documentation/tips.txt
+++ b/tools/perf/Documentation/tips.txt
@@ -22,7 +22,7 @@ If you have debuginfo enabled, try: perf report -s sym,srcline
 For memory address profiling, try: perf mem record / perf mem report
 For tracepoint events, try: perf report -s trace_fields
 To record callchains for each sample: perf record -g
-To record every process run by an user: perf record -u <user>
+To record every process run by a user: perf record -u <user>
 Skip collecing build-id when recording: perf record -B
 To change sampling frequency to 100 Hz: perf record -F 100
 See assembly instructions with percentage: perf annotate <symbol>
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 28d41e709128..3abe3373ce90 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -951,7 +951,7 @@ static struct dso *__dso__findlink_by_longname(struct rb_root *root,
                 if (rc == 0) {
                         /*
                          * In case the new DSO is a duplicate of an existing
-                         * one, print an one-time warning & put the new entry
+                         * one, print a one-time warning & put the new entry
                          * at the end of the list of duplicates.
                          */
                         if (!dso || (dso == this))
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index 0d9d6e0803b8..57cd268d4275 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -464,7 +464,7 @@ static int convert_variable_fields(Dwarf_Die *vr_die, const char *varname,
                 /* Verify it is a data structure  */
                 tag = dwarf_tag(&type);
                 if (tag != DW_TAG_structure_type && tag != DW_TAG_union_type) {
-                        pr_warning("%s is not a data structure nor an union.\n",
+                        pr_warning("%s is not a data structure nor a union.\n",
                                    varname);
                         return -EINVAL;
                 }
@@ -479,7 +479,7 @@ static int convert_variable_fields(Dwarf_Die *vr_die, const char *varname,
         } else {
                 /* Verify it is a data structure  */
                 if (tag != DW_TAG_structure_type && tag != DW_TAG_union_type) {
-                        pr_warning("%s is not a data structure nor an union.\n",
+                        pr_warning("%s is not a data structure nor a union.\n",
                                    varname);
                         return -EINVAL;
                 }
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 7aff317fc7c4..796c847e2f00 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -108,7 +108,7 @@ struct hist_entry {
                 /*
                  * Since perf diff only supports the stdio output, TUI
                  * fields are only accessed from perf report (or perf
-                 * top).  So make it an union to reduce memory usage.
+                 * top).  So make it a union to reduce memory usage.
                  */
                 struct hist_entry_diff  diff;
                 struct /* for TUI */ {
diff --git a/tools/testing/selftests/sigaltstack/sas.c b/tools/testing/selftests/sigaltstack/sas.c
index 1bb01258e559..ccd07343d418 100644
--- a/tools/testing/selftests/sigaltstack/sas.c
+++ b/tools/testing/selftests/sigaltstack/sas.c
@@ -57,7 +57,7 @@ void my_usr1(int sig, siginfo_t *si, void *u)
                 exit(EXIT_FAILURE);
         }
         if (stk.ss_flags != SS_DISABLE)
-                printf("[FAIL]\tss_flags=%i, should be SS_DISABLE\n",
+                printf("[FAIL]\tss_flags=%x, should be SS_DISABLE\n",
                                 stk.ss_flags);
         else
                 printf("[OK]\tsigaltstack is disabled in sighandler\n");
@@ -122,7 +122,8 @@ int main(void)
         if (stk.ss_flags == SS_DISABLE) {
                 printf("[OK]\tInitial sigaltstack state was SS_DISABLE\n");
         } else {
-                printf("[FAIL]\tInitial sigaltstack state was %i; should have been SS_DISABLE\n", stk.ss_flags);
+                printf("[FAIL]\tInitial sigaltstack state was %x; "
+                       "should have been SS_DISABLE\n", stk.ss_flags);
                 return EXIT_FAILURE;
         }
 
@@ -165,7 +166,7 @@ int main(void)
                 exit(EXIT_FAILURE);
         }
         if (stk.ss_flags != SS_AUTODISARM) {
-                printf("[FAIL]\tss_flags=%i, should be SS_AUTODISARM\n",
+                printf("[FAIL]\tss_flags=%x, should be SS_AUTODISARM\n",
                                 stk.ss_flags);
                 exit(EXIT_FAILURE);
         }
diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c
index 3815e940fbea..2366177172f6 100644
--- a/virt/kvm/async_pf.c
+++ b/virt/kvm/async_pf.c
@@ -204,7 +204,7 @@ int kvm_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, unsigned long hva,
         work->addr = hva;
         work->arch = *arch;
         work->mm = current->mm;
-        atomic_inc(&work->mm->mm_users);
+        mmget(work->mm);
         kvm_get_kvm(work->vcpu->kvm);
 
         /* this can't really happen otherwise gfn_to_pfn_async
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 5b0dd4a9b2cb..35f71409d9ee 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -611,7 +611,7 @@ static struct kvm *kvm_create_vm(unsigned long type)
                 return ERR_PTR(-ENOMEM);
 
         spin_lock_init(&kvm->mmu_lock);
-        atomic_inc(&current->mm->mm_count);
+        mmgrab(current->mm);
         kvm->mm = current->mm;
         kvm_eventfd_init(kvm);
         mutex_init(&kvm->lock);