diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
| commit | a3d3362287fbe96fe90abdb5c6d1a35471129a8c (patch) | |
| tree | ad3c85ed1feef470c66599eb514e30f43c2db5dd /mm/hugetlb.c | |
| parent | fb7f045ace0624f1e59a7db8497e460bd54b1cbc (diff) | |
| parent | 4bbba111d94781d34081c37856bbc5eb33f6c72a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index bb0b7c128015..06de5aa4d644 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -1872,8 +1872,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy, | |||
| 1872 | unsigned long tmp; | 1872 | unsigned long tmp; |
| 1873 | int ret; | 1873 | int ret; |
| 1874 | 1874 | ||
| 1875 | if (!write) | 1875 | tmp = h->max_huge_pages; |
| 1876 | tmp = h->max_huge_pages; | ||
| 1877 | 1876 | ||
| 1878 | if (write && h->order >= MAX_ORDER) | 1877 | if (write && h->order >= MAX_ORDER) |
| 1879 | return -EINVAL; | 1878 | return -EINVAL; |
| @@ -1938,8 +1937,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write, | |||
| 1938 | unsigned long tmp; | 1937 | unsigned long tmp; |
| 1939 | int ret; | 1938 | int ret; |
| 1940 | 1939 | ||
| 1941 | if (!write) | 1940 | tmp = h->nr_overcommit_huge_pages; |
| 1942 | tmp = h->nr_overcommit_huge_pages; | ||
| 1943 | 1941 | ||
| 1944 | if (write && h->order >= MAX_ORDER) | 1942 | if (write && h->order >= MAX_ORDER) |
| 1945 | return -EINVAL; | 1943 | return -EINVAL; |