mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 07:01:57 +00:00
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:
commit
5bc6d799e1
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user