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

Merge branch 'devel-stable' into for-next

Browse Source
This commit is contained in:
Russell King
2014-04-04 00:33:49 +01:00
parent 95959e6a06 566b60c04a
commit bce5669be3
1043 changed files with 15905 additions and 8988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mm/dma-mapping.c
View File

@@ -1355,7 +1355,7 @@ static void *arm_iommu_alloc_attrs(struct device *dev, size_t size,
*handle = DMA_ERROR_CODE;
size = PAGE_ALIGN(size);
if (gfp & GFP_ATOMIC)
if (!(gfp & __GFP_WAIT))
return __iommu_alloc_atomic(dev, size, handle);
/*