From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: "Maciej W . Rozycki" <macro@linux-mips.org>,
Jiang Liu <jiang.liu@linux.intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, David Rientjes <rientjes@google.com>,
Oren Twaig <oren@scalemp.com>, Jan Beulich <JBeulich@suse.com>,
Christoph Lameter <cl@linux.com>,
Jan Kiszka <jan.kiszka@siemens.com>,
linux-kernel@vger.kernel.org,
David Vrabel <david.vrabel@citrix.com>,
Rob Herring <robh@kernel.org>
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Subject: [PATCH v3] x86/devicetree: Fix build for amd64
Date: Mon, 2 Feb 2015 20:27:11 +0100 [thread overview]
Message-ID: <1422905231-16067-1-git-send-email-ricardo.ribalda@gmail.com> (raw)
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
next reply other threads:[~2015-02-02 19:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-02 19:27 Ricardo Ribalda Delgado [this message]
2015-02-03 11:45 ` Maciej W. Rozycki
2015-02-19 0:27 ` [tip:x86/urgent] x86/apic: Fix the devicetree build in certain configs tip-bot for Ricardo Ribalda Delgado
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422905231-16067-1-git-send-email-ricardo.ribalda@gmail.com \
--to=ricardo.ribalda@gmail.com \
--cc=JBeulich@suse.com \
--cc=cl@linux.com \
--cc=david.vrabel@citrix.com \
--cc=hpa@zytor.com \
--cc=jan.kiszka@siemens.com \
--cc=jiang.liu@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=macro@linux-mips.org \
--cc=mingo@redhat.com \
--cc=oren@scalemp.com \
--cc=rientjes@google.com \
--cc=robh@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®