Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752876AbbFZTvD (ORCPT ); Fri, 26 Jun 2015 15:51:03 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60130 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752383AbbFZTut (ORCPT ); Fri, 26 Jun 2015 15:50:49 -0400 Date: Fri, 26 Jun 2015 12:49:10 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: bp@alien8.de, rdunlap@infradead.org, yinghai@kernel.org, dhowells@redhat.com, benh@kernel.crashing.org, tony.luck@intel.com, konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, bhelgaas@google.com, yasutake.koichi@jp.panasonic.com, tglx@linutronix.de, mingo@kernel.org, jiang.liu@linux.intel.com, hpa@zytor.com Reply-To: jiang.liu@linux.intel.com, hpa@zytor.com, yasutake.koichi@jp.panasonic.com, mingo@kernel.org, tglx@linutronix.de, bhelgaas@google.com, linux-kernel@vger.kernel.org, konrad.wilk@oracle.com, benh@kernel.crashing.org, tony.luck@intel.com, dhowells@redhat.com, yinghai@kernel.org, rdunlap@infradead.org, bp@alien8.de In-Reply-To: <1433145945-789-14-git-send-email-jiang.liu@linux.intel.com> References: <1433145945-789-14-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] mn10300: Fix incorrect use of irq_data->affinity Git-Commit-ID: 856b859df4237ed10176c6afc2c97aa90ab04ffc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2399 Lines: 62 Commit-ID: 856b859df4237ed10176c6afc2c97aa90ab04ffc Gitweb: http://git.kernel.org/tip/856b859df4237ed10176c6afc2c97aa90ab04ffc Author: Jiang Liu AuthorDate: Mon, 1 Jun 2015 16:05:22 +0800 Committer: Thomas Gleixner CommitDate: Thu, 25 Jun 2015 12:02:43 +0200 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 Cc: Konrad Rzeszutek Wilk Cc: Tony Luck Cc: linux-am33-list@redhat.com Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: David Howells Cc: Koichi Yasutake Link: http://lkml.kernel.org/r/1433145945-789-14-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/mn10300/kernel/irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mn10300/kernel/irq.c b/arch/mn10300/kernel/irq.c index 6ab3b73..480de70 100644 --- a/arch/mn10300/kernel/irq.c +++ b/arch/mn10300/kernel/irq.c @@ -320,11 +320,11 @@ void migrate_irqs(void) if (irqd_is_per_cpu(data)) continue; - if (cpumask_test_cpu(self, &data->affinity) && + if (cpumask_test_cpu(self, data->affinity) && !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, data->affinity); } /* We need to operate irq_affinity_online atomically. */ arch_local_cli_save(flags); @@ -335,7 +335,7 @@ void migrate_irqs(void) GxICR(irq) = x & GxICR_LEVEL; tmp = GxICR(irq); - new = cpumask_any_and(&data->affinity, + new = cpumask_any_and(data->affinity, cpu_online_mask); irq_affinity_online[irq] = new; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/