Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c5f1def authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

alpha: convert IOMMU to use ALIGN() 



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

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 040922c0

arch/alpha/kernel/pci_iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */

	ptes = arena->ptes;

	nent = arena->size >> PAGE_SHIFT;

	p = (arena->next_entry + mask) & ~mask;

	p = ALIGN(arena->next_entry, mask + 1);

	i = 0;

	while (i < n && p+i < nent) {

		if (ptes[p+i])

			p = (p + i + 1 + mask) & ~mask, i = 0;

			p = ALIGN(p + i + 1, mask + 1), i = 0;

		else

			i = i + 1;

	}
@@ -153,7 +153,7 @@ iommu_arena_find_pages(struct pci_iommu_arena *arena, long n, long mask) 
		p = 0, i = 0;

		while (i < n && p+i < nent) {

			if (ptes[p+i])

				p = (p + i + 1 + mask) & ~mask, i = 0;

				p = ALIGN(p + i + 1, mask + 1), i = 0;

			else

				i = i + 1;

		}