diff options
| author | Jeff Dike <jdike@addtoit.com> | 2008-02-04 22:31:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 09:44:31 -0800 |
| commit | ab26a5276c1b0945c3281a73b3a89d025906c880 (patch) | |
| tree | 1a0e98af4b4b35bfb26e664c08ec149f943eabab /arch/um | |
| parent | 47afa1d5f826606def7c498e93ec79a905042c56 (diff) | |
| download | linux-stable-ab26a5276c1b0945c3281a73b3a89d025906c880.tar.gz linux-stable-ab26a5276c1b0945c3281a73b3a89d025906c880.tar.bz2 linux-stable-ab26a5276c1b0945c3281a73b3a89d025906c880.zip | |
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')
| -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; /* 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; |