[PATCH] move console_loglevel scalars to array (resend)

Moves console_loglevel & friends to an array, as sysctl expects.

diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index d75397d5a2625ac1380715eab4fd39e2d7093fd0..ac873ad4ce6e68bb0f792460036c7145408f998c 100644 (file)
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -237,11 +237,6 @@ the different loglevels.
   console_loglevel can be set
 - default_console_loglevel: default value for console_loglevel
 
-Note: a quick look in linux/kernel/printk.c will reveal that
-these variables aren't put inside a structure, so their order
-in-core isn't formally guaranteed and garbage values _might_
-occur when the compiler changes. (???)
-
 ==============================================================
 
 reboot-cmd: (Sparc only)

diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c
index 232aac460eb319eac10f9028ebbcc2106e24270a..56827d8179634ad7046d117d54b8ffd67c16557a 100644 (file)
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
@@ -28,8 +28,6 @@
 
 extern void die(const char *,struct pt_regs *,long);
 
-extern int console_loglevel;
-
 #ifndef CONFIG_X86_WP_WORKS_OK
 /*
  * Ugly, ugly, but the goto's result in better assembly..

diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 7800f28a98ae3fbff0c8317107bf6eca87eb1e28..90f41e8d6cf01cac57b0450d9e89912daec4ecbe 100644 (file)
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -26,6 +26,7 @@
 #include <linux/kbd_kern.h>
 #include <linux/quotaops.h>
 #include <linux/smp_lock.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/suspend.h>
 #include <linux/writeback.h>

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 80a3e97ab59bd55d09d96ab8263d3a1973798d74..602617f9addf149c3e5ac08ceead13e01738db15 100644 (file)
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -38,6 +38,13 @@
 #define        KERN_INFO       "<6>"   /* informational                        */
 #define        KERN_DEBUG      "<7>"   /* debug-level messages                 */
 
+extern int console_printk[];
+
+#define console_loglevel (console_printk[0])
+#define default_message_loglevel (console_printk[1])
+#define minimum_console_loglevel (console_printk[2])
+#define default_console_loglevel (console_printk[3])
+
 struct completion;
 
 #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
@@ -81,8 +88,6 @@ extern int session_of_pgrp(int pgrp);
 asmlinkage int printk(const char * fmt, ...)
        __attribute__ ((format (printf, 1, 2)));
 
-extern int console_loglevel;
-
 static inline void console_silent(void)
 {
        console_loglevel = 0;

diff --git a/init/main.c b/init/main.c
index 1d477ebc16a5d55126e13b37fcf5ab78862f934b..ef444b704fbf77d69122516c11d13cb5dd339e96 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -14,6 +14,7 @@
 #include <linux/config.h>
 #include <linux/proc_fs.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/kernel.h>
 #include <linux/unistd.h>
 #include <linux/string.h>
 #include <linux/ctype.h>

diff --git a/kernel/printk.c b/kernel/printk.c
index 403eea7da400c064c29a8488fed630171673b47b..cbe027aaf151d8f4a467e6154af41a5fa843a170 100644 (file)
--- 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 0dcb6d6b8e790061e5d16a947b8fffef9af18f21..3e4b1729c5b160272ae049e2f62b0db2c2356ad8 100644 (file)
--- 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 0f235957877554945aad1c9fd90f6b1be248e12d..c3c96cd208d4f90d4af2c386ce50d86c84c6087e 100644 (file)
--- 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>