diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
tree | 2624a44924c625c367f3cebf937853b9da2de282 /kernel/sysctl.c | |
parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 93a2c5398648..99a58f279077 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -18,7 +18,6 @@ | |||
18 | * Removed it and replaced it with older style, 03/23/00, Bill Wendling | 18 | * Removed it and replaced it with older style, 03/23/00, Bill Wendling |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/config.h> | ||
22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
24 | #include <linux/swap.h> | 23 | #include <linux/swap.h> |
@@ -933,15 +932,6 @@ static ctl_table vm_table[] = { | |||
933 | .strategy = &sysctl_intvec, | 932 | .strategy = &sysctl_intvec, |
934 | .extra1 = &zero, | 933 | .extra1 = &zero, |
935 | }, | 934 | }, |
936 | { | ||
937 | .ctl_name = VM_ZONE_RECLAIM_INTERVAL, | ||
938 | .procname = "zone_reclaim_interval", | ||
939 | .data = &zone_reclaim_interval, | ||
940 | .maxlen = sizeof(zone_reclaim_interval), | ||
941 | .mode = 0644, | ||
942 | .proc_handler = &proc_dointvec_jiffies, | ||
943 | .strategy = &sysctl_jiffies, | ||
944 | }, | ||
945 | #endif | 935 | #endif |
946 | #ifdef CONFIG_X86_32 | 936 | #ifdef CONFIG_X86_32 |
947 | { | 937 | { |