projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
omap-secure.c
diff --git
a/arch/arm/mach-omap2/omap-secure.c
b/arch/arm/mach-omap2/omap-secure.c
index a004cb9acf527d644223ef5facda224321a7263f..e089e4d1ae38f2d3a12890087ab514a69bf57ccd 100644
(file)
--- a/
arch/arm/mach-omap2/omap-secure.c
+++ b/
arch/arm/mach-omap2/omap-secure.c
@@
-61,8
+61,8
@@
int __init omap_secure_ram_reserve_memblock(void)
{
u32 size = OMAP_SECURE_RAM_STORAGE;
- size = ALIGN(size, S
Z_1M
);
- omap_secure_memblock_base = arm_memblock_steal(size, S
Z_1M
);
+ size = ALIGN(size, S
ECTION_SIZE
);
+ omap_secure_memblock_base = arm_memblock_steal(size, S
ECTION_SIZE
);
return 0;
}