aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mn10300
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@linux.intel.com>2015-06-01 04:05:22 -0400
committerThomas Gleixner <tglx@linutronix.de>2015-06-25 06:02:43 -0400
commit856b859df4237ed10176c6afc2c97aa90ab04ffc (patch)
tree957ff483bc4322c35857e523f208912cc0257dd0 /arch/mn10300
parent5c1642e4d2e475bbfb13da15c6ca16a23ba889bb (diff)
mn10300: Fix incorrect use of irq_data->affinity
The field affinity in struct irq_data is type of cpumask_var_t, so we should pass in data->affinity instead of &data->affinity when calling cpumask_xxxx(). Signed-off-by: Jiang 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-14-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/mn10300')
-rw-r--r--arch/mn10300/kernel/irq.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mn10300/kernel/irq.c b/arch/mn10300/kernel/irq.c
index 6ab3b73efcf8..480de70f4059 100644
--- a/arch/mn10300/kernel/irq.c
+++ b/arch/mn10300/kernel/irq.c
@@ -320,11 +320,11 @@ void migrate_irqs(void)
320 if (irqd_is_per_cpu(data)) 320 if (irqd_is_per_cpu(data))
321 continue; 321 continue;
322 322
323 if (cpumask_test_cpu(self, &data->affinity) && 323 if (cpumask_test_cpu(self, data->affinity) &&
324 !cpumask_intersects(&irq_affinity[irq], cpu_online_mask)) { 324 !cpumask_intersects(&irq_affinity[irq], cpu_online_mask)) {
325 int cpu_id; 325 int cpu_id;
326 cpu_id = cpumask_first(cpu_online_mask); 326 cpu_id = cpumask_first(cpu_online_mask);
327 cpumask_set_cpu(cpu_id, &data->affinity); 327 cpumask_set_cpu(cpu_id, data->affinity);
328 } 328 }
329 /* We need to operate irq_affinity_online atomically. */ 329 /* We need to operate irq_affinity_online atomically. */
330 arch_local_cli_save(flags); 330 arch_local_cli_save(flags);
@@ -335,7 +335,7 @@ void migrate_irqs(void)
335 GxICR(irq) = x & GxICR_LEVEL; 335 GxICR(irq) = x & GxICR_LEVEL;
336 tmp = GxICR(irq); 336 tmp = GxICR(irq);
337 337
338 new = cpumask_any_and(&data->affinity, 338 new = cpumask_any_and(data->affinity,
339 cpu_online_mask); 339 cpu_online_mask);
340 irq_affinity_online[irq] = new; 340 irq_affinity_online[irq] = new;
341 341