Merge branch 'akpm' (fixes from Andrew Morton)

Merge leftovers from Andrew Morton:
 "A few leftovers.

  I have a bunch of OCFS2 patches which are still out for review and
  which I might sneak along after -rc1.  Partly my fault - I should send
  my review pokes out earlier"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: fix CROSS_MEMORY_ATTACH help text grammar
  drivers/mfd/rtsx_usb.c: export device table
  mm, hugetlb_cgroup: align hugetlb cgroup limit to hugepage size

3 files changed, 3 insertions, 1 deletions

diff --git a/drivers/mfd/rtsx_usb.c b/drivers/mfd/rtsx_usb.c
index 6352bec8419a..71f387ce8cbd 100644
--- a/drivers/mfd/rtsx_usb.c
+++ b/drivers/mfd/rtsx_usb.c
@@ -744,6 +744,7 @@ static struct usb_device_id rtsx_usb_usb_ids[] = {
         { USB_DEVICE(0x0BDA, 0x0140) },
         { }
 };
+MODULE_DEVICE_TABLE(usb, rtsx_usb_usb_ids);
 
 static struct usb_driver rtsx_usb_driver = {
         .name                   = "rtsx_usb",
diff --git a/init/Kconfig b/init/Kconfig
index 44f9ed3dae22..e84c6423a2e5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -268,7 +268,7 @@ config CROSS_MEMORY_ATTACH
         help
           Enabling this option adds the system calls process_vm_readv and
           process_vm_writev which allow a process with the correct privileges
-          to directly read from or write to to another process's address space.
+          to directly read from or write to another process' address space.
           See the man page for more details.
 
 config FHANDLE
diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
index 9aae6f47433f..9eebfadeeee1 100644
--- a/mm/hugetlb_cgroup.c
+++ b/mm/hugetlb_cgroup.c
@@ -275,6 +275,7 @@ static ssize_t hugetlb_cgroup_write(struct kernfs_open_file *of,
                 ret = res_counter_memparse_write_strategy(buf, &val);
                 if (ret)
                         break;
+                val = ALIGN(val, 1ULL << huge_page_shift(&hstates[idx]));
                 ret = res_counter_set_limit(&h_cg->hugepage[idx], val);
                 break;
         default: