[tip:x86/platform] x86/vsmp: Fix linker error when CONFIG_PROC_FS is not set

From: tip-bot for Ido Yariv
Date: Fri Jun 15 2012 - 10:22:43 EST


Commit-ID: d48daf37a3d2e2b28a61e615c0fc538301edb0dd
Gitweb: http://git.kernel.org/tip/d48daf37a3d2e2b28a61e615c0fc538301edb0dd
Author: Ido Yariv <ido@xxxxxxxxxx>
AuthorDate: Thu, 14 Jun 2012 18:43:08 +0300
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Fri, 15 Jun 2012 13:54:11 +0200

x86/vsmp: Fix linker error when CONFIG_PROC_FS is not set

set_vsmp_pv_ops() references no_irq_affinity which is undeclared
if CONFIG_PROC_FS isn't set. Fix this by adding an #ifdef around
this variable's access.

Reported-by: Fengguang Wu <wfg@xxxxxxxxxxxxxxx>
Signed-off-by: Ido Yariv <ido@xxxxxxxxxx>
Acked-by: Shai Fultheim <shai@xxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1339688588-12674-1-git-send-email-ido@xxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/kernel/vsmp_64.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 6b96a73..3f0285a 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -101,7 +101,10 @@ static void __init set_vsmp_pv_ops(void)
#ifdef CONFIG_SMP
if (cap & ctl & BIT(8)) {
ctl &= ~BIT(8);
+#ifdef CONFIG_PROC_FS
+ /* Don't let users change irq affinity via procfs */
no_irq_affinity = 1;
+#endif
}
#endif

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/