Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe33f6f1 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[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: default avatarJeff 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 569d3287

arch/um/Kconfig.i386

+17 −17
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ config SEMAPHORE_SLEEPERS 
choice

	prompt "Host memory split"

	default HOST_VMSPLIT_3G

	---help---

	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
@@ -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