Messages in this thread Patch in this message | | | Date | Tue, 5 May 2015 05:03:41 -0700 | From | tip-bot for Jan Kiszka <> | Subject | [tip:x86/apic] x86/x2apic: Acpi_gbl_FADT existence depends on CONFIG_ACPI |
| |
Commit-ID: 781674fc33adf0d975a361e111bb45804356aa23 Gitweb: http://git.kernel.org/tip/781674fc33adf0d975a361e111bb45804356aa23 Author: Jan Kiszka <jan.kiszka@siemens.com> AuthorDate: Mon, 4 May 2015 17:58:00 +0200 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Tue, 5 May 2015 14:01:37 +0200
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> --- arch/x86/kernel/apic/x2apic_phys.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c index 6fae733..3ffd925 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); static bool x2apic_fadt_phys(void) { +#ifdef CONFIG_ACPI if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) && (acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL)) { printk(KERN_DEBUG "System requires x2apic physical mode\n"); return true; } +#endif return false; }
| |