diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-23 11:04:08 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2013-05-20 13:45:39 -0400 |
| commit | b076d975089b5e512ec9069ba059f1b7ce3b91c6 (patch) | |
| tree | b8e6e6cf3ed88d74f4ffce6c14dd7ba5afb2d335 /include | |
| parent | 74edb286273c67eaa6dcba2a75856a94fdc6afdf (diff) | |
early-printk-consolidate.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/console.h | 1 | ||||
| -rw-r--r-- | include/linux/printk.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index 6ae6a15eb95c..569580424f67 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -135,6 +135,7 @@ struct console { for (con = console_drivers; con != NULL; con = con->next) extern int console_set_on_cmdline; +extern struct console *early_console; extern int add_preferred_console(char *name, int idx, char *options); extern int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options); diff --git a/include/linux/printk.h b/include/linux/printk.h index f0e22f75143f..be10455c7a5a 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -88,8 +88,13 @@ int no_printk(const char *fmt, ...) return 0; } +#ifdef CONFIG_EARLY_PRINTK extern asmlinkage __printf(1, 2) void early_printk(const char *fmt, ...); +#else +static inline __printf(1, 2) __cold +void early_printk(const char *s, ...) { } +#endif extern int printk_needs_cpu(int cpu); extern void printk_tick(void); |