aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2008-02-08 04:21:25 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 09:22:39 -0800
commit7ef3d2fd17c377ef64a2aa19677d17576606c3b4 (patch)
tree036c2fe4a87bda412908bc82602ce29f4d431dbe /kernel/sysctl.c
parent36e789144267105e0b3f2b9bca7db3184fce50dc (diff)
downloadkernel_samsung_smdk4412-7ef3d2fd17c377ef64a2aa19677d17576606c3b4.zip
kernel_samsung_smdk4412-7ef3d2fd17c377ef64a2aa19677d17576606c3b4.tar.gz
kernel_samsung_smdk4412-7ef3d2fd17c377ef64a2aa19677d17576606c3b4.tar.bz2
printk_ratelimit() functions should use CONFIG_PRINTK
Makes an embedded image a bit smaller. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index a14fd29..d41ef6b 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -73,8 +73,6 @@ extern int suid_dumpable;
extern char core_pattern[];
extern int pid_max;
extern int min_free_kbytes;
-extern int printk_ratelimit_jiffies;
-extern int printk_ratelimit_burst;
extern int pid_max_min, pid_max_max;
extern int sysctl_drop_caches;
extern int percpu_pagelist_fraction;
@@ -490,14 +488,6 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec,
},
- {
- .ctl_name = KERN_PRINTK,
- .procname = "printk",
- .data = &console_loglevel,
- .maxlen = 4*sizeof(int),
- .mode = 0644,
- .proc_handler = &proc_dointvec,
- },
#ifdef CONFIG_KMOD
{
.ctl_name = KERN_MODPROBE,
@@ -644,6 +634,15 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec,
},
+#if defined CONFIG_PRINTK
+ {
+ .ctl_name = KERN_PRINTK,
+ .procname = "printk",
+ .data = &console_loglevel,
+ .maxlen = 4*sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec,
+ },
{
.ctl_name = KERN_PRINTK_RATELIMIT,
.procname = "printk_ratelimit",
@@ -661,6 +660,7 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec,
},
+#endif
{
.ctl_name = KERN_NGROUPS_MAX,
.procname = "ngroups_max",