diff options
| author | Joe Perches <joe@perches.com> | 2008-02-08 15:21:25 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 20:22:39 +0300 |
| commit | 7ef3d2fd17c377ef64a2aa19677d17576606c3b4 (patch) | |
| tree | 036c2fe4a87bda412908bc82602ce29f4d431dbe /kernel | |
| parent | 36e789144267105e0b3f2b9bca7db3184fce50dc (diff) | |
| download | linux-7ef3d2fd17c377ef64a2aa19677d17576606c3b4.tar.xz | |
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')
| -rw-r--r-- | kernel/printk.c | 2 | ||||
| -rw-r--r-- | kernel/sysctl.c | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index e95e7c6e7b04..bee36100f110 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1251,6 +1251,7 @@ void tty_write_message(struct tty_struct *tty, char *msg) return; } +#if defined CONFIG_PRINTK /* * printk rate limiting, lifted from the networking subsystem. * @@ -1320,3 +1321,4 @@ bool printk_timed_ratelimit(unsigned long *caller_jiffies, return false; } EXPORT_SYMBOL(printk_timed_ratelimit); +#endif 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; 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", |