aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/mpic.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
-rw-r--r--arch/powerpc/sysdev/mpic.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index a93da805435f..116695b7a5cb 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -821,16 +821,12 @@ int mpic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
821 821
822 mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION), 1 << cpuid); 822 mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION), 1 << cpuid);
823 } else { 823 } else {
824 cpumask_var_t tmp; 824 u32 mask = cpumask_bits(cpumask)[0];
825 825
826 alloc_cpumask_var(&tmp, GFP_KERNEL); 826 mask &= cpumask_bits(cpu_online_mask)[0];
827
828 cpumask_and(tmp, cpumask, cpu_online_mask);
829 827
830 mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION), 828 mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION),
831 mpic_physmask(cpumask_bits(tmp)[0])); 829 mpic_physmask(mask));
832
833 free_cpumask_var(tmp);
834 } 830 }
835 831
836 return 0; 832 return 0;