Skip to contentSkip to conversation

x86/build changes for v3.9

GIT PULL Ingo Molnar 1 participant 1 message Feb 19, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-build-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-build-for-linus

HEAD: 63a3f603413ffe82ad775f2d62a5afff87fd94a0 timeconst.pl: Eliminate Perl warning

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.)

out-of-topic modifications in x86-build-for-linus:
--------------------------------------------------
Makefile # ffee0de: x86: Default to ARCH=x86 to avoid
kernel/timeconst.pl # 63a3f60: timeconst.pl: Eliminate Perl warn

Thanks,

Ingo

------------------>
David Woodhouse (1):
x86: Default to ARCH=x86 to avoid overriding CONFIG_64BIT

H. Peter Anvin (1):
timeconst.pl: Eliminate Perl warning

 Makefile                        | 3 ++-
 arch/x86/Kconfig                | 2 +-
 arch/x86/Makefile               | 4 ++++
 arch/x86/configs/i386_defconfig | 1 +
 kernel/timeconst.pl             | 6 ++----
 5 files changed, 10 insertions(+), 6 deletions(-)
Makefile +2 -1
index 540f7b2..9a07340 100644
@@ -165,7 +165,8 @@ export srctree objtree VPATH
 # then ARCH is assigned, getting whatever value it gets normally, and 
 # SUBARCH is subsequently ignored.
 
-SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+				  -e s/sun4u/sparc64/ \
 				  -e s/arm.*/arm/ -e s/sa110/arm/ \
 				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
 				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
arch/x86/Kconfig +1 -1
index 46c3bff..9084c7b 100644
@@ -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
arch/x86/Makefile +4 -0
index 05afcca..fa981ca 100644
@@ -2,7 +2,11 @@
 
 # select defconfig based on actual architecture
 ifeq ($(ARCH),x86)
+  ifeq ($(shell uname -m),x86_64)
+        KBUILD_DEFCONFIG := x86_64_defconfig
+  else
         KBUILD_DEFCONFIG := i386_defconfig
+  endif
 else
         KBUILD_DEFCONFIG := $(ARCH)_defconfig
 endif
arch/x86/configs/i386_defconfig +1 -0
index 5598547..9444708 100644
@@ -1,3 +1,4 @@
+# CONFIG_64BIT is not set
 CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
kernel/timeconst.pl +2 -4
index eb51d76..3f42652 100644
@@ -369,10 +369,8 @@ if ($hz eq '--can') {
 		die "Usage: $0 HZ\n";
 	}
 
-	@val = @{$canned_values{$hz}};
-	if (!defined(@val)) {
-		@val = compute_values($hz);
-	}
+	$cv = $canned_values{$hz};
+	@val = defined($cv) ? @$cv : compute_values($hz);
 	output($hz, @val);
 }
 exit 0;