diff options
author | 2013-02-19 19:12:03 -0800 | |
---|---|---|
committer | 2013-02-19 19:12:03 -0800 | |
commit | 121027a7a64a12e9e5c0289f12473ff11678a812 (patch) | |
tree | 741dd57ee06d9607d9126a7ae9014cd087e54d32 /arch/x86/Kconfig | |
parent | Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | timeconst.pl: Eliminate Perl warning (diff) | |
download | linux-121027a7a64a12e9e5c0289f12473ff11678a812.tar.gz linux-121027a7a64a12e9e5c0289f12473ff11678a812.tar.bz2 linux-121027a7a64a12e9e5c0289f12473ff11678a812.zip |
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull two x86 kernel build changes from Ingo Molnar:
"The first change modifies how 'make oldconfig' works on cross-bitness
situations on x86. It was felt the new behavior of preserving the
bitness of the .config is more logical. This is a leftover of the
merge.
The second change eliminates a Perl warning. (There's another, more
complete fix resulting of this warning fix, which second fix in flight
to you via the kbuild tree, which will remove the timeconst.pl script
altogether.)"
* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timeconst.pl: Eliminate Perl warning
x86: Default to ARCH=x86 to avoid overriding CONFIG_64BIT
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a9e50ac90838..5e05ee3a9810 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1,7 +1,7 @@ # Select 32 or 64 bit config 64BIT bool "64-bit kernel" if ARCH = "x86" - default ARCH = "x86_64" + default ARCH != "i386" ---help--- Say yes to build a 64-bit kernel - formerly known as x86_64 Say no to build a 32-bit kernel - formerly known as i386 |