Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 333313
b: refs/heads/master
c: 7a28529
h: refs/heads/master
i:
  333311: d65f6f0
v: v3
  • Loading branch information
R Sricharan authored and Tony Lindgren committed Oct 8, 2012
1 parent a765833 commit 84eabe8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9d7d6e363b06934221b81a859d509844c97380df
refs/heads/master: 7a2852908e37e20be065e7765806daf1df077496
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-omap2/omap-secure.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ int __init omap_secure_ram_reserve_memblock(void)
{
u32 size = OMAP_SECURE_RAM_STORAGE;

size = ALIGN(size, SZ_1M);
omap_secure_memblock_base = arm_memblock_steal(size, SZ_1M);
size = ALIGN(size, SECTION_SIZE);
omap_secure_memblock_base = arm_memblock_steal(size, SECTION_SIZE);

return 0;
}
Expand Down

0 comments on commit 84eabe8

Please sign in to comment.