commit 5bc6d799e1158b0a9d99fe1d92b397214fa76f91 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

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.

Linus Torvalds 16 years ago 5bc6d799 b04da8bf

+2 -4

1 changed file

expand all

unified split

arch

sparc

kernel

irq_64.c

+2 -4

arch/sparc/kernel/irq_64.c

··· 268 return cpuid; 269 } 270 #else 271 - static int irq_choose_cpu(unsigned int virt_irq, const struct cpumask *affinity) 272 - { 273 - return real_hard_smp_processor_id(); 274 - } 275 #endif 276 277 static void sun4u_irq_enable(unsigned int virt_irq)

··· 268 return cpuid; 269 } 270 #else 271 + #define irq_choose_cpu(virt_irq, affinity) \ 272 + real_hard_smp_processor_id() 273 #endif 274 275 static void sun4u_irq_enable(unsigned int virt_irq)