These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / sh / kernel / irq.c

diff --git a/kernel/arch/sh/kernel/irq.c b/kernel/arch/sh/kernel/irq.c
index 6fe8089..abd58b4 100644 (file)
--- a/kernel/arch/sh/kernel/irq.c
+++ b/kernel/arch/sh/kernel/irq.c
@@ -229,16 +229,17 @@ void migrate_irqs(void)
        for_each_active_irq(irq) {
                struct irq_data *data = irq_get_irq_data(irq);
 
-               if (data->node == cpu) {
-                       unsigned int newcpu = cpumask_any_and(data->affinity,
+               if (irq_data_get_node(data) == cpu) {
+                       struct cpumask *mask = irq_data_get_affinity_mask(data);
+                       unsigned int newcpu = cpumask_any_and(mask,
                                                              cpu_online_mask);
                        if (newcpu >= nr_cpu_ids) {
                                pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n",
                                                    irq, cpu);
 
-                               cpumask_setall(data->affinity);
+                               cpumask_setall(mask);
                        }
-                       irq_set_affinity(irq, data->affinity);
+                       irq_set_affinity(irq, mask);
                }
        }
 }