git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream'
[pandora-kernel.git]
/
arch
/
powerpc
/
mm
/
init_32.c
diff --git
a/arch/powerpc/mm/init_32.c
b/arch/powerpc/mm/init_32.c
index
4612a79
..
7d0d75c
100644
(file)
--- a/
arch/powerpc/mm/init_32.c
+++ b/
arch/powerpc/mm/init_32.c
@@
-84,9
+84,6
@@
void MMU_init(void);
/* XXX should be in current.h -- paulus */
extern struct task_struct *current_set[NR_CPUS];
/* XXX should be in current.h -- paulus */
extern struct task_struct *current_set[NR_CPUS];
-char *klimit = _end;
-struct device_node *memory_node;
-
extern int init_bootmem_done;
/*
extern int init_bootmem_done;
/*
@@
-191,6
+188,11
@@
void __init MMU_init(void)
if (ppc_md.progress)
ppc_md.progress("MMU:exit", 0x211);
if (ppc_md.progress)
ppc_md.progress("MMU:exit", 0x211);
+
+ /* From now on, btext is no longer BAT mapped if it was at all */
+#ifdef CONFIG_BOOTX_TEXT
+ btext_unmap();
+#endif
}
/* This is only called until mem_init is done. */
}
/* This is only called until mem_init is done. */