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 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
microblaze
/
mm
/
init.c
diff --git
a/arch/microblaze/mm/init.c
b/arch/microblaze/mm/init.c
index
213f2d6
..
36a133e
100644
(file)
--- a/
arch/microblaze/mm/init.c
+++ b/
arch/microblaze/mm/init.c
@@
-304,11
+304,11
@@
asmlinkage void __init mmu_init(void)
/* Map in all of RAM starting at CONFIG_KERNEL_START */
mapin_ram();
/* Map in all of RAM starting at CONFIG_KERNEL_START */
mapin_ram();
-#ifdef HIGHMEM_START_BOOL
- ioremap_base = HIGHMEM_START;
+#ifdef
CONFIG_
HIGHMEM_START_BOOL
+ ioremap_base =
CONFIG_
HIGHMEM_START;
#else
ioremap_base = 0xfe000000UL; /* for now, could be 0xfffff000 */
#else
ioremap_base = 0xfe000000UL; /* for now, could be 0xfffff000 */
-#endif /* CONFIG_HIGHMEM */
+#endif /* CONFIG_HIGHMEM
_START_BOOL
*/
ioremap_bot = ioremap_base;
/* Initialize the context management stuff */
ioremap_bot = ioremap_base;
/* Initialize the context management stuff */