Re: [PATCH -next] cris: cpuinfo_op should depend on CONFIG_PROC_FS

[Josh Triplett <josh@joshtriplett.org>]

On Mon, Mar 03, 2014 at 11:16:54AM +1100, Stephen Rothwell wrote:
> Hi Geert,
> 
> On Sun,  2 Mar 2014 11:34:39 +0100 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> >
> > Now allnoconfig started disabling CONFIG_PROC_FS:
> > 
> >     arch/cris/kernel/built-in.o:(.rodata+0xc): undefined reference to `show_cpuinfo'
> >     make: *** [vmlinux] Error 1
> > 
> > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> 
> Added as a merge fix to (for the akpm-current tree) linux-next from today.
> 
> [rest left here for Andrew and Josh ...]

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

> > http://kisskb.ellerman.id.au/kisskb/buildresult/10665698/
> > 
> >  arch/cris/kernel/setup.c |    2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c
> > index 32c3d248868e..905b70ea9939 100644
> > --- a/arch/cris/kernel/setup.c
> > +++ b/arch/cris/kernel/setup.c
> > @@ -165,6 +165,7 @@ void __init setup_arch(char **cmdline_p)
> >  	strcpy(init_utsname()->machine, cris_machine_name);
> >  }
> >  
> > +#ifdef CONFIG_PROC_FS
> >  static void *c_start(struct seq_file *m, loff_t *pos)
> >  {
> >  	return *pos < nr_cpu_ids ? (void *)(int)(*pos + 1) : NULL;
> > @@ -188,6 +189,7 @@ const struct seq_operations cpuinfo_op = {
> >  	.stop  = c_stop,
> >  	.show  = show_cpuinfo,
> >  };
> > +#endif /* CONFIG_PROC_FS */
> >  
> >  static int __init topology_init(void)
> >  {
> > -- 
> > 1.7.9.5
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au