linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] cris: cpuinfo_op should depend on CONFIG_PROC_FS
@ 2014-03-02 10:34 Geert Uytterhoeven
  2014-03-03  0:16 ` Stephen Rothwell
  0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2014-03-02 10:34 UTC (permalink / raw)
  To: Mikael Starvik, Jesper Nilsson
  Cc: linux-cris-kernel, linux-next, linux-kernel, Geert Uytterhoeven

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>
---
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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH -next] cris: cpuinfo_op should depend on CONFIG_PROC_FS
  2014-03-02 10:34 [PATCH -next] cris: cpuinfo_op should depend on CONFIG_PROC_FS Geert Uytterhoeven
@ 2014-03-03  0:16 ` Stephen Rothwell
  2014-03-03  2:09   ` Josh Triplett
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2014-03-03  0:16 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Mikael Starvik, Jesper Nilsson, linux-cris-kernel, linux-next,
	linux-kernel, Andrew Morton, Josh Triplett

[-- Attachment #1: Type: text/plain, Size: 1378 bytes --]

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 ...]

> 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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH -next] cris: cpuinfo_op should depend on CONFIG_PROC_FS
  2014-03-03  0:16 ` Stephen Rothwell
@ 2014-03-03  2:09   ` Josh Triplett
  0 siblings, 0 replies; 3+ messages in thread
From: Josh Triplett @ 2014-03-03  2:09 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Geert Uytterhoeven, Mikael Starvik, Jesper Nilsson,
	linux-cris-kernel, linux-next, linux-kernel, Andrew Morton

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



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-03-03  2:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-02 10:34 [PATCH -next] cris: cpuinfo_op should depend on CONFIG_PROC_FS Geert Uytterhoeven
2014-03-03  0:16 ` Stephen Rothwell
2014-03-03  2:09   ` Josh Triplett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).