git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uml: remove map_cb
[safe/jmp/linux-2.6]
/
arch
/
um
/
kernel
/
mem.c
diff --git
a/arch/um/kernel/mem.c
b/arch/um/kernel/mem.c
index
d948bab
..
d872fdc
100644
(file)
--- 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;
/* 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)
#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));
* 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;
free_bootmem(__pa(brk_end), uml_reserved - brk_end);
uml_reserved = brk_end;