diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index a14fd29a7a92..d41ef6b4cf72 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -73,8 +73,6 @@ extern int suid_dumpable; | |||
73 | extern char core_pattern[]; | 73 | extern char core_pattern[]; |
74 | extern int pid_max; | 74 | extern int pid_max; |
75 | extern int min_free_kbytes; | 75 | extern int min_free_kbytes; |
76 | extern int printk_ratelimit_jiffies; | ||
77 | extern int printk_ratelimit_burst; | ||
78 | extern int pid_max_min, pid_max_max; | 76 | extern int pid_max_min, pid_max_max; |
79 | extern int sysctl_drop_caches; | 77 | extern int sysctl_drop_caches; |
80 | extern int percpu_pagelist_fraction; | 78 | extern int percpu_pagelist_fraction; |
@@ -490,14 +488,6 @@ static struct ctl_table kern_table[] = { | |||
490 | .mode = 0644, | 488 | .mode = 0644, |
491 | .proc_handler = &proc_dointvec, | 489 | .proc_handler = &proc_dointvec, |
492 | }, | 490 | }, |
493 | { | ||
494 | .ctl_name = KERN_PRINTK, | ||
495 | .procname = "printk", | ||
496 | .data = &console_loglevel, | ||
497 | .maxlen = 4*sizeof(int), | ||
498 | .mode = 0644, | ||
499 | .proc_handler = &proc_dointvec, | ||
500 | }, | ||
501 | #ifdef CONFIG_KMOD | 491 | #ifdef CONFIG_KMOD |
502 | { | 492 | { |
503 | .ctl_name = KERN_MODPROBE, | 493 | .ctl_name = KERN_MODPROBE, |
@@ -644,6 +634,15 @@ static struct ctl_table kern_table[] = { | |||
644 | .mode = 0644, | 634 | .mode = 0644, |
645 | .proc_handler = &proc_dointvec, | 635 | .proc_handler = &proc_dointvec, |
646 | }, | 636 | }, |
637 | #if defined CONFIG_PRINTK | ||
638 | { | ||
639 | .ctl_name = KERN_PRINTK, | ||
640 | .procname = "printk", | ||
641 | .data = &console_loglevel, | ||
642 | .maxlen = 4*sizeof(int), | ||
643 | .mode = 0644, | ||
644 | .proc_handler = &proc_dointvec, | ||
645 | }, | ||
647 | { | 646 | { |
648 | .ctl_name = KERN_PRINTK_RATELIMIT, | 647 | .ctl_name = KERN_PRINTK_RATELIMIT, |
649 | .procname = "printk_ratelimit", | 648 | .procname = "printk_ratelimit", |
@@ -661,6 +660,7 @@ static struct ctl_table kern_table[] = { | |||
661 | .mode = 0644, | 660 | .mode = 0644, |
662 | .proc_handler = &proc_dointvec, | 661 | .proc_handler = &proc_dointvec, |
663 | }, | 662 | }, |
663 | #endif | ||
664 | { | 664 | { |
665 | .ctl_name = KERN_NGROUPS_MAX, | 665 | .ctl_name = KERN_NGROUPS_MAX, |
666 | .procname = "ngroups_max", | 666 | .procname = "ngroups_max", |