Skip to contentSkip to conversation

xtensa/irq: Use access helper irq_data_get_affinity_mask()

PATCH New Thomas Gleixner 2 participants 3 messages Jul 13, 2015 – Jul 29, 2015 Tensilica Xtensa port (xtensa)

lore
Share & tools
lore

Thomas Gleixner

author
#0 lore raw

PATCH 1/1 xtensa/irq: Use access helper irq_data_get_affinity_mask()

From: Jiang Liu <[email protected]>

This is a preparatory patch for moving irq_data struct members.

Signed-off-by Jiang Liu <[email protected]>
Cc Chris Zankel <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
---
 arch/xtensa/kernel/irq.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
arch/xtensa/kernel/irq.c +6 -4
Index: tip/arch/xtensa/kernel/irq.c
===================================================================
@@ -166,23 +166,25 @@ void migrate_irqs(void)
 
 	for_each_active_irq(i) {
 		struct irq_data *data = irq_get_irq_data(i);
+		struct cpumask *mask;
 		unsigned int newcpu;
 
 		if (irqd_is_per_cpu(data))
 			continue;
 
-		if (!cpumask_test_cpu(cpu, data->affinity))
+		mask = irq_data_get_affinity_mask(data);
+		if (!cpumask_test_cpu(cpu, mask))
 			continue;
 
-		newcpu = cpumask_any_and(data->affinity, cpu_online_mask);
+		newcpu = cpumask_any_and(mask, cpu_online_mask);
 
 		if (newcpu >= nr_cpu_ids) {
 			pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n",
 					    i, cpu);
 
-			cpumask_setall(data->affinity);
+			cpumask_setall(mask);
 		}
-		irq_set_affinity(i, data->affinity);
+		irq_set_affinity(i, mask);
 	}
 }
 #endif /* CONFIG_HOTPLUG_CPU */
merge bot
#1 lore raw
xtensa/irq: Use access helper irq_data_get_affinity_mask()
Commit-ID:  06a70ec8aa30cd0702317ba1696a808f85d27387
Gitweb:     http://git.kernel.org/tip/06a70ec8aa30cd0702317ba1696a808f85d27387
Author:     Jiang Liu <[email protected]>
AuthorDate: Mon, 13 Jul 2015 20:53:10 +0000
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 27 Jul 2015 13:36:39 +0200

xtensa/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 <[email protected]>
Cc Chris Zankel <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Thomas Gleixner <[email protected]>
---
 arch/xtensa/kernel/irq.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
arch/xtensa/kernel/irq.c +6 -4
index 3eee94f..d7b5a4c8 100644
@@ -166,23 +166,25 @@ void migrate_irqs(void)
 
 	for_each_active_irq(i) {
 		struct irq_data *data = irq_get_irq_data(i);
+		struct cpumask *mask;
 		unsigned int newcpu;
 
 		if (irqd_is_per_cpu(data))
 			continue;
 
-		if (!cpumask_test_cpu(cpu, data->affinity))
+		mask = irq_data_get_affinity_mask(data);
+		if (!cpumask_test_cpu(cpu, mask))
 			continue;
 
-		newcpu = cpumask_any_and(data->affinity, cpu_online_mask);
+		newcpu = cpumask_any_and(mask, cpu_online_mask);
 
 		if (newcpu >= nr_cpu_ids) {
 			pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n",
 					    i, cpu);
 
-			cpumask_setall(data->affinity);
+			cpumask_setall(mask);
 		}
-		irq_set_affinity(i, data->affinity);
+		irq_set_affinity(i, mask);
 	}
 }
 #endif /* CONFIG_HOTPLUG_CPU */
merge bot
#2 lore raw
In reply to Thomas Gleixner
xtensa/irq: Use access helper irq_data_get_affinity_mask()
Commit-ID:  1559f3b8d0527e24219149c95b3de5e7b2924828
Gitweb:     http://git.kernel.org/tip/1559f3b8d0527e24219149c95b3de5e7b2924828
Author:     Jiang Liu <[email protected]>
AuthorDate: Mon, 13 Jul 2015 20:53:10 +0000
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 29 Jul 2015 10:08:11 +0200

xtensa/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 <[email protected]>
Cc Chris Zankel <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Thomas Gleixner <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/xtensa/kernel/irq.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
arch/xtensa/kernel/irq.c +6 -4
index 3eee94f..d7b5a4c8 100644
@@ -166,23 +166,25 @@ void migrate_irqs(void)
 
 	for_each_active_irq(i) {
 		struct irq_data *data = irq_get_irq_data(i);
+		struct cpumask *mask;
 		unsigned int newcpu;
 
 		if (irqd_is_per_cpu(data))
 			continue;
 
-		if (!cpumask_test_cpu(cpu, data->affinity))
+		mask = irq_data_get_affinity_mask(data);
+		if (!cpumask_test_cpu(cpu, mask))
 			continue;
 
-		newcpu = cpumask_any_and(data->affinity, cpu_online_mask);
+		newcpu = cpumask_any_and(mask, cpu_online_mask);
 
 		if (newcpu >= nr_cpu_ids) {
 			pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n",
 					    i, cpu);
 
-			cpumask_setall(data->affinity);
+			cpumask_setall(mask);
 		}
-		irq_set_affinity(i, data->affinity);
+		irq_set_affinity(i, mask);
 	}
 }
 #endif /* CONFIG_HOTPLUG_CPU */