From 18d5e774dedb5d44f27ed12d7c5be2881dd61f71 Mon Sep 17 00:00:00 2001
From: Ido Yariv <ido@wizery.com>
Date: Thu, 14 Jun 2012 18:43:08 +0300
Subject: [PATCH] --- yaml --- r: 312412 b: refs/heads/master c:
 d48daf37a3d2e2b28a61e615c0fc538301edb0dd h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/vsmp_64.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 81edaac26614..26c7e0a18573 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 110c1e1f1bf61e5dca53ff5c9dc75243ce87c002
+refs/heads/master: d48daf37a3d2e2b28a61e615c0fc538301edb0dd
diff --git a/trunk/arch/x86/kernel/vsmp_64.c b/trunk/arch/x86/kernel/vsmp_64.c
index 6b96a7374f94..3f0285ac00fa 100644
--- a/trunk/arch/x86/kernel/vsmp_64.c
+++ b/trunk/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