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

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

[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

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
v3: Suggested by: Maciej W. Rozycki <macro@linux-mips.org>
Implementing the function in apic.h and not in apic.c
(actually, doing v2 properly :) )

v2: Suggested by: Jiang Liu <jiang.liu@linux.intel.com>

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(+)

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 92003f3..efc3b22 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -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);
-- 
2.1.4

Re: [PATCH v3] x86/devicetree: Fix build for amd64

[Maciej W. Rozycki]

On Mon, 2 Feb 2015, Ricardo Ribalda Delgado wrote:

> 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@gmail.com>
> ---
> v3: Suggested by: Maciej W. Rozycki <macro@linux-mips.org>
> Implementing the function in apic.h and not in apic.c
> (actually, doing v2 properly :) )
> 
> v2: Suggested by: Jiang Liu <jiang.liu@linux.intel.com>
> 
> How about defining a version of apic_force_enable()
> 	for X86_64 in apic.h which just return failure?

Reviewed-by: Maciej W. Rozycki <macro@linux-mips.org>

 Thanks,

  Maciej

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

[tip-bot for Ricardo Ribalda Delgado]

Commit-ID:  b273c2c2f2d2d13dc0bfa8923d52fbaf8fa56ae8
Gitweb:     http://git.kernel.org/tip/b273c2c2f2d2d13dc0bfa8923d52fbaf8fa56ae8
Author:     Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
AuthorDate: Mon, 2 Feb 2015 20:27:11 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
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

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Reviewed-by: Maciej W. Rozycki <macro@linux-mips.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Jan Beulich <JBeulich@suse.com>
Link: http://lkml.kernel.org/r/1422905231-16067-1-git-send-email-ricardo.ribalda@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/include/asm/apic.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 92003f3..efc3b22 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -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);