summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-27 02:47:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-27 02:47:24 -0800
commit5bc6d799e1158b0a9d99fe1d92b397214fa76f91 (patch)
treed6c8d0819ed5e9ed682d34903c4d1aa784739a64
parentb04da8bfdfbbd79544cab2fadfdc12e87eb01600 (diff)
parent6abce7711fcbd72b42f0c9632c1beccf4e674663 (diff)
downloadkernel-5bc6d799e1158b0a9d99fe1d92b397214fa76f91.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix UP build.
-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)