diff options
| author | Andrew Morton <akpm@digeo.com> | 2002-11-10 02:01:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-11-10 02:01:55 -0800 |
| commit | 20078cee4a009732f9498a9ede5a33aebd9078d4 (patch) | |
| tree | 19eda1bbc1b0ec38c1d11edab98db44a43d6eaae /kernel | |
| parent | db6005a2a7ab8e4d48befa08564060c3006a184b (diff) | |
[PATCH] hugetlb: remove sysctl.c intrusion
Patch from William Lee Irwin III <wli@holomorphy.com>
This patch removes hugetlb's intrusion into kernel/sysctl.c
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 0317dd749b2b..c6eeba758371 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -31,7 +31,7 @@ #include <linux/sysrq.h> #include <linux/highuid.h> #include <linux/writeback.h> - +#include <linux/hugetlb.h> #include <asm/uaccess.h> #ifdef CONFIG_ROOT_NFS @@ -99,11 +99,6 @@ int proc_dol2crvec(ctl_table *table, int write, struct file *filp, extern int acct_parm[]; #endif -#ifdef CONFIG_HUGETLB_PAGE -extern int htlbpage_max; -extern int set_hugetlb_mem_size(int); -#endif - static int parse_table(int *, int, void *, size_t *, void *, size_t, ctl_table *, void **); static int proc_doutsstring(ctl_table *table, int write, struct file *filp, @@ -315,8 +310,7 @@ static ctl_table vm_table[] = { 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec, NULL, &zero, &one_hundred }, #ifdef CONFIG_HUGETLB_PAGE - {VM_HUGETLB_PAGES, "nr_hugepages", &htlbpage_max, sizeof(int), 0644, NULL, - &proc_dointvec}, + {VM_HUGETLB_PAGES, "nr_hugepages", &htlbpage_max, sizeof(int), 0644, NULL, &hugetlb_sysctl_handler}, #endif {0} }; @@ -907,10 +901,6 @@ static int do_proc_dointvec(ctl_table *table, int write, struct file *filp, val = -val; buffer += len; left -= len; -#ifdef CONFIG_HUGETLB_PAGE - if (i == &htlbpage_max) - val = set_hugetlb_mem_size(val); -#endif switch(op) { case OP_SET: *i = val; break; case OP_AND: *i &= val; break; |