diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-04-07 22:39:06 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 23:36:09 (GMT) |
| commit | c638b1074837c601808fee93f33b9c19224ea4cf (patch) | |
| tree | 4f82ec07cb2ebbcc3fe506ec5b1aa338268bf3e1 /arch | |
| parent | ae797bdf7f12a2e0216161eb82a568809f6e5c94 (diff) | |
| download | linux-c638b1074837c601808fee93f33b9c19224ea4cf.tar.xz | |
cris: cpuinfo_op should depend on CONFIG_PROC_FS
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/cris/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c index 32c3d24..905b70e 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) { |