From 01109d7f15148df20a9a5e6c1c0d791d7a407a21 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Mon, 4 Feb 2008 22:31:24 -0800 Subject: [PATCH] --- yaml --- r: 83226 b: refs/heads/master c: ab26a5276c1b0945c3281a73b3a89d025906c880 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/mem.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 779bf7329cb1..f8272e7bce6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47afa1d5f826606def7c498e93ec79a905042c56 +refs/heads/master: ab26a5276c1b0945c3281a73b3a89d025906c880 diff --git a/trunk/arch/um/kernel/mem.c b/trunk/arch/um/kernel/mem.c index d948babfc67a..d872fdce1d7e 100644 --- a/trunk/arch/um/kernel/mem.c +++ b/trunk/arch/um/kernel/mem.c @@ -36,11 +36,6 @@ int kmalloc_ok = 0; /* Used during early boot */ static unsigned long brk_end; -static void map_cb(void *unused) -{ - map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0); -} - #ifdef CONFIG_HIGHMEM static void setup_highmem(unsigned long highmem_start, unsigned long highmem_len) @@ -68,8 +63,7 @@ void __init mem_init(void) * to be turned on. */ brk_end = (unsigned long) UML_ROUND_UP(sbrk(0)); - map_cb(NULL); - initial_thread_cb(map_cb, NULL); + map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0); free_bootmem(__pa(brk_end), uml_reserved - brk_end); uml_reserved = brk_end;