diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk.c | 12 | ||||
| -rw-r--r-- | kernel/suspend.c | 1 | ||||
| -rw-r--r-- | kernel/sysctl.c | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 403eea7da400..cbe027aaf151 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -16,6 +16,7 @@ * 01Mar01 Andrew Morton <andrewm@uow.edu.au> */ +#include <linux/kernel.h> #include <linux/mm.h> #include <linux/tty.h> #include <linux/tty_driver.h> @@ -54,11 +55,12 @@ DECLARE_WAIT_QUEUE_HEAD(log_wait); -/* Keep together for sysctl support */ -int console_loglevel = DEFAULT_CONSOLE_LOGLEVEL; -int default_message_loglevel = DEFAULT_MESSAGE_LOGLEVEL; -int minimum_console_loglevel = MINIMUM_CONSOLE_LOGLEVEL; -int default_console_loglevel = DEFAULT_CONSOLE_LOGLEVEL; +int console_printk[4] = { + DEFAULT_CONSOLE_LOGLEVEL, /* console_loglevel */ + DEFAULT_MESSAGE_LOGLEVEL, /* default_message_loglevel */ + MINIMUM_CONSOLE_LOGLEVEL, /* minimum_console_loglevel */ + DEFAULT_CONSOLE_LOGLEVEL, /* default_console_loglevel */ +}; int oops_in_progress; diff --git a/kernel/suspend.c b/kernel/suspend.c index 0dcb6d6b8e79..3e4b1729c5b1 100644 --- a/kernel/suspend.c +++ b/kernel/suspend.c @@ -88,7 +88,6 @@ unsigned char software_suspend_enabled = 0; extern char _text, _etext, _edata, __bss_start, _end; extern char __nosave_begin, __nosave_end; -extern int console_loglevel; extern int is_head_of_free_region(struct page *); /* Locks */ diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 0f2359578775..c3c96cd208d4 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -28,6 +28,7 @@ #include <linux/capability.h> #include <linux/smp_lock.h> #include <linux/init.h> +#include <linux/kernel.h> #include <linux/sysrq.h> #include <linux/highuid.h> #include <linux/writeback.h> |