diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2015-05-04 11:58:00 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-05-05 08:01:37 -0400 |
commit | 781674fc33adf0d975a361e111bb45804356aa23 (patch) | |
tree | a33a652c0e2a7dc7a233a734107ae66a8d0a4dd8 | |
parent | eb18cf55c299d2ac5c8b5421c58b6c582a044475 (diff) |
x86/x2apic: Acpi_gbl_FADT existence depends on CONFIG_ACPI
If ACPI is disabled, acpi_gbl_FADT is not available, and and the build
breaks.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Link: http://lkml.kernel.org/r/55479708.2000104@siemens.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/kernel/apic/x2apic_phys.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c index 6fae733e9194..3ffd925655e0 100644 --- a/arch/x86/kernel/apic/x2apic_phys.c +++ b/arch/x86/kernel/apic/x2apic_phys.c | |||
@@ -21,11 +21,13 @@ early_param("x2apic_phys", set_x2apic_phys_mode); | |||
21 | 21 | ||
22 | static bool x2apic_fadt_phys(void) | 22 | static bool x2apic_fadt_phys(void) |
23 | { | 23 | { |
24 | #ifdef CONFIG_ACPI | ||
24 | if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) && | 25 | if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) && |
25 | (acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL)) { | 26 | (acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL)) { |
26 | printk(KERN_DEBUG "System requires x2apic physical mode\n"); | 27 | printk(KERN_DEBUG "System requires x2apic physical mode\n"); |
27 | return true; | 28 | return true; |
28 | } | 29 | } |
30 | #endif | ||
29 | return false; | 31 | return false; |
30 | } | 32 | } |
31 | 33 | ||