korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

alpha: fix iommu-related boot panic

Browse Source 
This fixes a boot panic due to a typo in the recent iommu patchset from
FUJITA Tomonori <tomof@acm.org> - the code used dma_get_max_seg_size()
instead of dma_get_seg_boundary().

It also removes a couple of unnecessary BUG_ON() and ALIGN() macros.

Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Reported-and-tested-by: Bob Tracy <rct@frus.com>
Acked-by: FUJITA Tomonori <tomof@acm.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ivan Kokshaysky 2008-03-09 16:31:17 +03:00 committed by Linus Torvalds
parent 393d94d98b
commit ab875cf67e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,15 +144,14 @@ iommu_arena_find_pages(struct device *dev, struct pci_iommu_arena *arena,
unsigned long base; unsigned long base;
unsigned long boundary_size; unsigned long boundary_size;
BUG_ON(arena->dma_base & ~PAGE_MASK);
base = arena->dma_base >> PAGE_SHIFT; base = arena->dma_base >> PAGE_SHIFT;
if (dev) if (dev) {
boundary_size = ALIGN(dma_get_max_seg_size(dev) + 1, PAGE_SIZE) boundary_size = dma_get_seg_boundary(dev) + 1;
>> PAGE_SHIFT; BUG_ON(!is_power_of_2(boundary_size));
else boundary_size >>= PAGE_SHIFT;
boundary_size = ALIGN(1UL << 32, PAGE_SIZE) >> PAGE_SHIFT; } else {
boundary_size = 1UL << (32 - PAGE_SHIFT);
BUG_ON(!is_power_of_2(boundary_size)); }
/* 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;