Merge branch 'akpm' (patches from Andrew)

Merge second patch-bomb from Andrew Morton:

 - a couple of hotfixes

 - the rest of MM

 - a new timer slack control in procfs

 - a couple of procfs fixes

 - a few misc things

 - some printk tweaks

 - lib/ updates, notably to radix-tree.

 - add my and Nick Piggin's old userspace radix-tree test harness to
   tools/testing/radix-tree/.  Matthew said it was a godsend during the
   radix-tree work he did.

 - a few code-size improvements, switching to __always_inline where gcc
   screwed up.

 - partially implement character sets in sscanf

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
  sscanf: implement basic character sets
  lib/bug.c: use common WARN helper
  param: convert some "on"/"off" users to strtobool
  lib: add "on"/"off" support to kstrtobool
  lib: update single-char callers of strtobool()
  lib: move strtobool() to kstrtobool()
  include/linux/unaligned: force inlining of byteswap operations
  include/uapi/linux/byteorder, swab: force inlining of some byteswap operations
  include/asm-generic/atomic-long.h: force inlining of some atomic_long operations
  usb: common: convert to use match_string() helper
  ide: hpt366: convert to use match_string() helper
  ata: hpt366: convert to use match_string() helper
  power: ab8500: convert to use match_string() helper
  power: charger_manager: convert to use match_string() helper
  drm/edid: convert to use match_string() helper
  pinctrl: convert to use match_string() helper
  device property: convert to use match_string() helper
  lib/string: introduce match_string() helper
  radix-tree tests: add test for radix_tree_iter_next
  radix-tree tests: add regression3 test
  ...

8 files changed, 14 insertions, 17 deletions

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index b9ecf197ad11..f21b2c479780 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -2944,7 +2944,7 @@ static bool gfar_add_rx_frag(struct gfar_rx_buff *rxb, u32 lstatus,
         /* change offset to the other half */
         rxb->page_offset ^= GFAR_RXB_TRUESIZE;
 
-        atomic_inc(&page->_count);
+        page_ref_inc(page);
 
         return true;
 }
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index b243c3cbe68f..b4547ebed774 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -243,7 +243,7 @@ static bool fm10k_can_reuse_rx_page(struct fm10k_rx_buffer *rx_buffer,
         /* Even if we own the page, we are not allowed to use atomic_set()
          * This would break get_page_unless_zero() users.
          */
-        atomic_inc(&page->_count);
+        page_ref_inc(page);
 
         return true;
 }
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 31e5f3942839..5b4ad1ad4d5f 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -6630,7 +6630,7 @@ static bool igb_can_reuse_rx_page(struct igb_rx_buffer *rx_buffer,
         /* Even if we own the page, we are not allowed to use atomic_set()
          * This would break get_page_unless_zero() users.
          */
-        atomic_inc(&page->_count);
+        page_ref_inc(page);
 
         return true;
 }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index c4003a88bbf6..e6035ff6b861 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1942,7 +1942,7 @@ static bool ixgbe_add_rx_frag(struct ixgbe_ring *rx_ring,
         /* Even if we own the page, we are not allowed to use atomic_set()
          * This would break get_page_unless_zero() users.
          */
-        atomic_inc(&page->_count);
+        page_ref_inc(page);
 
         return true;
 }
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 3558f019b631..0ea14c0a2e74 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -837,7 +837,7 @@ add_tail_frag:
         /* Even if we own the page, we are not allowed to use atomic_set()
          * This would break get_page_unless_zero() users.
          */
-        atomic_inc(&page->_count);
+        page_ref_inc(page);
 
         return true;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 41440b2b20a3..86bcfe510e4e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -82,8 +82,7 @@ static int mlx4_alloc_pages(struct mlx4_en_priv *priv,
         /* Not doing get_page() for each frag is a big win
          * on asymetric workloads. Note we can not use atomic_set().
          */
-        atomic_add(page_alloc->page_size / frag_info->frag_stride - 1,
-                   &page->_count);
+        page_ref_add(page, page_alloc->page_size / frag_info->frag_stride - 1);
         return 0;
 }
 
@@ -127,7 +126,7 @@ out:
                         dma_unmap_page(priv->ddev, page_alloc[i].dma,
                                 page_alloc[i].page_size, PCI_DMA_FROMDEVICE);
                         page = page_alloc[i].page;
-                        atomic_set(&page->_count, 1);
+                        set_page_count(page, 1);
                         put_page(page);
                 }
         }
@@ -165,7 +164,7 @@ static int mlx4_en_init_allocator(struct mlx4_en_priv *priv,
 
                 en_dbg(DRV, priv, "  frag %d allocator: - size:%d frags:%d\n",
                        i, ring->page_alloc[i].page_size,
-                       atomic_read(&ring->page_alloc[i].page->_count));
+                       page_ref_count(ring->page_alloc[i].page));
         }
         return 0;
 
@@ -177,7 +176,7 @@ out:
                 dma_unmap_page(priv->ddev, page_alloc->dma,
                                page_alloc->page_size, PCI_DMA_FROMDEVICE);
                 page = page_alloc->page;
-                atomic_set(&page->_count, 1);
+                set_page_count(page, 1);
                 put_page(page);
                 page_alloc->page = NULL;
         }
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index ab6051a43134..9cc45649f477 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -3341,7 +3341,7 @@ static int niu_rbr_add_page(struct niu *np, struct rx_ring_info *rp,
 
         niu_hash_page(rp, page, addr);
         if (rp->rbr_blocks_per_page > 1)
-                atomic_add(rp->rbr_blocks_per_page - 1, &page->_count);
+                page_ref_add(page, rp->rbr_blocks_per_page - 1);
 
         for (i = 0; i < rp->rbr_blocks_per_page; i++) {
                 __le32 *rbr = &rp->rbr[start_index + i];
diff --git a/drivers/net/wireless/marvell/mwifiex/debugfs.c b/drivers/net/wireless/marvell/mwifiex/debugfs.c
index 0b9c580af988..2eff989c6d9f 100644
--- a/drivers/net/wireless/marvell/mwifiex/debugfs.c
+++ b/drivers/net/wireless/marvell/mwifiex/debugfs.c
@@ -880,14 +880,12 @@ mwifiex_reset_write(struct file *file,
 {
         struct mwifiex_private *priv = file->private_data;
         struct mwifiex_adapter *adapter = priv->adapter;
-        char cmd;
         bool result;
+        int rc;
 
-        if (copy_from_user(&cmd, ubuf, sizeof(cmd)))
-                return -EFAULT;
-
-        if (strtobool(&cmd, &result))
-                return -EINVAL;
+        rc = kstrtobool_from_user(ubuf, count, &result);
+        if (rc)
+                return rc;
 
         if (!result)
                 return -EINVAL;