Commit 5bc6d799 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents b04da8bf 6abce771

arch/sparc/kernel/irq_64.c

+2 −4
Original line number Diff line number Diff line
@@ -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)