summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-01-26 13:16:49 +0100
committerDavid S. Miller <davem@davemloft.net>2010-01-26 13:16:49 +0100
commit6abce7711fcbd72b42f0c9632c1beccf4e674663 (patch)
treefb05481145e37f45bb0c25f41b24f70746e928f9
parentsparc64: Fix IRQ ->set_affinity() methods. (diff)
downloadlinux-6abce7711fcbd72b42f0c9632c1beccf4e674663.tar.xz
linux-6abce7711fcbd72b42f0c9632c1beccf4e674663.zip
sparc64: Fix UP build.
Can't reference irq_desc[].affinity when !SMP. Reported-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/kernel/irq_64.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index f2179cce1e4d..e1cbdb94d97b 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -268,10 +268,8 @@ static int irq_choose_cpu(unsigned int virt_irq, const struct cpumask *affinity)
return cpuid;
}
#else
-static int irq_choose_cpu(unsigned int virt_irq, const struct cpumask *affinity)
-{
- return real_hard_smp_processor_id();
-}
+#define irq_choose_cpu(virt_irq, affinity) \
+ real_hard_smp_processor_id()
#endif
static void sun4u_irq_enable(unsigned int virt_irq)