aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2008-02-05 01:31:24 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 12:44:31 -0500
commitab26a5276c1b0945c3281a73b3a89d025906c880 (patch)
tree1a0e98af4b4b35bfb26e664c08ec149f943eabab /arch/um/kernel
parent47afa1d5f826606def7c498e93ec79a905042c56 (diff)
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: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/kernel')
-rw-r--r--arch/um/kernel/mem.c8
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 */
37static unsigned long brk_end; 37static unsigned long brk_end;
38 38
39static 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
45static void setup_highmem(unsigned long highmem_start, 40static 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