diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-27 05:47:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-27 05:47:24 -0500 |
| commit | 5bc6d799e1158b0a9d99fe1d92b397214fa76f91 (patch) | |
| tree | d6c8d0819ed5e9ed682d34903c4d1aa784739a64 | |
| parent | b04da8bfdfbbd79544cab2fadfdc12e87eb01600 (diff) | |
| parent | 6abce7711fcbd72b42f0c9632c1beccf4e674663 (diff) | |
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.c | 6 |
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) | |||
| 268 | return cpuid; | 268 | return cpuid; |
| 269 | } | 269 | } |
| 270 | #else | 270 | #else |
| 271 | static int irq_choose_cpu(unsigned int virt_irq, const struct cpumask *affinity) | 271 | #define irq_choose_cpu(virt_irq, affinity) \ |
| 272 | { | 272 | real_hard_smp_processor_id() |
| 273 | return real_hard_smp_processor_id(); | ||
| 274 | } | ||
| 275 | #endif | 273 | #endif |
| 276 | 274 | ||
| 277 | static void sun4u_irq_enable(unsigned int virt_irq) | 275 | static void sun4u_irq_enable(unsigned int virt_irq) |