@@ -131,7 +131,7 @@ static int cpu_set_affinity_irq(struct irq_data *d, const struct cpumask *dest,
131
131
if (cpu_dest < 0 )
132
132
return -1 ;
133
133
134
- cpumask_copy (d -> affinity , dest );
134
+ cpumask_copy (irq_data_get_affinity_mask ( d ) , dest );
135
135
136
136
return 0 ;
137
137
}
@@ -339,7 +339,7 @@ unsigned long txn_affinity_addr(unsigned int irq, int cpu)
339
339
{
340
340
#ifdef CONFIG_SMP
341
341
struct irq_data * d = irq_get_irq_data (irq );
342
- cpumask_copy (d -> affinity , cpumask_of (cpu ));
342
+ cpumask_copy (irq_data_get_affinity_mask ( d ) , cpumask_of (cpu ));
343
343
#endif
344
344
345
345
return per_cpu (cpu_data , cpu ).txn_addr ;
@@ -508,7 +508,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
508
508
unsigned long eirr_val ;
509
509
int irq , cpu = smp_processor_id ();
510
510
#ifdef CONFIG_SMP
511
- struct irq_desc * desc ;
511
+ struct irq_data * irq_data ;
512
512
cpumask_t dest ;
513
513
#endif
514
514
@@ -522,9 +522,9 @@ void do_cpu_irq_mask(struct pt_regs *regs)
522
522
irq = eirr_to_irq (eirr_val );
523
523
524
524
#ifdef CONFIG_SMP
525
- desc = irq_to_desc (irq );
526
- cpumask_copy (& dest , desc -> irq_data . affinity );
527
- if (irqd_is_per_cpu (& desc -> irq_data ) &&
525
+ irq_data = irq_get_irq_data (irq );
526
+ cpumask_copy (& dest , irq_data_get_affinity_mask ( irq_data ) );
527
+ if (irqd_is_per_cpu (irq_data ) &&
528
528
!cpumask_test_cpu (smp_processor_id (), & dest )) {
529
529
int cpu = cpumask_first (& dest );
530
530
0 commit comments