diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 8ac51714b08c..c68f68dcc605 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -225,10 +225,10 @@ static struct ctl_table root_table[] = { | |||
225 | }; | 225 | }; |
226 | 226 | ||
227 | #ifdef CONFIG_SCHED_DEBUG | 227 | #ifdef CONFIG_SCHED_DEBUG |
228 | static unsigned long min_sched_granularity_ns = 100000; /* 100 usecs */ | 228 | static int min_sched_granularity_ns = 100000; /* 100 usecs */ |
229 | static unsigned long max_sched_granularity_ns = NSEC_PER_SEC; /* 1 second */ | 229 | static int max_sched_granularity_ns = NSEC_PER_SEC; /* 1 second */ |
230 | static unsigned long min_wakeup_granularity_ns; /* 0 usecs */ | 230 | static int min_wakeup_granularity_ns; /* 0 usecs */ |
231 | static unsigned long max_wakeup_granularity_ns = NSEC_PER_SEC; /* 1 second */ | 231 | static int max_wakeup_granularity_ns = NSEC_PER_SEC; /* 1 second */ |
232 | #endif | 232 | #endif |
233 | 233 | ||
234 | static struct ctl_table kern_table[] = { | 234 | static struct ctl_table kern_table[] = { |
@@ -906,11 +906,11 @@ static struct ctl_table vm_table[] = { | |||
906 | }, | 906 | }, |
907 | { | 907 | { |
908 | .ctl_name = CTL_UNNUMBERED, | 908 | .ctl_name = CTL_UNNUMBERED, |
909 | .procname = "hugetlb_dynamic_pool", | 909 | .procname = "nr_overcommit_hugepages", |
910 | .data = &hugetlb_dynamic_pool, | 910 | .data = &nr_overcommit_huge_pages, |
911 | .maxlen = sizeof(hugetlb_dynamic_pool), | 911 | .maxlen = sizeof(nr_overcommit_huge_pages), |
912 | .mode = 0644, | 912 | .mode = 0644, |
913 | .proc_handler = &proc_dointvec, | 913 | .proc_handler = &proc_doulongvec_minmax, |
914 | }, | 914 | }, |
915 | #endif | 915 | #endif |
916 | { | 916 | { |