Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756684AbbGaV7y (ORCPT ); Fri, 31 Jul 2015 17:59:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36534 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756669AbbGaV7s (ORCPT ); Fri, 31 Jul 2015 17:59:48 -0400 Date: Fri, 31 Jul 2015 14:53:38 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: benh@kernel.crashing.org, deller@gmx.de, hpa@zytor.com, bhelgaas@google.com, yinghai@kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de, rdunlap@infradead.org, tony.luck@intel.com, tglx@linutronix.de, jiang.liu@linux.intel.com, jejb@parisc-linux.org, konrad.wilk@oracle.com, mingo@kernel.org Reply-To: tony.luck@intel.com, tglx@linutronix.de, jiang.liu@linux.intel.com, mingo@kernel.org, konrad.wilk@oracle.com, jejb@parisc-linux.org, bhelgaas@google.com, deller@gmx.de, benh@kernel.crashing.org, hpa@zytor.com, bp@alien8.de, linux-kernel@vger.kernel.org, yinghai@kernel.org, rdunlap@infradead.org In-Reply-To: <1433145945-789-24-git-send-email-jiang.liu@linux.intel.com> References: <1433145945-789-24-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] parisc/irq: Use access helper irq_data_get_affinity_mask() Git-Commit-ID: d2109a12198edf22eb85e475c223eea14b9c3fbe 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: 3303 Lines: 91 Commit-ID: d2109a12198edf22eb85e475c223eea14b9c3fbe Gitweb: http://git.kernel.org/tip/d2109a12198edf22eb85e475c223eea14b9c3fbe Author: Jiang Liu AuthorDate: Mon, 1 Jun 2015 16:05:32 +0800 Committer: Thomas Gleixner CommitDate: Fri, 31 Jul 2015 22:20:04 +0200 parisc/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: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: Tony Luck Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: James E.J. Bottomley Cc: Helge Deller Link: http://lkml.kernel.org/r/1433145945-789-24-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/parisc/kernel/irq.c | 12 ++++++------ drivers/parisc/iosapic.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index f3191db..413ec3c 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c @@ -131,7 +131,7 @@ static int cpu_set_affinity_irq(struct irq_data *d, const struct cpumask *dest, if (cpu_dest < 0) return -1; - cpumask_copy(d->affinity, dest); + cpumask_copy(irq_data_get_affinity_mask(d), dest); return 0; } @@ -339,7 +339,7 @@ unsigned long txn_affinity_addr(unsigned int irq, int cpu) { #ifdef CONFIG_SMP struct irq_data *d = irq_get_irq_data(irq); - cpumask_copy(d->affinity, cpumask_of(cpu)); + cpumask_copy(irq_data_get_affinity_mask(d), cpumask_of(cpu)); #endif return per_cpu(cpu_data, cpu).txn_addr; @@ -508,7 +508,7 @@ void do_cpu_irq_mask(struct pt_regs *regs) unsigned long eirr_val; int irq, cpu = smp_processor_id(); #ifdef CONFIG_SMP - struct irq_desc *desc; + struct irq_data *irq_data; cpumask_t dest; #endif @@ -522,9 +522,9 @@ void do_cpu_irq_mask(struct pt_regs *regs) irq = eirr_to_irq(eirr_val); #ifdef CONFIG_SMP - desc = irq_to_desc(irq); - cpumask_copy(&dest, desc->irq_data.affinity); - if (irqd_is_per_cpu(&desc->irq_data) && + irq_data = irq_get_irq_data(irq); + cpumask_copy(&dest, irq_data_get_affinity_mask(irq_data)); + if (irqd_is_per_cpu(irq_data) && !cpumask_test_cpu(smp_processor_id(), &dest)) { int cpu = cpumask_first(&dest); diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c index 9ee04b4..144c77d 100644 --- a/drivers/parisc/iosapic.c +++ b/drivers/parisc/iosapic.c @@ -691,7 +691,7 @@ static int iosapic_set_affinity_irq(struct irq_data *d, if (dest_cpu < 0) return -1; - cpumask_copy(d->affinity, cpumask_of(dest_cpu)); + cpumask_copy(irq_data_get_affinity_mask(d), cpumask_of(dest_cpu)); vi->txn_addr = txn_affinity_addr(d->irq, dest_cpu); spin_lock_irqsave(&iosapic_lock, flags); -- 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/