[PATCH v2] x86/devicetree: Fix build for amd64

From: Ricardo Ribalda Delgado
Date: Mon Feb 02 2015 - 11:30:13 EST


apic_force_enable is not defined for amd64.

Without this patch:

LD init/built-in.o
arch/x86/built-in.o: In function `dtb_lapic_setup':
kernel/devicetree.c:155:
undefined reference to `apic_force_enable'
Makefile:923: recipe for target 'vmlinux' failed
make: *** [vmlinux] Error 1

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@xxxxxxxxx>
---

v2: Suggested by: Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx>

How about defining a version of apic_force_enable()
for X86_64 in apic.h which just return failure?

arch/x86/kernel/apic/apic.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 29b5b18..8d5a320 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1679,6 +1679,12 @@ static int __init detect_init_APIC(void)
mp_lapic_addr = APIC_DEFAULT_PHYS_BASE;
return 0;
}
+
+int __init apic_force_enable(unsigned long addr)
+{
+ return -1;
+}
+
#else

static int __init apic_verify(void)
--
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/