Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uml: remove map_cb

Browse source 
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: Jeff Dike <jdike@linux.intel.com>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike 2008-02-04 22:31:24 -08:00 • committed by Linus Torvalds
parent 47afa1d5f8
commit ab26a5276c
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/um/kernel/mem.c
View file

@ -36,11 +36,6 @@ int kmalloc_ok = 0;
/* Used during early boot */ /* Used during early boot */
static unsigned long brk_end; 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 #ifdef CONFIG_HIGHMEM
static void setup_highmem(unsigned long highmem_start, static void setup_highmem(unsigned long highmem_start,
unsigned long highmem_len) unsigned long highmem_len)
@ -68,8 +63,7 @@ void __init mem_init(void)
* to be turned on. * to be turned on.
*/ */
brk_end = (unsigned long) UML_ROUND_UP(sbrk(0)); brk_end = (unsigned long) UML_ROUND_UP(sbrk(0));
map_cb(NULL); map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0);
initial_thread_cb(map_cb, NULL);
free_bootmem(__pa(brk_end), uml_reserved - brk_end); free_bootmem(__pa(brk_end), uml_reserved - brk_end);
uml_reserved = brk_end; uml_reserved = brk_end;