diff options
| author | Paul Mackerras <paulus@samba.org> | 2002-12-17 14:47:29 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2002-12-17 14:47:29 +1100 |
| commit | a6796760e38fdb8c375c18ebf718118496157ff2 (patch) | |
| tree | 8082db83d4124f504427196c7ee8b643a7f7c00d /include/linux/kernel.h | |
| parent | c47d7a974d9b08bc1b1f61f29d7bfa51f975b56a (diff) | |
| parent | 91ec8aa9f5416d3474a34af9b8f197a344d0d523 (diff) | |
Merge samba.org:/home/paulus/kernel/linux-2.5
into samba.org:/home/paulus/kernel/for-linus-ppc
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 80a3e97ab59b..f3cadd9416ad 100644 --- 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 @@ -71,7 +78,7 @@ extern int sscanf(const char *, const char *, ...) extern int vsscanf(const char *, const char *, va_list); extern int get_option(char **str, int *pint); -extern char *get_options(char *str, int nints, int *ints); +extern char *get_options(const char *str, int nints, int *ints); extern unsigned long long memparse(char *ptr, char **retptr); extern void dev_probe_lock(void); extern void dev_probe_unlock(void); @@ -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; |