diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
| commit | 7fd36ebeeec9244a7431bb010e6e3c5e4848a0d5 (patch) | |
| tree | 5fb03a9aafdd1cec5f4f6ff7f1873174cb89b66c /kernel/printk.c | |
| parent | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (diff) | |
Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index f1cf10cff..ca4b14ff9 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -34,11 +34,7 @@ static char buf[1024]; #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ #define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ -unsigned long log_size = 0; -/* 2.3.47 triggers a linker bug which hits if for a relocation the addend - equals the offset and the relocation is against a global variable. This - avoid it to hit us. It's not a safe workaround of course. */ -unsigned long silly_linker_bug = 0; +unsigned long log_size; DECLARE_WAIT_QUEUE_HEAD(log_wait); /* Keep together for sysctl support */ @@ -51,8 +47,8 @@ spinlock_t console_lock = SPIN_LOCK_UNLOCKED; struct console *console_drivers = NULL; static char log_buf[LOG_BUF_LEN]; -static unsigned long log_start = 0; -static unsigned long logged_chars = 0; +static unsigned long log_start; +static unsigned long logged_chars; struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES]; static int preferred_console = -1; |