diff --git a/[refs] b/[refs] index 2f0beaa20ab9..3e77a183bfba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87c8a64475f0597b7fd9c36d2f867ae8ef4a9eca +refs/heads/master: e17ba73b0ee6c0f24393c48b455e0d8db761782c diff --git a/trunk/arch/x86/kernel/early_printk.c b/trunk/arch/x86/kernel/early_printk.c index 643fd861b724..ff9e7350da54 100644 --- a/trunk/arch/x86/kernel/early_printk.c +++ b/trunk/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; diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index f2a668c195bf..4cb8d3df414e 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -207,7 +207,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); diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 70cfa5ac75ce..de1a4f4470c3 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -38,7 +38,7 @@ /* * Architectures can override it: */ -void __attribute__((weak)) early_printk(const char *fmt, ...) +void asmlinkage __attribute__((weak)) early_printk(const char *fmt, ...) { }