Commit 121027a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5abcd76f 63a3f603

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line 
# 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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line 
# CONFIG_64BIT is not set

CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

kernel/timeconst.pl

+2 −4
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE