Subject: + cris-cpuinfo_op-should-depend-on-config_proc_fs.patch added to -mm tree
To: geert@xxxxxxxxxxxxxx,jesper.nilsson@xxxxxxxx,sfr@xxxxxxxxxxxxxxxx,starvik@xxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 04 Mar 2014 12:14:17 -0800
The patch titled
Subject: cris: cpuinfo_op should depend on CONFIG_PROC_FS
has been added to the -mm tree. Its filename is
cris-cpuinfo_op-should-depend-on-config_proc_fs.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/cris-cpuinfo_op-should-depend-on-config_proc_fs.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/cris-cpuinfo_op-should-depend-on-config_proc_fs.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Subject: 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@xxxxxxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Mikael Starvik <starvik@xxxxxxxx>
Cc: Jesper Nilsson <jesper.nilsson@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/cris/kernel/setup.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN arch/cris/kernel/setup.c~cris-cpuinfo_op-should-depend-on-config_proc_fs arch/cris/kernel/setup.c
--- a/arch/cris/kernel/setup.c~cris-cpuinfo_op-should-depend-on-config_proc_fs
+++ a/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)
{
_
Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are
origin.patch
sh-prefix-sh-specific-ccr-and-ccr2-by-sh_.patch
arch-sh-boards-board-sh7757lcrc-fixup-sdhi-register-size.patch
cris-cpuinfo_op-should-depend-on-config_proc_fs.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
