From patchwork Sun Jul 31 23:09:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Woodhouse X-Patchwork-Id: 1024812 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6VN9X6O032066 for ; Sun, 31 Jul 2011 23:09:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752854Ab1GaXJX (ORCPT ); Sun, 31 Jul 2011 19:09:23 -0400 Received: from casper.infradead.org ([85.118.1.10]:33920 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752743Ab1GaXJW (ORCPT ); Sun, 31 Jul 2011 19:09:22 -0400 Received: from i7.infradead.org ([2001:8b0:10b:1:225:64ff:fee8:e9df]) by casper.infradead.org with esmtpsa (Exim 4.76 #1 (Red Hat Linux)) id 1Qnf8H-00089X-PH; Sun, 31 Jul 2011 23:09:18 +0000 Subject: Re: [PATCH 1/5] um: Use __i386__ in ifdef for vsyscall exports, not SUBARCH_i386 From: David Woodhouse To: Al Viro Cc: richard -rw- weinberger , Arnaud Lacombe , "H. Peter Anvin" , linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net Date: Mon, 01 Aug 2011 00:09:15 +0100 In-Reply-To: <20110731224834.GC2203@ZenIV.linux.org.uk> References: <1312066693.22074.50.camel@i7.infradead.org> <1312066923.22074.53.camel@i7.infradead.org> <1312151063.18010.25.camel@i7.infradead.org> <20110731224834.GC2203@ZenIV.linux.org.uk> X-Mailer: Evolution 3.0.2 (3.0.2-3.fc15) Message-ID: <1312153757.18010.37.camel@i7.infradead.org> Mime-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 31 Jul 2011 23:09:48 +0000 (UTC) On Sun, 2011-07-31 at 23:48 +0100, Al Viro wrote: > Hell, no. If you want to do it, do it the right way. See #x86_merge in > git://git.kernel.org/pub/scm/linux/kernel/git/viro/um-header.git/ 255 files changed, 6848 insertions(+), 7816 deletions(-) Absolutely, but slightly out of scope for what I was trying to do :) I just posted a *minimal* set of changes to make the UML build system cope; fixing the code as you've done is *definitely* the better option. Is there a reason it didn't go upstream yet? It just wants this, to make the CONFIG_64BIT option visible when SUBARCH=x86 and also put it *first*. diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86 index d31ecf3..630db12 100644 --- a/arch/um/Kconfig.x86 +++ b/arch/um/Kconfig.x86 @@ -1,5 +1,19 @@ mainmenu "User Mode Linux/$SUBARCH $KERNELVERSION Kernel Configuration" +config 64BIT + bool "Build 64-bit kernel" if SUBARCH = "x86" + default SUBARCH != "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 + +config X86_32 + def_bool !64BIT + select HAVE_AOUT + +config X86_64 + def_bool 64BIT + source "arch/um/Kconfig.common" menu "UML-specific options" @@ -18,17 +32,6 @@ config UML_X86 def_bool y select GENERIC_FIND_FIRST_BIT -config 64BIT - bool - default SUBARCH = "x86_64" - -config X86_32 - def_bool !64BIT - select HAVE_AOUT - -config X86_64 - def_bool 64BIT - config RWSEM_XCHGADD_ALGORITHM def_bool X86_XADD && 64BIT