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

uml: remove map_cb

John Reiser noticed that a physical memory region was being mapped twice.

This patch fixes that, and it inlines the responsible function, as that had
only one caller.

Cc: John Reiser <>
Signed-off-by: default avatarJeff Dike <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 47afa1d5
......@@ -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);
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));
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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment