Commit c42574ed authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner

ia64/irq: Use access helper irq_data_get_affinity_mask()

This is a preparatory patch for moving irq_data struct members.
Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Link: http://lkml.kernel.org/r/20150713131034.630273860@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent bdf76e36
...@@ -838,7 +838,7 @@ iosapic_unregister_intr (unsigned int gsi) ...@@ -838,7 +838,7 @@ iosapic_unregister_intr (unsigned int gsi)
if (iosapic_intr_info[irq].count == 0) { if (iosapic_intr_info[irq].count == 0) {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* Clear affinity */ /* Clear affinity */
cpumask_setall(irq_get_irq_data(irq)->affinity); cpumask_setall(irq_get_affinity_mask(irq));
#endif #endif
/* Clear the interrupt information */ /* Clear the interrupt information */
iosapic_intr_info[irq].dest = 0; iosapic_intr_info[irq].dest = 0;
......
...@@ -67,7 +67,7 @@ static char irq_redir [NR_IRQS]; // = { [0 ... NR_IRQS-1] = 1 }; ...@@ -67,7 +67,7 @@ static char irq_redir [NR_IRQS]; // = { [0 ... NR_IRQS-1] = 1 };
void set_irq_affinity_info (unsigned int irq, int hwid, int redir) void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
{ {
if (irq < NR_IRQS) { if (irq < NR_IRQS) {
cpumask_copy(irq_get_irq_data(irq)->affinity, cpumask_copy(irq_get_affinity_mask(irq),
cpumask_of(cpu_logical_id(hwid))); cpumask_of(cpu_logical_id(hwid)));
irq_redir[irq] = (char) (redir & 0xff); irq_redir[irq] = (char) (redir & 0xff);
} }
...@@ -119,8 +119,8 @@ static void migrate_irqs(void) ...@@ -119,8 +119,8 @@ static void migrate_irqs(void)
if (irqd_is_per_cpu(data)) if (irqd_is_per_cpu(data))
continue; continue;
if (cpumask_any_and(data->affinity, cpu_online_mask) if (cpumask_any_and(irq_data_get_affinity_mask(data),
>= nr_cpu_ids) { cpu_online_mask) >= nr_cpu_ids) {
/* /*
* Save it for phase 2 processing * Save it for phase 2 processing
*/ */
......
...@@ -36,7 +36,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata, ...@@ -36,7 +36,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata,
msg.data = data; msg.data = data;
pci_write_msi_msg(irq, &msg); pci_write_msi_msg(irq, &msg);
cpumask_copy(idata->affinity, cpumask_of(cpu)); cpumask_copy(irq_data_get_affinity_mask(idata), cpumask_of(cpu));
return 0; return 0;
} }
...@@ -148,7 +148,7 @@ static int dmar_msi_set_affinity(struct irq_data *data, ...@@ -148,7 +148,7 @@ static int dmar_msi_set_affinity(struct irq_data *data,
msg.address_lo |= MSI_ADDR_DEST_ID_CPU(cpu_physical_id(cpu)); msg.address_lo |= MSI_ADDR_DEST_ID_CPU(cpu_physical_id(cpu));
dmar_msi_write(irq, &msg); dmar_msi_write(irq, &msg);
cpumask_copy(data->affinity, mask); cpumask_copy(irq_data_get_affinity_mask(data), mask);
return 0; return 0;
} }
......
...@@ -206,7 +206,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, ...@@ -206,7 +206,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data,
msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff); msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff);
pci_write_msi_msg(irq, &msg); pci_write_msi_msg(irq, &msg);
cpumask_copy(data->affinity, cpu_mask); cpumask_copy(irq_data_get_affinity_mask(data), cpu_mask);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment