diff mbox

[7/7] powerpc/64: allow CONFIG_RELOCATABLE if COMPILE_TEST

Message ID 20161019031600.17933-8-npiggin@gmail.com (mailing list archive)
State Accepted
Commit 084a275e4c9477c432b05e872c3a297eab41638a
Headers show

Commit Message

Nicholas Piggin Oct. 19, 2016, 3:16 a.m. UTC 
This is cruft to work around allmodconfig build breakage.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Ellerman May 3, 2017, 10:18 p.m. UTC | #1 
On Wed, 2016-10-19 at 03:16:00 UTC, Nicholas Piggin wrote:
> This is cruft to work around allmodconfig build breakage.
> 
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/084a275e4c9477c432b05e872c3a29

cheers
diff mbox

Patch

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 00d9e31..f48d2eb 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -458,7 +458,7 @@  config KEXEC
 
 config RELOCATABLE
 	bool "Build a relocatable kernel"
-	depends on (PPC64 && !COMPILE_TEST) || (FLATMEM && (44x || FSL_BOOKE))
+	depends on PPC64 || (FLATMEM && (44x || FSL_BOOKE))
 	select NONSTATIC_KERNEL
 	help
 	  This builds a kernel image that is capable of running at the
@@ -482,7 +482,7 @@  config RELOCATABLE
 config CRASH_DUMP
 	bool "Build a kdump crash kernel"
 	depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
-	select RELOCATABLE if (PPC64 && !COMPILE_TEST) || 44x || FSL_BOOKE
+	select RELOCATABLE if PPC64 || 44x || FSL_BOOKE
 	help
 	  Build a kernel suitable for use as a kdump capture kernel.
 	  The same kernel binary can be used as production kernel and dump