diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /mm/hugetlb.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
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; |