Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031016AbbEEItw (ORCPT ); Tue, 5 May 2015 04:49:52 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48100 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030979AbbEEItm (ORCPT ); Tue, 5 May 2015 04:49:42 -0400 Date: Tue, 5 May 2015 01:49:24 -0700 From: tip-bot for Nicholas Mc Guire Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, hofrat@osadl.org, hpa@zytor.com Reply-To: hpa@zytor.com, hofrat@osadl.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <1430642951-23964-1-git-send-email-hofrat@osadl.org> References: <1430642951-23964-1-git-send-email-hofrat@osadl.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] genirq: Fix type inconsistency Git-Commit-ID: 7df0b278385df3c8d0606c620e6ab1e9eea3d9cd 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: 1339 Lines: 37 Commit-ID: 7df0b278385df3c8d0606c620e6ab1e9eea3d9cd Gitweb: http://git.kernel.org/tip/7df0b278385df3c8d0606c620e6ab1e9eea3d9cd Author: Nicholas Mc Guire AuthorDate: Sun, 3 May 2015 10:49:11 +0200 Committer: Thomas Gleixner CommitDate: Tue, 5 May 2015 10:45:58 +0200 genirq: Fix type inconsistency The return type of kstat_irqs_usr() is unsigned int and kstat_irqs() also returns unsigned int so sum should be unsigned int here as well. Signed-off-by: Nicholas Mc Guire Link: http://lkml.kernel.org/r/1430642951-23964-1-git-send-email-hofrat@osadl.org Signed-off-by: Thomas Gleixner --- kernel/irq/irqdesc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 8228f73..73a76e2 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -639,7 +639,7 @@ unsigned int kstat_irqs(unsigned int irq) */ unsigned int kstat_irqs_usr(unsigned int irq) { - int sum; + unsigned int sum; irq_lock_sparse(); sum = kstat_irqs(irq); -- 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/