diff options
| author | Guzman Lugo, Fernando <x0095840@ti.com> | 2010-12-15 00:54:00 +0000 |
|---|---|---|
| committer | Hari Kanigeri <h-kanigeri2@ti.com> | 2010-12-15 11:28:30 -0600 |
| commit | ba6e1f4ff41314906d81e6d96e646cdeafe42827 (patch) | |
| tree | 93ab9d479d041de9b54525fa77e25635d8eb5321 /arch/arm/plat-omap/iovmm.c | |
| parent | ff0fba0bca4182e022c0a2ac0f3e63508e86e9f1 (diff) | |
| download | kernel_samsung_espresso10-ba6e1f4ff41314906d81e6d96e646cdeafe42827.tar.gz kernel_samsung_espresso10-ba6e1f4ff41314906d81e6d96e646cdeafe42827.tar.bz2 kernel_samsung_espresso10-ba6e1f4ff41314906d81e6d96e646cdeafe42827.zip | |
OMAP: iovmm: no gap checking for fixed address
If some fixed da address is wanted to be mapped and the page
is freed but it is used as gap, the mapping will fail.
This patch is fixing that and olny keeps the gap for
not fixed address.
Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Diffstat (limited to 'arch/arm/plat-omap/iovmm.c')
| -rw-r--r-- | arch/arm/plat-omap/iovmm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c index 8ce0de247c7..34f0012b567 100644 --- a/arch/arm/plat-omap/iovmm.c +++ b/arch/arm/plat-omap/iovmm.c @@ -289,10 +289,10 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da, prev_end = 0; list_for_each_entry(tmp, &obj->mmap, list) { - if (prev_end >= start) + if (prev_end > start) break; - if (start + bytes < tmp->da_start) + if (start + bytes <= tmp->da_start) goto found; if (flags & IOVMF_DA_ANON) @@ -301,7 +301,7 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da, prev_end = tmp->da_end; } - if ((start > prev_end) && (ULONG_MAX - start >= bytes)) + if ((start >= prev_end) && (ULONG_MAX - start + 1 >= bytes)) goto found; dev_dbg(obj->dev, "%s: no space to fit %08x(%x) flags: %08x\n", |