Skip to contentSkip to conversation

x86/devicetree: Fix build for amd64

PATCH In review Ricardo Ribalda Delgado 3 participants 3 messages Feb 2, 2015 – Feb 19, 2015 x86

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 x86/devicetree: Fix build for amd64

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

---
v3: Suggested by: Maciej W. Rozycki <[email protected]> Implementing the function in apic.h and not in apic.c (actually, doing v2 properly :) )

v2: Suggested by: Jiang Liu <[email protected]>

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

 arch/x86/include/asm/apic.h | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/x86/include/asm/apic.h +8 -0
index 92003f3..efc3b22 100644
@@ -213,7 +213,15 @@ void register_lapic_address(unsigned long address);
 extern void setup_boot_APIC_clock(void);
 extern void setup_secondary_APIC_clock(void);
 extern int APIC_init_uniprocessor(void);
+
+#ifdef CONFIG_X86_64
+static inline int apic_force_enable(unsigned long addr)
+{
+	return -1;
+}
+#else
 extern int apic_force_enable(unsigned long addr);
+#endif
 
 extern int apic_bsp_setup(bool upmode);
 extern void apic_ap_setup(void);
Signature · 1 line
2.1.4
Reviewed-by on v3 1/1
#1 lore raw
Quoted 17 lines · Ricardo Ribalda Delgado

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

---
v3: Suggested by: Maciej W. Rozycki <[email protected]> Implementing the function in apic.h and not in apic.c (actually, doing v2 properly :) )

Quoted 4 lines

v2: Suggested by: Jiang Liu <[email protected]>

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

Thanks,

Maciej

#2 lore raw

[tip:x86/urgent] x86/apic: Fix the devicetree build in certain configs

In reply to Ricardo Ribalda Delgado
x86/apic: Fix the devicetree build in certain configs
Commit-ID:  b273c2c2f2d2d13dc0bfa8923d52fbaf8fa56ae8
Gitweb:     http://git.kernel.org/tip/b273c2c2f2d2d13dc0bfa8923d52fbaf8fa56ae8
Author:     Ricardo Ribalda Delgado <[email protected]>
AuthorDate: Mon, 2 Feb 2015 20:27:11 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 18 Feb 2015 22:30:19 +0100

x86/apic: Fix the devicetree build in certain configs

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

---
 arch/x86/include/asm/apic.h | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/x86/include/asm/apic.h +8 -0
index 92003f3..efc3b22 100644
@@ -213,7 +213,15 @@ void register_lapic_address(unsigned long address);
 extern void setup_boot_APIC_clock(void);
 extern void setup_secondary_APIC_clock(void);
 extern int APIC_init_uniprocessor(void);
+
+#ifdef CONFIG_X86_64
+static inline int apic_force_enable(unsigned long addr)
+{
+	return -1;
+}
+#else
 extern int apic_force_enable(unsigned long addr);
+#endif
 
 extern int apic_bsp_setup(bool upmode);
 extern void apic_ap_setup(void);