projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-microblaze.git]
/
arch
/
arm
/
mach-zynq
/
common.c
diff --git
a/arch/arm/mach-zynq/common.c
b/arch/arm/mach-zynq/common.c
index
d12002c
..
ed11864
100644
(file)
--- a/
arch/arm/mach-zynq/common.c
+++ b/
arch/arm/mach-zynq/common.c
@@
-59,7
+59,7
@@
void __iomem *zynq_scu_base;
static void __init zynq_memory_init(void)
{
if (!__pa(PAGE_OFFSET))
- memblock_reserve(__pa(PAGE_OFFSET),
__pa(swapper_pg_dir)
);
+ memblock_reserve(__pa(PAGE_OFFSET),
0x80000
);
}
static struct platform_device zynq_cpuidle_device = {