diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 18:56:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 18:56:25 +0200 |
| commit | f2937e4540836be5c4db7e0a721ce3cfc59036e3 (patch) | |
| tree | f7c68473490deabbe334279a132bc87816eaf694 /mm | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow... (diff) | |
| parent | mm: fix CROSS_MEMORY_ATTACH help text grammar (diff) | |
| download | linux-f2937e4540836be5c4db7e0a721ce3cfc59036e3.tar.xz linux-f2937e4540836be5c4db7e0a721ce3cfc59036e3.zip | |
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
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/hugetlb_cgroup.c | 1 |
1 files changed, 1 insertions, 0 deletions
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: |