Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755106AbdDNUsJ (ORCPT ); Fri, 14 Apr 2017 16:48:09 -0400 Received: from terminus.zytor.com ([65.50.211.136]:48075 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751492AbdDNUsI (ORCPT ); Fri, 14 Apr 2017 16:48:08 -0400 Date: Fri, 14 Apr 2017 13:46:58 -0700 From: tip-bot for Dou Liyang Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, douly.fnst@cn.fujitsu.com, hpa@zytor.com Reply-To: linux-kernel@vger.kernel.org, hpa@zytor.com, douly.fnst@cn.fujitsu.com, tglx@linutronix.de, mingo@kernel.org In-Reply-To: <1491811500-30307-1-git-send-email-douly.fnst@cn.fujitsu.com> References: <1491811500-30307-1-git-send-email-douly.fnst@cn.fujitsu.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cleanups] x86/irq: Remove a redundant #ifdef directive Git-Commit-ID: 0ccecd95e797f0c383a43278fcca74d47cd8a785 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: 1232 Lines: 38 Commit-ID: 0ccecd95e797f0c383a43278fcca74d47cd8a785 Gitweb: http://git.kernel.org/tip/0ccecd95e797f0c383a43278fcca74d47cd8a785 Author: Dou Liyang AuthorDate: Mon, 10 Apr 2017 16:05:00 +0800 Committer: Thomas Gleixner CommitDate: Fri, 14 Apr 2017 22:43:01 +0200 x86/irq: Remove a redundant #ifdef directive The call to irq_ctx_init() is wrapped in #ifdef CONFIG_X86_32. The declaration of irq_ctx_init in irq.h provides already a stub inline for the X86_32=n case. Remove the redundant #ifdef in the code. [ tglx: Massaged changelog ] Signed-off-by: Dou Liyang Link: http://lkml.kernel.org/r/1491811500-30307-1-git-send-email-douly.fnst@cn.fujitsu.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/irqinit.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 1423ab1..7468c69 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -195,7 +195,5 @@ void __init native_init_IRQ(void) if (!acpi_ioapic && !of_ioapic && nr_legacy_irqs()) setup_irq(2, &irq2); -#ifdef CONFIG_X86_32 irq_ctx_init(smp_processor_id()); -#endif }