linux-kernel - linux-next: manual merge of the tip tree with the tile tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20120314145214.b41adef6a73ef6bbdc64dd56@canb.auug.org.au>
Date:	Wed, 14 Mar 2012 14:52:14 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Chris Metcalf <cmetcalf@...era.com>,
	"H. J. Lu" <hjl.tools@...il.com>
Subject: linux-next: manual merge of the tip tree with the tile tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/Kconfig between commit ca3a3d347e23 ("ipc: provide generic
compat versions of IPC syscalls") from the tile tree and commits
5fd92e65a68b ("x32: Allow x32 to be configured") and 0bf6276392e9 ("x32:
Warn and disable rather than error if binutils too old") from the tip
tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/x86/Kconfig
index 0ca57e0,21ec4bf..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2174,10 -2195,22 +2194,23 @@@ config IA32_AOU
  	---help---
  	  Support old a.out binaries in the 32bit emulation.
  
+ config X86_X32
+ 	bool "x32 ABI for 64-bit mode (EXPERIMENTAL)"
+ 	depends on X86_64 && IA32_EMULATION && EXPERIMENTAL
+ 	---help---
+ 	  Include code to run binaries for the x32 native 32-bit ABI
+ 	  for 64-bit processors.  An x32 process gets access to the
+ 	  full 64-bit register file and wide data path while leaving
+ 	  pointers at 32 bits for smaller memory footprint.
+ 
+ 	  You will need a recent binutils (2.22 or later) with
+ 	  elf32_x86_64 support enabled to compile a kernel with this
+ 	  option set.
+ 
  config COMPAT
  	def_bool y
- 	depends on IA32_EMULATION
+ 	depends on IA32_EMULATION || X86_X32
 +	select ARCH_WANT_OLD_COMPAT_IPC
  
  config COMPAT_FOR_U64_ALIGNMENT
  	def_bool COMPAT

Content of type "application/pgp-signature" skipped