[PATCH] Fix UML on non-standard VM split hosts
This fixes UML on hosts with non-standard VM splits. We had changed the config variable that controls UML behavior on such hosts, but not propogated the change everywhere. In particular, the values of STUB_CODE and STUB_DATA relied on the old variable. I also reformatted the HOST_VMSPLIT_3G help to make it more standard. Spotted by uml@flonatel.org. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Blaisorblade <blaisorblade@yahoo.it> Cc: Pravin <shindepravin@gmail.com> Cc: <uml@flonatel.org> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
569d3287c1
commit
fe33f6f152
|
@ -19,22 +19,22 @@ config SEMAPHORE_SLEEPERS
|
|||
choice
|
||||
prompt "Host memory split"
|
||||
default HOST_VMSPLIT_3G
|
||||
---help---
|
||||
This is needed when the host kernel on which you run has a non-default
|
||||
(like 2G/2G) memory split, instead of the customary 3G/1G. If you did
|
||||
not recompile your own kernel but use the default distro's one, you can
|
||||
safely accept the "Default split" option.
|
||||
help
|
||||
This is needed when the host kernel on which you run has a non-default
|
||||
(like 2G/2G) memory split, instead of the customary 3G/1G. If you did
|
||||
not recompile your own kernel but use the default distro's one, you can
|
||||
safely accept the "Default split" option.
|
||||
|
||||
It can be enabled on recent (>=2.6.16-rc2) vanilla kernels via
|
||||
CONFIG_VM_SPLIT_*, or on previous kernels with special patches (-ck
|
||||
patchset by Con Kolivas, or other ones) - option names match closely the
|
||||
host CONFIG_VM_SPLIT_* ones.
|
||||
It can be enabled on recent (>=2.6.16-rc2) vanilla kernels via
|
||||
CONFIG_VM_SPLIT_*, or on previous kernels with special patches (-ck
|
||||
patchset by Con Kolivas, or other ones) - option names match closely the
|
||||
host CONFIG_VM_SPLIT_* ones.
|
||||
|
||||
A lower setting (where 1G/3G is lowest and 3G/1G is higher) will
|
||||
tolerate even more "normal" host kernels, but an higher setting will be
|
||||
stricter.
|
||||
A lower setting (where 1G/3G is lowest and 3G/1G is higher) will
|
||||
tolerate even more "normal" host kernels, but an higher setting will be
|
||||
stricter.
|
||||
|
||||
So, if you do not know what to do here, say 'Default split'.
|
||||
So, if you do not know what to do here, say 'Default split'.
|
||||
|
||||
config HOST_VMSPLIT_3G
|
||||
bool "Default split (3G/1G user/kernel host split)"
|
||||
|
@ -67,13 +67,13 @@ config 3_LEVEL_PGTABLES
|
|||
|
||||
config STUB_CODE
|
||||
hex
|
||||
default 0xbfffe000 if !HOST_2G_2G
|
||||
default 0x7fffe000 if HOST_2G_2G
|
||||
default 0xbfffe000 if !HOST_VMSPLIT_2G
|
||||
default 0x7fffe000 if HOST_VMSPLIT_2G
|
||||
|
||||
config STUB_DATA
|
||||
hex
|
||||
default 0xbffff000 if !HOST_2G_2G
|
||||
default 0x7ffff000 if HOST_2G_2G
|
||||
default 0xbffff000 if !HOST_VMSPLIT_2G
|
||||
default 0x7ffff000 if HOST_VMSPLIT_2G
|
||||
|
||||
config STUB_START
|
||||
hex
|
||||
|
|
Loading…
Reference in New Issue