Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754512AbbETPYJ (ORCPT ); Wed, 20 May 2015 11:24:09 -0400 Received: from www.linutronix.de ([62.245.132.108]:33509 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753017AbbETPYD (ORCPT ); Wed, 20 May 2015 11:24:03 -0400 Date: Wed, 20 May 2015 17:23:44 +0200 (CEST) From: Thomas Gleixner To: Jiang Liu cc: Bjorn Helgaas , Benjamin Herrenschmidt , Ingo Molnar , "H. Peter Anvin" , "Rafael J. Wysocki" , Randy Dunlap , Yinghai Lu , Borislav Petkov , Konrad Rzeszutek Wilk , Tony Luck , x86@kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org Subject: Re: [RFC v1 13/25] genirq: Kill the parameter 'irq' of kstat_incr_irqs_this_cpu() In-Reply-To: <1432116013-25902-14-git-send-email-jiang.liu@linux.intel.com> Message-ID: References: <1432116013-25902-1-git-send-email-jiang.liu@linux.intel.com> <1432116013-25902-14-git-send-email-jiang.liu@linux.intel.com> User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 911 Lines: 25 On Wed, 20 May 2015, Jiang Liu wrote: > diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h > index d82a77d39aeb..ab675f282291 100644 > --- a/kernel/irq/internals.h > +++ b/kernel/irq/internals.h > @@ -193,7 +193,7 @@ static inline bool irqd_has_set(struct irq_data *d, unsigned int mask) > return __irqd_to_state(d) & mask; > } > > -static inline void kstat_incr_irqs_this_cpu(unsigned int irq, struct irq_desc *desc) > +static inline void kstat_incr_irqs_this_cpu(struct irq_desc *desc) > { > __this_cpu_inc(*desc->kstat_irqs); > __this_cpu_inc(kstat.irqs_sum); That hunk does not apply. Neither on mainline nor on tip/x86/apic Thanks, tglx -- 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/