From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754223AbeBNFrP (ORCPT ); Wed, 14 Feb 2018 00:47:15 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:44904 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753798AbeBNFrN (ORCPT ); Wed, 14 Feb 2018 00:47:13 -0500 From: Baoquan He To: linux-kernel@vger.kernel.org, ebiederm@xmission.com Cc: mingo@kernel.org, tglx@linutronix.de, x86@kernel.org, douly.fnst@cn.fujitsu.com, joro@8bytes.org, uobergfe@redhat.com, prarit@redhat.com, Baoquan He Subject: [PATCH v5 1/6] x86/apic: Split out restore_boot_irq_mode from disable_IO_APIC Date: Wed, 14 Feb 2018 13:46:51 +0800 Message-Id: <20180214054656.3780-2-bhe@redhat.com> In-Reply-To: <20180214054656.3780-1-bhe@redhat.com> References: <20180214054656.3780-1-bhe@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a preparation patch. Split out the code which restores boot irq mode from disable_IO_APIC() and wrap into a new function restore_boot_irq_mode(). No functional change. Signed-off-by: Baoquan He --- arch/x86/include/asm/io_apic.h | 1 + arch/x86/kernel/apic/io_apic.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index a8834dd546cd..558d1a6a13ad 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h @@ -193,6 +193,7 @@ static inline unsigned int io_apic_read(unsigned int apic, unsigned int reg) extern void setup_IO_APIC(void); extern void enable_IO_APIC(void); extern void disable_IO_APIC(void); +extern void restore_boot_irq_mode(void); extern int IO_APIC_get_PCI_irq_vector(int bus, int devfn, int pin); extern void print_IO_APICs(void); #else /* !CONFIG_X86_IO_APIC */ diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 8ad2e410974f..7b73b6b9b4b6 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1448,6 +1448,11 @@ void disable_IO_APIC(void) */ clear_IO_APIC(); + restore_boot_irq_mode(); +} + +void restore_boot_irq_mode(void) +{ if (!nr_legacy_irqs()) return; -- 2.13.6