Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent bdf76e36

arch/ia64/kernel/iosapic.c

+1 −1
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ iosapic_unregister_intr (unsigned int gsi) 
	if (iosapic_intr_info[irq].count == 0) {

#ifdef CONFIG_SMP

		/* Clear affinity */

		cpumask_setall(irq_get_irq_data(irq)->affinity);

		cpumask_setall(irq_get_affinity_mask(irq));

#endif

		/* Clear the interrupt information */

		iosapic_intr_info[irq].dest = 0;

arch/ia64/kernel/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

{

	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)));

		irq_redir[irq] = (char) (redir & 0xff);

	}
@@ -119,8 +119,8 @@ static void migrate_irqs(void) 
		if (irqd_is_per_cpu(data))

			continue;



		if (cpumask_any_and(data->affinity, cpu_online_mask)

		    >= nr_cpu_ids) {

		if (cpumask_any_and(irq_data_get_affinity_mask(data),

				    cpu_online_mask) >= nr_cpu_ids) {

			/*

			 * Save it for phase 2 processing

			 */

arch/ia64/kernel/msi_ia64.c

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata, 
	msg.data = data;



	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;

}
@@ -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));



	dmar_msi_write(irq, &msg);

	cpumask_copy(data->affinity, mask);

	cpumask_copy(irq_data_get_affinity_mask(data), mask);



	return 0;

}

arch/ia64/sn/kernel/msi_sn.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, 
	msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff);



	pci_write_msi_msg(irq, &msg);

	cpumask_copy(data->affinity, cpu_mask);

	cpumask_copy(irq_data_get_affinity_mask(data), cpu_mask);



	return 0;

}