summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/vmregion.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-08-04 13:43:45 +0200
committerTony Lindgren <tony@atomide.com>2010-08-04 13:43:45 +0200
commit7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch)
treee7ffdc043a2847f410d654d8e99e001f3138937a /arch/arm/mm/vmregion.c
parentomap: Fix DEBUG_LL uart to access phys addr when MMU isn't enable (diff)
parentomap3: introduce omap3_map_io (diff)
downloadlinux-7590d1defdc720a97a9e186f45f529c4ae1b40f7.tar.xz
linux-7590d1defdc720a97a9e186f45f529c4ae1b40f7.zip
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mm/vmregion.c')
-rw-r--r--arch/arm/mm/vmregion.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mm/vmregion.c b/arch/arm/mm/vmregion.c
index 19e09bdb1b8a..935993e1b1ef 100644
--- a/arch/arm/mm/vmregion.c
+++ b/arch/arm/mm/vmregion.c
@@ -35,7 +35,8 @@
*/
struct arm_vmregion *
-arm_vmregion_alloc(struct arm_vmregion_head *head, size_t size, gfp_t gfp)
+arm_vmregion_alloc(struct arm_vmregion_head *head, size_t align,
+ size_t size, gfp_t gfp)
{
unsigned long addr = head->vm_start, end = head->vm_end - size;
unsigned long flags;
@@ -58,7 +59,7 @@ arm_vmregion_alloc(struct arm_vmregion_head *head, size_t size, gfp_t gfp)
goto nospc;
if ((addr + size) <= c->vm_start)
goto found;
- addr = c->vm_end;
+ addr = ALIGN(c->vm_end, align);
if (addr > end)
goto nospc;
}