From: David Woodhouse <dwmw2@infradead.org>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: user-mode-linux-devel@lists.sourceforge.net,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnaud Lacombe <lacombar@gmail.com>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: [uml-devel] [PATCH 1/5] um: Use __i386__ in ifdef for vsyscall exports, not SUBARCH_i386
Date: Mon, 01 Aug 2011 00:09:15 +0100 [thread overview]
Message-ID: <1312153757.18010.37.camel@i7.infradead.org> (raw)
In-Reply-To: <20110731224834.GC2203@ZenIV.linux.org.uk>
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
--
dwmw2
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
next prev parent reply other threads:[~2011-07-31 23:09 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1312066693.22074.50.camel@i7.infradead.org>
2011-07-30 23:01 ` [PATCH 2/5] um: Remove gratuitous use of $(SUBARCH) in Makefile-i386 David Woodhouse
2011-07-30 23:02 ` [PATCH 1/5] um: Use __i386__ in ifdef for vsyscall exports, not SUBARCH_i386 David Woodhouse
2011-07-31 22:11 ` richard -rw- weinberger
2011-07-31 22:24 ` David Woodhouse
2011-07-31 22:48 ` Al Viro
2011-07-31 22:58 ` [uml-devel] " Al Viro
2011-07-31 23:13 ` David Woodhouse
2011-07-31 23:17 ` richard -rw- weinberger
2011-07-31 23:24 ` David Woodhouse
2011-08-01 4:32 ` Al Viro
2011-08-01 10:04 ` Geert Uytterhoeven
2011-08-01 10:40 ` richard -rw- weinberger
2011-08-01 17:23 ` Al Viro
2011-08-01 17:52 ` richard -rw- weinberger
2011-08-09 23:38 ` Al Viro
2011-08-10 4:04 ` Al Viro
2011-08-10 17:44 ` Al Viro
2011-08-11 4:23 ` Al Viro
2011-08-11 12:13 ` richard -rw- weinberger
2011-08-11 14:05 ` Al Viro
2011-07-31 23:09 ` David Woodhouse [this message]
2011-07-30 23:02 ` [PATCH 3/5] um: Always use -m32 when building for i386 David Woodhouse
2011-07-30 23:02 ` [PATCH 4/5] um: Do not define SUBARCH in CFLAGS David Woodhouse
2011-07-30 23:04 ` [PATCH 5/5] um: Fix SUBARCH=x86 build David Woodhouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1312153757.18010.37.camel@i7.infradead.org \
--to=dwmw2@infradead.org \
--cc=hpa@zytor.com \
--cc=lacombar@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox