From 481b3fc579706bc990eb7973636f847da9906f5b Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:23:48 +0100 Subject: [PATCH] Revert "dma-debug: avoid deadlock between dma debug vs printk and netconsole" This reverts commit a4688d62483aa20aca292cd05a85797ea87da5c9. --- kernel/dma/debug.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index fbe5b6483..2fb8e539c 100755 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -447,11 +447,8 @@ void debug_dma_dump_mappings(struct device *dev) * 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 | __GFP_NOWARN); +static RADIX_TREE(dma_active_cacheline, GFP_ATOMIC); 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)