Re: [PATCH v2] early_printk: consolidate random copies of identicalcode

[Thomas Gleixner]

On Thu, 7 Mar 2013, Paul Gortmaker wrote:
> On 13-03-07 02:25 PM, Andrew Morton wrote:
> > On Thu, 7 Mar 2013 14:15:54 -0500 Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx> 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:
> > 
> 
> [...]
> 
> > _
> > 
> > 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)"
> 
> Unless I'm missing something, the easy fix for that is to just
> unconditionally have an early_console, i.e. this one line change
> on top of the v2 patch:
> 
> diff --git a/kernel/printk.c b/kernel/printk.c
> index 7664e49..86799bf 100644
> --- a/kernel/printk.c
> +++ b/kernel/printk.c
> @@ -120,6 +120,7 @@ struct console_cmdline
>  static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES];
>  static int selected_console = -1;
>  static int preferred_console = -1;
> +struct console *early_console;
>  int console_set_on_cmdline;
>  EXPORT_SYMBOL(console_set_on_cmdline);
>  
> @@ -1718,7 +1719,6 @@ static size_t cont_print_text(char *text, size_t size) { return 0; }
>  #endif /* CONFIG_PRINTK */
>  
>  #ifdef CONFIG_EARLY_PRINTK
> -struct console *early_console;
>  
>  void early_vprintk(const char *fmt, va_list ap)
>  {
> 
> 
> Then you don't have to spray any of those ifdefs into the sparc code.

Yeah, that's what I thought as well. The extra pointer is not going to
create massive bloat :)

Btw, we should put that into the read_mostly section while at it.

Thanks,

	tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/