leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

alpha: convert IOMMU to use ALIGN()

Browse Source 
This patch is preparation for modifications to fix the IOMMU segment boundary
problem.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
FUJITA Tomonori 2008-03-04 14:28:54 -08:00 committed by Linus Torvalds
parent 040922c04c
commit 3c5f1def7d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/alpha/kernel/pci_iommu.c
View File

@ -136,11 +136,11 @@ iommu_arena_find_pages(struct pci_iommu_arena *arena, long n, long mask)
/* Search forward for the first mask-aligned sequence of N free ptes */ /* Search forward for the first mask-aligned sequence of N free ptes */
ptes = arena->ptes; ptes = arena->ptes;
nent = arena->size >> PAGE_SHIFT; nent = arena->size >> PAGE_SHIFT;
p = (arena->next_entry + mask) & ~mask; p = ALIGN(arena->next_entry, mask + 1);
i = 0; i = 0;
while (i < n && p+i < nent) { while (i < n && p+i < nent) {
if (ptes[p+i]) if (ptes[p+i])
p = (p + i + 1 + mask) & ~mask, i = 0; p = ALIGN(p + i + 1, mask + 1), i = 0;
else else
i = i + 1; i = i + 1;
} }
@ -153,7 +153,7 @@ iommu_arena_find_pages(struct pci_iommu_arena *arena, long n, long mask)
p = 0, i = 0; p = 0, i = 0;
while (i < n && p+i < nent) { while (i < n && p+i < nent) {
if (ptes[p+i]) if (ptes[p+i])
p = (p + i + 1 + mask) & ~mask, i = 0; p = ALIGN(p + i + 1, mask + 1), i = 0;
else else
i = i + 1; i = i + 1;
} }