diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
commit | 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch) | |
tree | 7f8d84353852401ec74e005f6f0b1eb958b9a70d /kernel/sysctl.c | |
parent | c0d3c0c0ce94d3db893577ae98e64414d92e49d8 (diff) | |
parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (diff) |
Merge branch 'master'
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index cb99a42f8b37..71dd6f62efec 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -878,7 +878,17 @@ static ctl_table vm_table[] = { | |||
878 | .maxlen = sizeof(zone_reclaim_mode), | 878 | .maxlen = sizeof(zone_reclaim_mode), |
879 | .mode = 0644, | 879 | .mode = 0644, |
880 | .proc_handler = &proc_dointvec, | 880 | .proc_handler = &proc_dointvec, |
881 | .strategy = &zero, | 881 | .strategy = &sysctl_intvec, |
882 | .extra1 = &zero, | ||
883 | }, | ||
884 | { | ||
885 | .ctl_name = VM_ZONE_RECLAIM_INTERVAL, | ||
886 | .procname = "zone_reclaim_interval", | ||
887 | .data = &zone_reclaim_interval, | ||
888 | .maxlen = sizeof(zone_reclaim_interval), | ||
889 | .mode = 0644, | ||
890 | .proc_handler = &proc_dointvec_jiffies, | ||
891 | .strategy = &sysctl_jiffies, | ||
882 | }, | 892 | }, |
883 | #endif | 893 | #endif |
884 | { .ctl_name = 0 } | 894 | { .ctl_name = 0 } |