Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Browse files Browse the repository at this point in the history
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix UP build.
  • Loading branch information
Linus Torvalds committed Jan 27, 2010
2 parents b04da8b + 6abce77 commit 5bc6d79
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions arch/sparc/kernel/irq_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 5bc6d79

Please sign in to comment.