xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3.14-rc5 into driver-core-next

Browse Source 
We want the fixes in here.
This commit is contained in:
Greg Kroah-Hartman
2014-03-02 20:09:08 -08:00
parent 6d8b3e1ad3 0414855fdc
commit 13df797743
530 changed files with 5366 additions and 3343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/s390/pci/pci_dma.c
View File

@@ -206,11 +206,13 @@ static void dma_cleanup_tables(struct zpci_dev *zdev)
zdev->dma_table = NULL;
}
static unsigned long __dma_alloc_iommu(struct zpci_dev *zdev, unsigned long start,
int size)
static unsigned long __dma_alloc_iommu(struct zpci_dev *zdev,
unsigned long start, int size)
{
unsigned long boundary_size = 0x1000000;
unsigned long boundary_size;
boundary_size = ALIGN(dma_get_seg_boundary(&zdev->pdev->dev) + 1,
PAGE_SIZE) >> PAGE_SHIFT;
return iommu_area_alloc(zdev->iommu_bitmap, zdev->iommu_pages,
start, size, 0, boundary_size, 0);
}