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

Merge keystone/android12-5.10-keystone-qcom-release.81+ (e4225e5) into msm-5.10

Browse Source 
* refs/heads/tmp-e4225e5:
  ANDROID: mm: Fix page table lookup in speculative fault path
  UPSTREAM: xhci: re-initialize the HC during resume if HCE was set
  FROMGIT: xhci: make xhci_handshake timeout for xhci_reset() adjustable
  ANDROID: vendor_hooks: Add hooks for __alloc_pages_direct_reclaim
  ANDROID: dma-direct: Document disable_dma32
  ANDROID: dma-direct: Make DMA32 disablement work for CONFIG_NUMA
  UPSTREAM: mmc: block: fix read single on recovery logic
  UPSTREAM: fget: check that the fd still exists after getting a ref to it
  ANDROID: GKI: Update symbols to symbol list

Change-Id: Ic2917d956f70e01cc21c45edd3c7526b5aa8dc6b
Signed-off-by: Sivasri Kumar, Vanka <quic_svanka@quicinc.com>
This commit is contained in:
Sivasri Kumar, Vanka
2022-03-09 11:45:17 +05:30
parent a61c513c38 e4225e5276
commit c5578e78d1
16 changed files with 473 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/dma/direct.c
View File

@@ -62,7 +62,7 @@ static gfp_t dma_direct_optimal_gfp_mask(struct device *dev, u64 dma_mask,
if (*phys_limit <= DMA_BIT_MASK(zone_dma_bits))
return GFP_DMA;
if (*phys_limit <= DMA_BIT_MASK(32) &&
!zone_dma32_is_empty(dev_to_node(dev)))
!zone_dma32_are_empty())
return GFP_DMA32;
return 0;
}
@@ -103,7 +103,7 @@ again:
if (IS_ENABLED(CONFIG_ZONE_DMA32) &&
phys_limit < DMA_BIT_MASK(64) &&
!(gfp & (GFP_DMA32 | GFP_DMA)) &&
!zone_dma32_is_empty(node)) {
!zone_dma32_are_empty()) {
gfp |= GFP_DMA32;
goto again;
}