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.
This commit is contained in:
Linus Torvalds 2010-01-27 02:47:24 -08:00
commit 5bc6d799e1

View File

@ -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)