From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752829AbdH2LQT (ORCPT ); Tue, 29 Aug 2017 07:16:19 -0400 Received: from terminus.zytor.com ([65.50.211.136]:56481 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751280AbdH2LQS (ORCPT ); Tue, 29 Aug 2017 07:16:18 -0400 Date: Tue, 29 Aug 2017 04:11:35 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, luto@kernel.org, rostedt@goodmis.org, bp@alien8.de, tglx@linutronix.de, torvalds@linux-foundation.org, hpa@zytor.com Reply-To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, luto@kernel.org, rostedt@goodmis.org, bp@alien8.de, tglx@linutronix.de, torvalds@linux-foundation.org, hpa@zytor.com In-Reply-To: <20170828064957.691909010@linutronix.de> References: <20170828064957.691909010@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irq_work: Make it depend on APIC Git-Commit-ID: a45525b5b47c10c0446eda21227792b39af233dc 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: a45525b5b47c10c0446eda21227792b39af233dc Gitweb: http://git.kernel.org/tip/a45525b5b47c10c0446eda21227792b39af233dc Author: Thomas Gleixner AuthorDate: Mon, 28 Aug 2017 08:47:35 +0200 Committer: Ingo Molnar CommitDate: Tue, 29 Aug 2017 11:42:30 +0200 x86/irq_work: Make it depend on APIC The irq work interrupt vector is only installed when CONFIG_X86_LOCAL_APIC is enabled, but the interrupt handler is compiled in unconditionally. Compile the cruft out when the APIC is disabled. Signed-off-by: Thomas Gleixner Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/20170828064957.691909010@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/include/asm/irq_work.h | 8 ++++++++ arch/x86/kernel/irq_work.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/irq_work.h b/arch/x86/include/asm/irq_work.h index f706041..ddbb8ea 100644 --- a/arch/x86/include/asm/irq_work.h +++ b/arch/x86/include/asm/irq_work.h @@ -3,9 +3,17 @@ #include +#ifdef CONFIG_X86_LOCAL_APIC static inline bool arch_irq_work_has_interrupt(void) { return boot_cpu_has(X86_FEATURE_APIC); } +extern void arch_irq_work_raise(void); +#else +static inline bool arch_irq_work_has_interrupt(void) +{ + return false; +} +#endif #endif /* _ASM_IRQ_WORK_H */ diff --git a/arch/x86/kernel/irq_work.c b/arch/x86/kernel/irq_work.c index 8054cae..70dee05 100644 --- a/arch/x86/kernel/irq_work.c +++ b/arch/x86/kernel/irq_work.c @@ -11,6 +11,7 @@ #include #include +#ifdef CONFIG_X86_LOCAL_APIC __visible void __irq_entry smp_irq_work_interrupt(struct pt_regs *regs) { ipi_entering_ack_irq(); @@ -23,11 +24,10 @@ __visible void __irq_entry smp_irq_work_interrupt(struct pt_regs *regs) void arch_irq_work_raise(void) { -#ifdef CONFIG_X86_LOCAL_APIC if (!arch_irq_work_has_interrupt()) return; apic->send_IPI_self(IRQ_WORK_VECTOR); apic_wait_icr_idle(); -#endif } +#endif