Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ia64/irq: Use access helper irq_data_get_affinity_mask()

This is a preparatory patch for moving irq_data struct members.

Signed-off-by: Jiang 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.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

authored by

Jiang Liu and committed by
Thomas Gleixner
c42574ed bdf76e36

+7 -7
+1 -1
arch/ia64/kernel/iosapic.c
··· 838 838 if (iosapic_intr_info[irq].count == 0) { 839 839 #ifdef CONFIG_SMP 840 840 /* Clear affinity */ 841 - cpumask_setall(irq_get_irq_data(irq)->affinity); 841 + cpumask_setall(irq_get_affinity_mask(irq)); 842 842 #endif 843 843 /* Clear the interrupt information */ 844 844 iosapic_intr_info[irq].dest = 0;
+3 -3
arch/ia64/kernel/irq.c
··· 67 67 void set_irq_affinity_info (unsigned int irq, int hwid, int redir) 68 68 { 69 69 if (irq < NR_IRQS) { 70 - cpumask_copy(irq_get_irq_data(irq)->affinity, 70 + cpumask_copy(irq_get_affinity_mask(irq), 71 71 cpumask_of(cpu_logical_id(hwid))); 72 72 irq_redir[irq] = (char) (redir & 0xff); 73 73 } ··· 119 119 if (irqd_is_per_cpu(data)) 120 120 continue; 121 121 122 - if (cpumask_any_and(data->affinity, cpu_online_mask) 123 - >= nr_cpu_ids) { 122 + if (cpumask_any_and(irq_data_get_affinity_mask(data), 123 + cpu_online_mask) >= nr_cpu_ids) { 124 124 /* 125 125 * Save it for phase 2 processing 126 126 */
+2 -2
arch/ia64/kernel/msi_ia64.c
··· 36 36 msg.data = data; 37 37 38 38 pci_write_msi_msg(irq, &msg); 39 - cpumask_copy(idata->affinity, cpumask_of(cpu)); 39 + cpumask_copy(irq_data_get_affinity_mask(idata), cpumask_of(cpu)); 40 40 41 41 return 0; 42 42 } ··· 148 148 msg.address_lo |= MSI_ADDR_DEST_ID_CPU(cpu_physical_id(cpu)); 149 149 150 150 dmar_msi_write(irq, &msg); 151 - cpumask_copy(data->affinity, mask); 151 + cpumask_copy(irq_data_get_affinity_mask(data), mask); 152 152 153 153 return 0; 154 154 }
+1 -1
arch/ia64/sn/kernel/msi_sn.c
··· 206 206 msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff); 207 207 208 208 pci_write_msi_msg(irq, &msg); 209 - cpumask_copy(data->affinity, cpu_mask); 209 + cpumask_copy(irq_data_get_affinity_mask(data), cpu_mask); 210 210 211 211 return 0; 212 212 }