x86, um: merge Kconfig.i386 and Kconfig.x86_64

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 46 insertions, 0 deletions

diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86
new file mode 100644
index 000000000000..76200c9f454a
--- /dev/null
+++ b/arch/um/Kconfig.x86
@@ -0,0 +1,46 @@
+menu "Host processor type and features"
+
+source "arch/x86/Kconfig.cpu"
+
+endmenu
+
+config UML_X86
+        def_bool y
+
+config 64BIT
+        bool
+        default SUBARCH = "x86_64"
+
+config X86_32
+        def_bool !64BIT
+        select HAVE_AOUT
+
+config RWSEM_XCHGADD_ALGORITHM
+        def_bool X86_XADD
+
+config RWSEM_GENERIC_SPINLOCK
+        def_bool !X86_XADD
+
+config 3_LEVEL_PGTABLES
+        bool "Three-level pagetables (EXPERIMENTAL)" if !64BIT
+        default 64BIT
+        depends on EXPERIMENTAL
+        help
+        Three-level pagetables will let UML have more than 4G of physical
+        memory.  All the memory that can't be mapped directly will be treated
+        as high memory.
+
+        However, this it experimental on 32-bit architectures, so if unsure say
+        N (on x86-64 it's automatically enabled, instead, as it's safe there).
+
+config ARCH_HAS_SC_SIGNALS
+        def_bool !64BIT
+
+config ARCH_REUSE_HOST_VSYSCALL_AREA
+        def_bool !64BIT
+
+config SMP_BROKEN
+        def_bool 64BIT
+
+config GENERIC_HWEIGHT
+        def_bool y