FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-20 00:11:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse Source 
* 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
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/sparc/kernel/irq_64.c
View File

@ -268,10 +268,8 @@ static int irq_choose_cpu(unsigned int virt_irq, const struct cpumask *affinity)
return cpuid; return cpuid;
} }
#else #else
static int irq_choose_cpu(unsigned int virt_irq, const struct cpumask *affinity) #define irq_choose_cpu(virt_irq, affinity) \
{ real_hard_smp_processor_id()
return real_hard_smp_processor_id();
}
#endif #endif
static void sun4u_irq_enable(unsigned int virt_irq) static void sun4u_irq_enable(unsigned int virt_irq)