Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (5bc6d799) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/sparc/kernel/irq_64.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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)