summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2017-11-02 23:22:31 +0100
committerWilly Tarreau <w@1wt.eu>2017-11-02 23:39:31 +0100
commit68cbe93962196f08a1a52e81dc6d5bedaca09b06 (patch)
treea33b5dcbfcac182f2d344e4cb5d49709b83323d5 /include
parent541cbdc60ac9ca34b21db8e6e57e4d58eee66bc8 (diff)
downloadlinux-68cbe93962196f08a1a52e81dc6d5bedaca09b06.tar.gz
linux-68cbe93962196f08a1a52e81dc6d5bedaca09b06.tar.bz2
linux-68cbe93962196f08a1a52e81dc6d5bedaca09b06.zip
x86/apic: fix build breakage caused by incomplete backport to 3.10
Commit 928a277 ("x86/apic: Do not init irq remapping if ioapic is disabled") introduced in 3.10.105 introduced an implicit dependency of CONFIG_X86_LOCAL_APIC to CONFIG_X86_IO_APIC which was later solved as part of simplifications on the config dependencies in more recent kernels. This dependency results in build failure when CONFIG_X86_LOCAL_APIC is set without CONFIG_X86_IO_APIC (this setup requires CONFIG_SMP=n). The reason is that skip_ioapic_setup is declared in apic.c and that the backported code was picked from a context where the #ifdef surrounding the function used to cover this condition. Let's just add the appropriate #ifdef to fix the 3.10 backport. Thanks to Christoph Biedl for reporting and diagnosing this one. Reported-by: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de> Cc: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de> Cc: Jan Beulich <JBeulich@suse.com> Cc: Wanpeng Li <wanpeng.li@hotmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions