diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 16:26:12 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 16:26:12 +0100 |
commit | 7a9787e1eba95a166265e6a260cf30af04ef0a99 (patch) | |
tree | e730a4565e0318140d2fbd2f0415d18a339d7336 /arch/um/Kconfig.i386 | |
parent | 41b9eb264c8407655db57b60b4457fe1b2ec9977 (diff) | |
parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
download | blackbird-obmc-linux-7a9787e1eba95a166265e6a260cf30af04ef0a99.tar.gz blackbird-obmc-linux-7a9787e1eba95a166265e6a260cf30af04ef0a99.zip |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
Diffstat (limited to 'arch/um/Kconfig.i386')
-rw-r--r-- | arch/um/Kconfig.i386 | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386 deleted file mode 100644 index e09edfa560da..000000000000 --- a/arch/um/Kconfig.i386 +++ /dev/null @@ -1,47 +0,0 @@ -menu "Host processor type and features" - -source "arch/x86/Kconfig.cpu" - -endmenu - -config UML_X86 - bool - default y - -config X86_32 - bool - default y - -config RWSEM_XCHGADD_ALGORITHM - def_bool y - -config 64BIT - bool - default n - -config 3_LEVEL_PGTABLES - bool "Three-level pagetables (EXPERIMENTAL)" - default n - 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 - bool - default y - -config ARCH_REUSE_HOST_VSYSCALL_AREA - bool - default y - -config GENERIC_HWEIGHT - bool - default y - -config ARCH_SUPPORTS_AOUT - def_bool y |