diff options
| author | Ido Yariv <ido@wizery.com> | 2012-06-14 18:43:08 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-15 13:54:11 +0200 |
| commit | d48daf37a3d2e2b28a61e615c0fc538301edb0dd (patch) | |
| tree | f40d28281164efdf915ae252d8fbc6445a63458f /arch/x86/kernel | |
| parent | 110c1e1f1bf61e5dca53ff5c9dc75243ce87c002 (diff) | |
| download | blackbird-op-linux-d48daf37a3d2e2b28a61e615c0fc538301edb0dd.tar.gz blackbird-op-linux-d48daf37a3d2e2b28a61e615c0fc538301edb0dd.zip | |
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@linux.intel.com>
Signed-off-by: Ido Yariv <ido@wizery.com>
Acked-by: Shai Fultheim <shai@scalemp.com>
Link: http://lkml.kernel.org/r/1339688588-12674-1-git-send-email-ido@wizery.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | 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 6b96a7374f94..3f0285ac00fa 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 |
