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

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

mn10300/irq: Use access helper irq_data_get_affinity_mask() 



Use access helper irq_data_get_affinity_mask() to hide implementation
details of struct irq_desc.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-am33-list@redhat.com
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Link: http://lkml.kernel.org/r/1433145945-789-23-git-send-email-jiang.liu@linux.intel.com


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

arch/mn10300/kernel/cevt-mn10300.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ int __init init_clockevents(void) 
	{

		struct irq_data *data;

		data = irq_get_irq_data(cd->irq);

		cpumask_copy(data->affinity, cpumask_of(cpu));

		cpumask_copy(irq_data_get_affinity_mask(data), cpumask_of(cpu));

		iact->flags |= IRQF_NOBALANCING;

	}

#endif

arch/mn10300/kernel/irq.c

+7 −6
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ static void mn10300_cpupic_mask_ack(struct irq_data *d) 
		tmp2 = GxICR(irq);



		irq_affinity_online[irq] =

			cpumask_any_and(d->affinity, cpu_online_mask);

			cpumask_any_and(irq_data_get_affinity_mask(d),

					cpu_online_mask);

		CROSS_GxICR(irq, irq_affinity_online[irq]) =

			(tmp & (GxICR_LEVEL | GxICR_ENABLE)) | GxICR_DETECT;

		tmp = CROSS_GxICR(irq, irq_affinity_online[irq]);
@@ -124,7 +125,7 @@ static void mn10300_cpupic_unmask_clear(struct irq_data *d) 
	} else {

		tmp = GxICR(irq);



		irq_affinity_online[irq] = cpumask_any_and(d->affinity,

		irq_affinity_online[irq] = cpumask_any_and(irq_data_get_affinity_mask(d),

							   cpu_online_mask);

		CROSS_GxICR(irq, irq_affinity_online[irq]) = (tmp & GxICR_LEVEL) | GxICR_ENABLE | GxICR_DETECT;

		tmp = CROSS_GxICR(irq, irq_affinity_online[irq]);
@@ -316,15 +317,16 @@ void migrate_irqs(void) 
	self = smp_processor_id();

	for (irq = 0; irq < NR_IRQS; irq++) {

		struct irq_data *data = irq_get_irq_data(irq);

		struct cpumask *mask = irq_data_get_affinity_mask(data);



		if (irqd_is_per_cpu(data))

			continue;



		if (cpumask_test_cpu(self, data->affinity) &&

		if (cpumask_test_cpu(self, mask) &&

		    !cpumask_intersects(&irq_affinity[irq], cpu_online_mask)) {

			int cpu_id;

			cpu_id = cpumask_first(cpu_online_mask);

			cpumask_set_cpu(cpu_id, data->affinity);

			cpumask_set_cpu(cpu_id, mask);

		}

		/* We need to operate irq_affinity_online atomically. */

		arch_local_cli_save(flags);
@@ -335,8 +337,7 @@ void migrate_irqs(void) 
			GxICR(irq) = x & GxICR_LEVEL;

			tmp = GxICR(irq);



			new = cpumask_any_and(data->affinity,

					      cpu_online_mask);

			new = cpumask_any_and(mask, cpu_online_mask);

			irq_affinity_online[irq] = new;



			CROSS_GxICR(irq, new) =