tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v6.11-rc3' into android-mainline

Browse Source 
Linux 6.11-rc3

Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I514576a36c870fdc69a1763b6ac0222b2968eaf5
This commit is contained in:
Lee Jones
2024-09-02 07:21:40 +01:00
parent c16fe0a335 7c626ce4ba
commit ac37f41e88
276 changed files with 2103 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/dma/debug.c
+4 -1
View File
@@ -416,8 +416,11 @@ static unsigned long long phys_addr(struct dma_debug_entry *entry)
* dma_active_cacheline entry to track per event. dma_map_sg(), on the
* other hand, consumes a single dma_debug_entry, but inserts 'nents'
* entries into the tree.
*
* Use __GFP_NOWARN because the printk from an OOM, to netconsole, could end
* up right back in the DMA debugging code, leading to a deadlock.
*/
static RADIX_TREE(dma_active_cacheline, GFP_ATOMIC);
static RADIX_TREE(dma_active_cacheline, GFP_ATOMIC | __GFP_NOWARN);
static DEFINE_SPINLOCK(radix_lock);
#define ACTIVE_CACHELINE_MAX_OVERLAP ((1 << RADIX_TREE_MAX_TAGS) - 1)
#define CACHELINE_PER_PAGE_SHIFT (PAGE_SHIFT - L1_CACHE_SHIFT)