[PATCH] Don't override CONFIG_64BIT for ARCH={i386,x86_64} builds

[David Woodhouse]

It is a steaming great pain in the arse when the value of CONFIG_64BIT
explicitly written in my .config file is overridden by the value of
$ARCH inferred from the environment.

If I have a 32-bit .config and I happen to build it without remembering
to put 'ARCH=i386' on the make command line, it shouldn't force
CONFIG_64BIT=y and reconfigure.

This patch should fix that, while still allowing defconfig to work as it
currently does for both 32-bit and 64-bit environments, and still giving
the default value of CONFIG_64BIT according to $ARCH. It's just that it
won't _force_ a change to CONFIG_64BIT when it's set to something other
than what $ARCH would imply.

Signed-off-by: David Woodhouse <David.Woodhouse@xxxxxxxxx>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 73f7fe8..516046d 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -3,7 +3,7 @@ mainmenu "Linux Kernel Configuration for x86"
 
 # Select 32 or 64 bit
 config 64BIT
-	bool "64-bit kernel" if ARCH = "x86"
+	bool "64-bit kernel"
 	default ARCH = "x86_64"
 	help
 	  Say yes to build a 64-bit kernel - formerly known as x86_64

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@xxxxxxxxx                              Intel Corporation

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/