Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

1 files changed, 11 insertions, 2 deletions

diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
index 1ba02baf2f9..a5a5637507b 100644
--- a/arch/ia64/hp/common/hwsw_iommu.c
+++ b/arch/ia64/hp/common/hwsw_iommu.c
@@ -17,7 +17,7 @@
 #include <asm/machvec.h>
 
 /* swiotlb declarations & definitions: */
-extern void swiotlb_init_with_default_size (size_t size);
+extern int swiotlb_late_init_with_default_size (size_t size);
 extern ia64_mv_dma_alloc_coherent       swiotlb_alloc_coherent;
 extern ia64_mv_dma_free_coherent        swiotlb_free_coherent;
 extern ia64_mv_dma_map_single           swiotlb_map_single;
@@ -67,7 +67,16 @@ void
 hwsw_init (void)
 {
         /* default to a smallish 2MB sw I/O TLB */
-        swiotlb_init_with_default_size (2 * (1<<20));
+        if (swiotlb_late_init_with_default_size (2 * (1<<20)) != 0) {
+#ifdef CONFIG_IA64_GENERIC
+                /* Better to have normal DMA than panic */
+                printk(KERN_WARNING "%s: Failed to initialize software I/O TLB,"
+                       " reverting to hpzx1 platform vector\n", __FUNCTION__);
+                machvec_init("hpzx1");
+#else
+                panic("Unable to initialize software I/O TLB services");
+#endif
+        }
 }
 
 void *