diff options
| author | Vojtech Pavlik <vojtech@suse.cz> | 2002-11-11 11:29:50 +0100 |
|---|---|---|
| committer | Vojtech Pavlik <vojtech@suse.cz> | 2002-11-11 11:29:50 +0100 |
| commit | cdd78a965de150f55dc6bc2836995e5f8bc991a9 (patch) | |
| tree | 9bb3263b0110d8606c393810bf52e7911e59d3df /kernel/sysctl.c | |
| parent | 20889760dda09fd104cfe859b03b3f63300faa83 (diff) | |
| parent | 5be2bc3c89f6813ab0ab21cdd27d6d0f2ee94d91 (diff) | |
Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input
Diffstat (limited to 'kernel/sysctl.c')
| -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; |