Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753393AbcCLPKi (ORCPT ); Sat, 12 Mar 2016 10:10:38 -0500 Received: from mail-pa0-f66.google.com ([209.85.220.66]:33600 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752587AbcCLPK0 (ORCPT ); Sat, 12 Mar 2016 10:10:26 -0500 From: Jianyu Zhan To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, Aravind.Gopalakrishnan@amd.com, brgerst@gmail.com, bp@suse.de, feng.wu@intel.com, jiang.liu@linux.intel.com, nasa4836@gmail.com, tj@kernel.org, dvlasenk@redhat.com, penberg@cs.helsinki.fi, yhlu.kernel@gmail.com, andi@firstfloor.org, luto@kernel.org, ajm@sgi.com, yinghai@kernel.org, akinobu.mita@gmail.com Cc: x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] x86/irq: update first_system_vector only when X86_LOCAL_PIC is on Date: Sat, 12 Mar 2016 23:10:19 +0800 Message-Id: X-Mailer: git-send-email 2.4.3 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1366 Lines: 41 During native_init_IRQ(), we will update first_system_vector conditionally when we init system vector. But on !CONFIG_X86_LOCAL_PIC, we prefer it to NR_IRQS, so don't bother set it on this case. Signed-off-by: Jianyu Zhan --- arch/x86/include/asm/desc.h | 2 ++ arch/x86/kernel/irqinit.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h index 4e10d73..4fc2deb 100644 --- a/arch/x86/include/asm/desc.h +++ b/arch/x86/include/asm/desc.h @@ -383,8 +383,10 @@ static inline void alloc_system_vector(int vector) { if (!test_bit(vector, used_vectors)) { set_bit(vector, used_vectors); +#ifdef CONFIG_X86_LOCAL_APIC if (first_system_vector > vector) first_system_vector = vector; +#endif } else { BUG(); } diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 0e9fa7c..e999b38 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -188,9 +188,6 @@ void __init native_init_IRQ(void) * 'special' SMP interrupts) */ i = FIRST_EXTERNAL_VECTOR; -#ifndef CONFIG_X86_LOCAL_APIC -#define first_system_vector NR_VECTORS -#endif for_each_clear_bit_from(i, used_vectors, first_system_vector) { /* IA32_SYSCALL_VECTOR could be used in trap_init already. */ set_intr_gate(i, irq_entries_start + -- 2.4.3