From 21ab7c6ef8d1509f2661585c19c19b1bbfd96559 Mon Sep 17 00:00:00 2001 From: Bill Irwin Date: Wed, 2 May 2007 19:27:22 +0200 Subject: [PATCH] --- yaml --- r: 53948 b: refs/heads/master c: 6c2af35820f100bde7b9de8a00a76faa7af6bede h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/Kconfig | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab2bb7a387b7..77a01c0ec0dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b466004a660c490f3bfb12be8b5ca18bfc393261 +refs/heads/master: 6c2af35820f100bde7b9de8a00a76faa7af6bede diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index 1a94a73fe801..c6f8d6856c4d 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -571,6 +571,9 @@ choice bool "3G/1G user/kernel split (for full 1G low memory)" config VMSPLIT_2G bool "2G/2G user/kernel split" + config VMSPLIT_2G_OPT + depends on !HIGHMEM + bool "2G/2G user/kernel split (for full 2G low memory)" config VMSPLIT_1G bool "1G/3G user/kernel split" endchoice @@ -578,7 +581,8 @@ endchoice config PAGE_OFFSET hex default 0xB0000000 if VMSPLIT_3G_OPT - default 0x78000000 if VMSPLIT_2G + default 0x80000000 if VMSPLIT_2G + default 0x78000000 if VMSPLIT_2G_OPT default 0x40000000 if VMSPLIT_1G default 0xC0000000