This makes UML load at 0x8048000 rather than 0xa0000000 when CONFIG_MODE_SKAS is on and CONFIG_MODE_TT is off. This will make it more valgrind-friendly, and also allow much greater physical memory sizes without needing to use highmem. Signed-off-by: Paolo 'Blaisorblade' Giarrusso --- um-linux-2.4.27-paolo/arch/um/Makefile | 6 +++++- um-linux-2.4.27-paolo/arch/um/Makefile-i386 | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff -puN arch/um/Makefile~load-low arch/um/Makefile --- um-linux-2.4.27/arch/um/Makefile~load-low 2005-04-15 11:12:58.000000000 +0200 +++ um-linux-2.4.27-paolo/arch/um/Makefile 2005-04-15 11:12:58.000000000 +0200 @@ -93,9 +93,13 @@ endif LD_SCRIPT-y := $(ARCH_DIR)/$(LD_SCRIPT-y) M4_MODE_TT := $(shell [ "$(CONFIG_MODE_TT)" = "y" ] && echo -DMODE_TT) +ifndef START + START = $$(($(TOP_ADDR) - $(SIZE))) +endif + $(LD_SCRIPT-y): $(LD_SCRIPT-y).in pages=$$(( 1 << $(CONFIG_KERNEL_STACK_ORDER) )) ; \ - m4 -DSTART=$$(($(TOP_ADDR) - $(SIZE))) -DELF_ARCH=$(ELF_ARCH) \ + m4 -DSTART=$(START) -DELF_ARCH=$(ELF_ARCH) \ -DELF_FORMAT=$(ELF_FORMAT) $(M4_MODE_TT) \ -DKERNEL_STACK_SIZE=$$(( 4096 * $$pages )) $< > $@ diff -puN arch/um/Makefile-i386~load-low arch/um/Makefile-i386 --- um-linux-2.4.27/arch/um/Makefile-i386~load-low 2005-04-15 11:12:58.000000000 +0200 +++ um-linux-2.4.27-paolo/arch/um/Makefile-i386 2005-04-15 11:12:58.000000000 +0200 @@ -1,9 +1,15 @@ -ifeq ($(CONFIG_HOST_2G_2G), y) +ifeq ($(CONFIG_HOST_2G_2G),y) TOP_ADDR = 0x80000000 else TOP_ADDR = 0xc0000000 endif +ifeq ($(CONFIG_MODE_SKAS),y) + ifneq ($(CONFIG_MODE_TT),y) + START = 0x8048000 + endif +endif + ARCH_CFLAGS = -U__$(SUBARCH)__ -U$(SUBARCH) ifneq ($(CONFIG_GPROF),y) _