From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755447AbbJAJNP (ORCPT ); Thu, 1 Oct 2015 05:13:15 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45992 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751743AbbJAJNI (ORCPT ); Thu, 1 Oct 2015 05:13:08 -0400 Date: Thu, 1 Oct 2015 02:12:42 -0700 From: tip-bot for Geliang Tang Message-ID: Cc: brgerst@gmail.com, hpa@zytor.com, luto@kernel.org, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, geliangtang@163.com Reply-To: brgerst@gmail.com, hpa@zytor.com, tglx@linutronix.de, luto@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, geliangtang@163.com In-Reply-To: <03d18502ed7ed417f136c091f417d2d88c147ec6.1443667610.git.geliangtang@163.com> References: <03d18502ed7ed417f136c091f417d2d88c147ec6.1443667610.git.geliangtang@163.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irq: Drop unlikely before IS_ERR_OR_NULL Git-Commit-ID: a7e705af524d165fe7bc303aee82225c66734885 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 Commit-ID: a7e705af524d165fe7bc303aee82225c66734885 Gitweb: http://git.kernel.org/tip/a7e705af524d165fe7bc303aee82225c66734885 Author: Geliang Tang AuthorDate: Thu, 1 Oct 2015 10:55:29 +0800 Committer: Thomas Gleixner CommitDate: Thu, 1 Oct 2015 11:08:56 +0200 x86/irq: Drop unlikely before IS_ERR_OR_NULL IS_ERR_OR_NULL already contain an unlikely compiler flag. Drop it. Signed-off-by: Geliang Tang Cc: Brian Gerst Cc: Andy Lutomirski Link: http://lkml.kernel.org/r/03d18502ed7ed417f136c091f417d2d88c147ec6.1443667610.git.geliangtang@163.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/irq_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c index c767cf2..206d0b9 100644 --- a/arch/x86/kernel/irq_64.c +++ b/arch/x86/kernel/irq_64.c @@ -72,7 +72,7 @@ bool handle_irq(struct irq_desc *desc, struct pt_regs *regs) { stack_overflow_check(regs); - if (unlikely(IS_ERR_OR_NULL(desc))) + if (IS_ERR_OR_NULL(desc)) return false; generic_handle_irq_desc(desc);