This is a note to let you know that I've just added the patch titled
MIPS: smp-mt: Fix link error when PROC_FS=n
to the 3.16-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mips-smp-mt-fix-link-error-when-proc_fs-n.patch
and it can be found in the queue-3.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 7d907fa1c6ccb64c7f64cc7d3dcc7f6fe30a67b4 Mon Sep 17 00:00:00 2001
From: James Hogan <james.hogan@xxxxxxxxxx>
Date: Fri, 4 Jul 2014 11:59:46 +0100
Subject: MIPS: smp-mt: Fix link error when PROC_FS=n
From: James Hogan <james.hogan@xxxxxxxxxx>
commit 7d907fa1c6ccb64c7f64cc7d3dcc7f6fe30a67b4 upstream.
Commit d6d3c9afaab4 (MIPS: MT: proc: Add support for printing VPE and TC
ids) causes a link error when CONFIG_PROC_FS=n:
arch/mips/built-in.o: In function `proc_cpuinfo_notifier_init':
smp-mt.c: undefined reference to `register_proc_cpuinfo_notifier'
This is fixed by adding an ifdef around the procfs handling code
in smp-mt.c.
Signed-off-by: James Hogan <james.hogan@xxxxxxxxxx>
Reported-by: Markos Chandras <markos.chandras@xxxxxxxxxx>
Reviewed-by: Markos Chandras <markos.chandras@xxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: linux-mips@xxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/7244/
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/mips/kernel/smp-mt.c | 2 ++
1 file changed, 2 insertions(+)
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -288,6 +288,7 @@ struct plat_smp_ops vsmp_smp_ops = {
.prepare_cpus = vsmp_prepare_cpus,
};
+#ifdef CONFIG_PROC_FS
static int proc_cpuinfo_chain_call(struct notifier_block *nfb,
unsigned long action_unused, void *data)
{
@@ -309,3 +310,4 @@ static int __init proc_cpuinfo_notifier_
}
subsys_initcall(proc_cpuinfo_notifier_init);
+#endif
Patches currently in stable-queue which might be from james.hogan@xxxxxxxxxx are
queue-3.16/mips-smp-mt-fix-link-error-when-proc_fs-n.patch
queue-3.16/mips-malta-eva-rename-eva_entry-to-platform_eva_init.patch
queue-3.16/mips-syscall-fix-audit-value-for-o32-processes-on-mips64.patch
queue-3.16/mips-eva-add-new-eva-header.patch
queue-3.16/mips-cps-initialize-eva-before-bringing-up-vpes-from-secondary-cores.patch
queue-3.16/mips-scall64-o32-fix-indirect-syscall-detection.patch
queue-3.16/mips-octeon-make-get_system_type-thread-safe.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html