| commit | 9dabb3a0055ed66d84a492b536a35cecf8c5af70 | |
| author | Ben Hutchings <ben@decadent.org.uk> | |
| Sun, 11 Nov 2018 01:02:49 +0000 (11 01:02 +0000) | ||
| committer | Ben Hutchings <ben@decadent.org.uk> | |
| Tue, 20 Nov 2018 18:06:03 +0000 (20 18:06 +0000) | ||
| tree | 70fc2d31c5bf13db9d0a7cc3b7f223fb2ba82bd3 | treesnapshot (tar.gz zip) |
| parent | 16d44afca3872baa1ff5f506afc525c90aa8b798 | commitdiff |
x86/apic: Fix build failure with X86_IO_APIC disabled
My backport of commit 2e63ad4bd5dd "x86/apic: Do not init irq
remapping if ioapic is disabled" added an unconditional use of
skip_ioapic_setup. Enabling X86_LOCAL_APIC but not X86_IO_APIC
results in a build failure.
This configuration was made impossible by commit b1da1e715d4f
"x86/Kconfig: Simplify X86_IO_APIC dependencies", but that seems to
depend on additional changes that aren't suitable for stable.
The function that was changed, enable_IR_x2apic(), is only used in
64-bit configurations where CONFIG_X86_IO_APIC is always enabled. So
extend the #ifdef CONFIG_X86_64 section to include this function.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
My backport of commit 2e63ad4bd5dd "x86/apic: Do not init irq
remapping if ioapic is disabled" added an unconditional use of
skip_ioapic_setup. Enabling X86_LOCAL_APIC but not X86_IO_APIC
results in a build failure.
This configuration was made impossible by commit b1da1e715d4f
"x86/Kconfig: Simplify X86_IO_APIC dependencies", but that seems to
depend on additional changes that aren't suitable for stable.
The function that was changed, enable_IR_x2apic(), is only used in
64-bit configurations where CONFIG_X86_IO_APIC is always enabled. So
extend the #ifdef CONFIG_X86_64 section to include this function.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| arch/x86/kernel/apic/apic.c | diffblobblamehistory |