From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Mon, 4 May 2015 15:58:00 +0000 (+0200)
Subject: x86/x2apic: Acpi_gbl_FADT existence depends on CONFIG_ACPI
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=781674fc33adf0d975a361e111bb45804356aa23;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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);
 
 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;
 }