]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
cris: cpuinfo_op should depend on CONFIG_PROC_FS
authorGeert Uytterhoeven <geert@linux-m68k.org>
Mon, 7 Apr 2014 22:39:06 +0000 (15:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Apr 2014 23:36:09 +0000 (16:36 -0700)
Fix breakage which will be exposed by the patch "kconfig: make allnoconfig
disable options behind EMBEDDED and EXPERT".

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>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/cris/kernel/setup.c

index 32c3d248868e27c152932c7e9baf98410a1b3128..905b70ea9939dcc629da3574fc30b4441e34cb63 100644 (file)
@@ -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)
 {