---

yaml --- r: 312412 b: refs/heads/master c: d48daf3 h: refs/heads/master v: v3
git-mirror · Jun 15, 2012 · 18d5e77 · 18d5e77
1 parent 17c0004
commit 18d5e77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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