diff options
Diffstat (limited to 'arch/i386/Kconfig')
-rw-r--r-- | arch/i386/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 9b6cddc8c51b..758044f5e718 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
@@ -493,7 +493,7 @@ config HIGHMEM64G | |||
493 | endchoice | 493 | endchoice |
494 | 494 | ||
495 | choice | 495 | choice |
496 | depends on EXPERIMENTAL && !X86_PAE | 496 | depends on EXPERIMENTAL |
497 | prompt "Memory split" if EMBEDDED | 497 | prompt "Memory split" if EMBEDDED |
498 | default VMSPLIT_3G | 498 | default VMSPLIT_3G |
499 | help | 499 | help |
@@ -515,6 +515,7 @@ choice | |||
515 | config VMSPLIT_3G | 515 | config VMSPLIT_3G |
516 | bool "3G/1G user/kernel split" | 516 | bool "3G/1G user/kernel split" |
517 | config VMSPLIT_3G_OPT | 517 | config VMSPLIT_3G_OPT |
518 | depends on !HIGHMEM | ||
518 | bool "3G/1G user/kernel split (for full 1G low memory)" | 519 | bool "3G/1G user/kernel split (for full 1G low memory)" |
519 | config VMSPLIT_2G | 520 | config VMSPLIT_2G |
520 | bool "2G/2G user/kernel split" | 521 | bool "2G/2G user/kernel split" |
@@ -799,6 +800,7 @@ config HOTPLUG_CPU | |||
799 | config COMPAT_VDSO | 800 | config COMPAT_VDSO |
800 | bool "Compat VDSO support" | 801 | bool "Compat VDSO support" |
801 | default y | 802 | default y |
803 | depends on !PARAVIRT | ||
802 | help | 804 | help |
803 | Map the VDSO to the predictable old-style address too. | 805 | Map the VDSO to the predictable old-style address too. |
804 | ---help--- | 806 | ---help--- |