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

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 <jreiser@BitWagon.com>
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 47afa1d5

arch/um/kernel/mem.c

+1 −7
Original line number Diff line number Diff line
@@ -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;