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 -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
