diff options
Diffstat (limited to 'arch/um/kernel/mem.c')
-rw-r--r-- | arch/um/kernel/mem.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index d948babfc67a..d872fdce1d7e 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
@@ -36,11 +36,6 @@ int kmalloc_ok = 0; | |||
36 | /* Used during early boot */ | 36 | /* Used during early boot */ |
37 | static unsigned long brk_end; | 37 | static unsigned long brk_end; |
38 | 38 | ||
39 | static void map_cb(void *unused) | ||
40 | { | ||
41 | map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0); | ||
42 | } | ||
43 | |||
44 | #ifdef CONFIG_HIGHMEM | 39 | #ifdef CONFIG_HIGHMEM |
45 | static void setup_highmem(unsigned long highmem_start, | 40 | static void setup_highmem(unsigned long highmem_start, |
46 | unsigned long highmem_len) | 41 | unsigned long highmem_len) |
@@ -68,8 +63,7 @@ void __init mem_init(void) | |||
68 | * to be turned on. | 63 | * to be turned on. |
69 | */ | 64 | */ |
70 | brk_end = (unsigned long) UML_ROUND_UP(sbrk(0)); | 65 | brk_end = (unsigned long) UML_ROUND_UP(sbrk(0)); |
71 | map_cb(NULL); | 66 | map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0); |
72 | initial_thread_cb(map_cb, NULL); | ||
73 | free_bootmem(__pa(brk_end), uml_reserved - brk_end); | 67 | free_bootmem(__pa(brk_end), uml_reserved - brk_end); |
74 | uml_reserved = brk_end; | 68 | uml_reserved = brk_end; |
75 | 69 | ||