Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (e80eaf99) · Commits · e / devices / android_kernel_fairphone_FP4

arch/powerpc/platforms/pseries/xics.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -419,7 +419,7 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
		* For the moment only implement delivery to all cpus or one cpu.
		* Get current irq_server for the given irq
		*/
		irq_server = get_irq_server(irq, 1);
		irq_server = get_irq_server(virq, 1);
		if (irq_server == -1) {
		char cpulist[128];
		cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);