summaryrefslogtreecommitdiff
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorRandy Dunlap <rddunlap@osdl.org>2002-12-14 19:42:33 -0800
committerIngo Molnar <mingo@elte.hu>2002-12-14 19:42:33 -0800
commitf3ce0064cbb6bbada20942729aa439cfd33da301 (patch)
treedb516e8e9d8128cedc7e6a3434ee0cd8808af916 /kernel/printk.c
parent0b319ed0ada2e2bd43f38c65a1ce5b1492a40b6d (diff)
[PATCH] move console_loglevel scalars to array (resend)
Moves console_loglevel & friends to an array, as sysctl expects.
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c12
1 files changed, 7 insertions, 5 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;