On Thu, 7 Mar 2013 14:15:54 -0500 Paul Gortmaker <[email protected]> wrote:
> [v2: essentially unchanged since v1, so I've left the acked/reviewed > tags. There was a compile fail[1] for a randconfig with EARLY_PRINTK=y > and PRINTK=n, because the early_console struct and early_printk calls > were nested within an #ifdef CONFIG_PRINTK -- moving that whole block > exactly as-is to be outside the #ifdef CONFIG_PRINTK fixes the randconfig > and still works for everyday sane configs too.] > [1] http://marc.info/?l=linux-next&m=136219350914998&w=2 You did this: --- a/kernel/printk.c~early_printk-consolidate-random-copies-of-identical-code-v2 +++ a/kernel/printk.c @@ -759,29 +759,6 @@ module_param(ignore_loglevel, bool, S_IR MODULE_PARM_DESC(ignore_loglevel, "ignore loglevel setting, to" "print all kernel messages to the console."); -#ifdef CONFIG_EARLY_PRINTK -struct console *early_console; - -void early_vprintk(const char *fmt, va_list ap) -{ - if (early_console) { - char buf[512]; - int n = vscnprintf(buf, sizeof(buf), fmt, ap); - - early_console->write(early_console, buf, n); - } -} - -asmlinkage void early_printk(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - early_vprintk(fmt, ap); - va_end(ap); -} -#endif - #ifdef CONFIG_BOOT_PRINTK_DELAY static int boot_delay; /* msecs delay after each printk during bootup */ @@ -1743,6 +1720,29 @@ static size_t cont_print_text(char *text #endif /* CONFIG_PRINTK */ +#ifdef CONFIG_EARLY_PRINTK +struct console *early_console; + +void early_vprintk(const char *fmt, va_list ap) +{ + if (early_console) { + char buf[512]; + int n = vscnprintf(buf, sizeof(buf), fmt, ap); + + early_console->write(early_console, buf, n); + } +} + +asmlinkage void early_printk(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + early_vprintk(fmt, ap); + va_end(ap); +} +#endif + static int __add_preferred_console(char *name, int idx, char *options, char *brl_options) { _ Problem is, that won't fix the various compilation problems we've had. See yesterday's lkml thread "linux-next: build failure after merge of the final tree (akpm tree related)" -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
