diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 15:27:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 15:27:43 -0700 |
| commit | 4bb0057f996b1491f93a64879f4c53c83bc0f0c7 (patch) | |
| tree | f216e244a6f88ede277a3687499dbb1762a3c37a /arch | |
| parent | 116a9fb3ed98c19d1ee0c6c55971f5b753949393 (diff) | |
| parent | 9e4144abf8a30ae221311368bbb10690ebdb4b76 (diff) | |
Merge branch 'core/printk' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/printk' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, generic: mark early_printk as asmlinkage
printk: export console_drivers
printk: remember the message level for multi-line output
printk: refactor processing of line severity tokens
printk: don't prefer unsuited consoles on registration
printk: clean up recursion check related static variables
namespacecheck: more kernel/printk.c fixes
namespacecheck: fix kernel printk.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/early_printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c index 643fd861b724..ff9e7350da54 100644 --- a/arch/x86/kernel/early_printk.c +++ b/arch/x86/kernel/early_printk.c @@ -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; |