@@ -87,7 +87,8 @@ static void mn10300_cpupic_mask_ack(struct irq_data *d)
87
87
tmp2 = GxICR (irq );
88
88
89
89
irq_affinity_online [irq ] =
90
- cpumask_any_and (d -> affinity , cpu_online_mask );
90
+ cpumask_any_and (irq_data_get_affinity_mask (d ),
91
+ cpu_online_mask );
91
92
CROSS_GxICR (irq , irq_affinity_online [irq ]) =
92
93
(tmp & (GxICR_LEVEL | GxICR_ENABLE )) | GxICR_DETECT ;
93
94
tmp = CROSS_GxICR (irq , irq_affinity_online [irq ]);
@@ -124,7 +125,7 @@ static void mn10300_cpupic_unmask_clear(struct irq_data *d)
124
125
} else {
125
126
tmp = GxICR (irq );
126
127
127
- irq_affinity_online [irq ] = cpumask_any_and (d -> affinity ,
128
+ irq_affinity_online [irq ] = cpumask_any_and (irq_data_get_affinity_mask ( d ) ,
128
129
cpu_online_mask );
129
130
CROSS_GxICR (irq , irq_affinity_online [irq ]) = (tmp & GxICR_LEVEL ) | GxICR_ENABLE | GxICR_DETECT ;
130
131
tmp = CROSS_GxICR (irq , irq_affinity_online [irq ]);
@@ -316,15 +317,16 @@ void migrate_irqs(void)
316
317
self = smp_processor_id ();
317
318
for (irq = 0 ; irq < NR_IRQS ; irq ++ ) {
318
319
struct irq_data * data = irq_get_irq_data (irq );
320
+ struct cpumask * mask = irq_data_get_affinity_mask (data );
319
321
320
322
if (irqd_is_per_cpu (data ))
321
323
continue ;
322
324
323
- if (cpumask_test_cpu (self , data -> affinity ) &&
325
+ if (cpumask_test_cpu (self , mask ) &&
324
326
!cpumask_intersects (& irq_affinity [irq ], cpu_online_mask )) {
325
327
int cpu_id ;
326
328
cpu_id = cpumask_first (cpu_online_mask );
327
- cpumask_set_cpu (cpu_id , data -> affinity );
329
+ cpumask_set_cpu (cpu_id , mask );
328
330
}
329
331
/* We need to operate irq_affinity_online atomically. */
330
332
arch_local_cli_save (flags );
@@ -335,8 +337,7 @@ void migrate_irqs(void)
335
337
GxICR (irq ) = x & GxICR_LEVEL ;
336
338
tmp = GxICR (irq );
337
339
338
- new = cpumask_any_and (data -> affinity ,
339
- cpu_online_mask );
340
+ new = cpumask_any_and (mask , cpu_online_mask );
340
341
irq_affinity_online [irq ] = new ;
341
342
342
343
CROSS_GxICR (irq , new ) =
0 commit comments