summaryrefslogtreecommitdiffstats
path: root/net/Kconfig
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2023-06-30 17:41:39 +0200
committerAndrew Morton <akpm@linux-foundation.org>2023-06-30 17:41:39 +0200
commit44f10dbefd5e41b3385af91f855a57aa2afaf40e (patch)
tree944c9f1cda8322691468e6f10dc5b0d41c487621 /net/Kconfig
parentMerge branch 'master' into mm-hotfixes-stable (diff)
parentcsky: fix up lock_mm_and_find_vma() conversion (diff)
downloadlinux-44f10dbefd5e41b3385af91f855a57aa2afaf40e.tar.xz
linux-44f10dbefd5e41b3385af91f855a57aa2afaf40e.zip
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'net/Kconfig')
-rw-r--r--net/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/Kconfig b/net/Kconfig
index 7d39c1773eb4..2fb25b534df5 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -324,7 +324,7 @@ config CGROUP_NET_CLASSID
config NET_RX_BUSY_POLL
bool
- default y if !PREEMPT_RT
+ default y if !PREEMPT_RT || (PREEMPT_RT && !NETCONSOLE)
config BQL
bool