From: Thomas Gleixner <tglx@linutronix.de>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
broonie@kernel.org, mhocko@suse.cz,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, LKML <linux-kernel@vger.kernel.org>,
mm-commits@vger.kernel.org,
Ravikiran Thirumalai <kiran@scalemp.com>,
Shai Fultheim <shai@scalemp.com>, X86 ML <x86@kernel.org>
Subject: [PATCH] x86/build: Build VSMP support only if selected
Date: Thu, 1 Nov 2018 10:36:51 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.21.1811011032190.1642@nanos.tec.linutronix.de> (raw)
In-Reply-To: <9e14d183-55a4-8299-7a18-0404e50bf004@infradead.org>
VSMP support is built even if CONFIG_X86_VSMP is not set. This leads to a build
breakage when CONFIG_PCI is disabled as well.
Build VSMP code only when selected.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index ae13bc974416..b6b911c4c7f3 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -33,7 +33,7 @@
extern u64 relocated_ramdisk;
/* Interrupt control for vSMPowered x86_64 systems */
-#ifdef CONFIG_X86_64
+#if defined(CONFIG_X86_64) && defined(CONFIG_X86_VSMP)
void vsmp_init(void);
#else
static inline void vsmp_init(void) { }
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 8824d01c0c35..647ce52b17d5 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -148,5 +148,5 @@ ifeq ($(CONFIG_X86_64),y)
obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o
obj-$(CONFIG_MMCONF_FAM10H) += mmconf-fam10h_64.o
- obj-y += vsmp_64.o
+ obj-$(CONFIG_X86_VSMP) += vsmp_64.o
endif
next prev parent reply other threads:[~2018-11-01 9:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-30 23:09 mmotm 2018-10-30-16-08 uploaded akpm
2018-10-31 3:20 ` mmotm 2018-10-30-16-08 uploaded (arch/x86/kernel/vsmp_64.c) Randy Dunlap
2018-11-01 9:36 ` Thomas Gleixner [this message]
2018-11-01 10:39 ` [PATCH] x86/build: Build VSMP support only if selected Shai Fultheim (Shai@ScaleMP.com)
2018-11-01 13:10 ` Eial Czerwacki
2018-11-01 13:17 ` Thomas Gleixner
2018-11-01 13:45 ` Juergen Gross
2018-11-01 15:09 ` Eial Czerwacki
2018-11-01 15:39 ` Juergen Gross
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=alpine.DEB.2.21.1811011032190.1642@nanos.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=kiran@scalemp.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=mm-commits@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=shai@scalemp.com \
--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;
as well as URLs for NNTP newsgroup(s).