There is a couple of commented debug prints which still use IOMMU_PAGE_SHIFT() which is not defined for POWERPC anymore, replace them with it_page_shift.
Unified · Split
| @@ -1037,7 +1037,7 @@ int iommu_tce_build(struct iommu_table *tbl, unsigned long entry, · 1036 unmodified lines | |||
| 1037 | 1037 | ||
| 1038 | /* if (unlikely(ret)) | 1038 | /* if (unlikely(ret)) |
| 1039 | pr_err("iommu_tce: %s failed on hwaddr=%lx ioba=%lx kva=%lx ret=%d\n", | 1039 | pr_err("iommu_tce: %s failed on hwaddr=%lx ioba=%lx kva=%lx ret=%d\n", |
| 1040 | __func__, hwaddr, entry << IOMMU_PAGE_SHIFT(tbl), | 1040 | __func__, hwaddr, entry << tbl->it_page_shift, |
| 1041 | hwaddr, ret); */ | 1041 | hwaddr, ret); */ |
| 1042 | 1042 | ||
| 1043 | return ret; | 1043 | return ret; |
| @@ -1056,7 +1056,7 @@ int iommu_put_tce_user_mode(struct iommu_table *tbl, unsigned long entry, · 12 unmodified lines | |||
| 1056 | direction != DMA_TO_DEVICE, &page); | 1056 | direction != DMA_TO_DEVICE, &page); |
| 1057 | if (unlikely(ret != 1)) { | 1057 | if (unlikely(ret != 1)) { |
| 1058 | /* pr_err("iommu_tce: get_user_pages_fast failed tce=%lx ioba=%lx ret=%d\n", | 1058 | /* pr_err("iommu_tce: get_user_pages_fast failed tce=%lx ioba=%lx ret=%d\n", |
| 1059 | tce, entry << IOMMU_PAGE_SHIFT(tbl), ret); */ | 1059 | tce, entry << tbl->it_page_shift, ret); */ |
| 1060 | return -EFAULT; | 1060 | return -EFAULT; |
| 1061 | } | 1061 | } |
| 1062 | hwaddr = (unsigned long) page_address(page) + offset; | 1062 | hwaddr = (unsigned long) page_address(page) + offset; |