The patch titled
alpha: fix iommu-related boot panic
has been removed from the -mm tree. Its filename was
alpha-fix-iommu-related-boot-panic.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: alpha: fix iommu-related boot panic
From: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Fix boot panic due to a typo in the recent iommu patchset from FUJITA Tomonori
<tomof@xxxxxxx> - dma_get_max_seg_size() instead of dma_get_seg_boundary().
This also removes a couple of unnecessary BUG_ON() and ALIGN() macros.
Signed-off-by: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Reported-by: Bob Tracy <rct@xxxxxxxx>
Tested-by: Bob Tracy <rct@xxxxxxxx>
Acked-by: FUJITA Tomonori <tomof@xxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Richard Henderson <rth@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/kernel/pci_iommu.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff -puN arch/alpha/kernel/pci_iommu.c~alpha-fix-iommu-related-boot-panic arch/alpha/kernel/pci_iommu.c
--- a/arch/alpha/kernel/pci_iommu.c~alpha-fix-iommu-related-boot-panic
+++ a/arch/alpha/kernel/pci_iommu.c
@@ -144,15 +144,14 @@ iommu_arena_find_pages(struct device *de
unsigned long base;
unsigned long boundary_size;
- BUG_ON(arena->dma_base & ~PAGE_MASK);
base = arena->dma_base >> PAGE_SHIFT;
- if (dev)
- boundary_size = ALIGN(dma_get_max_seg_size(dev) + 1, PAGE_SIZE)
- >> PAGE_SHIFT;
- else
- boundary_size = ALIGN(1UL << 32, PAGE_SIZE) >> PAGE_SHIFT;
-
- BUG_ON(!is_power_of_2(boundary_size));
+ if (dev) {
+ boundary_size = dma_get_seg_boundary(dev) + 1;
+ BUG_ON(!is_power_of_2(boundary_size));
+ boundary_size >>= PAGE_SHIFT;
+ } else {
+ boundary_size = 1UL << (32 - PAGE_SHIFT);
+ }
/* Search forward for the first mask-aligned sequence of N free ptes */
ptes = arena->ptes;
_
Patches currently in -mm which might be from ink@xxxxxxxxxxxxxxxxxxxx are
alpha-handle-kcalloc-failure.patch
alpha-remove-remaining-__function__-occurences.patch
alpha-replace-__inline-with-inline.patch
make-sure-nobodys-leaking-resources.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
