Skip to contentSkip to conversation

core/printk for v2.6.27

GIT PULL Ingo Molnar 1 participant 1 message Jul 14, 2008 x86

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the core/printk git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core/printk

Thanks,

Ingo

------------------>
Ingo Molnar (1):
printk: export console_drivers

Jan Kiszka (1):
printk: don't prefer unsuited consoles on registration

Jiri Slaby (1):
x86, generic: mark early_printk as asmlinkage

Nick Andrew (2):
printk: refactor processing of line severity tokens
printk: remember the message level for multi-line output

Tejun Heo (1):
printk: clean up recursion check related static variables

Thomas Gleixner (2):
namespacecheck: fix kernel printk.c
namespacecheck: more kernel/printk.c fixes

 arch/x86/kernel/early_printk.c |    2 +-
 include/linux/kernel.h         |    8 +---
 kernel/printk.c                |  107 +++++++++++++++++-----------------------
 3 files changed, 47 insertions(+), 70 deletions(-)
arch/x86/kernel/early_printk.c +1 -1
index 643fd86..ff9e735 100644
@@ -196,7 +196,7 @@ static struct console simnow_console = {
 static struct console *early_console = &early_vga_console;
 static int early_console_initialized;
 
-void early_printk(const char *fmt, ...)
+asmlinkage void early_printk(const char *fmt, ...)
 {
 	char buf[512];
 	int n;
include/linux/kernel.h +1 -7
index 2e70006..f9cd7a5 100644
@@ -187,9 +187,6 @@ asmlinkage int vprintk(const char *fmt, va_list args)
 	__attribute__ ((format (printf, 1, 0)));
 asmlinkage int printk(const char * fmt, ...)
 	__attribute__ ((format (printf, 1, 2))) __cold;
-extern int log_buf_get_len(void);
-extern int log_buf_read(int idx);
-extern int log_buf_copy(char *dest, int idx, int len);
 
 extern int printk_ratelimit_jiffies;
 extern int printk_ratelimit_burst;
@@ -205,9 +202,6 @@ static inline int vprintk(const char *s, va_list args) { return 0; }
 static inline int printk(const char *s, ...)
 	__attribute__ ((format (printf, 1, 2)));
 static inline int __cold printk(const char *s, ...) { return 0; }
-static inline int log_buf_get_len(void) { return 0; }
-static inline int log_buf_read(int idx) { return 0; }
-static inline int log_buf_copy(char *dest, int idx, int len) { return 0; }
 static inline int printk_ratelimit(void) { return 0; }
 static inline int __printk_ratelimit(int ratelimit_jiffies, \
 				     int ratelimit_burst) { return 0; }
@@ -216,7 +210,7 @@ static inline bool printk_timed_ratelimit(unsigned long *caller_jiffies, \
 		{ return false; }
 #endif
 
-extern void __attribute__((format(printf, 1, 2)))
+extern void asmlinkage __attribute__((format(printf, 1, 2)))
 	early_printk(const char *fmt, ...);
 
 unsigned long int_sqrt(unsigned long);
kernel/printk.c +45 -62

187 lines not on this page · raw message