summaryrefslogtreecommitdiff
path: root/mm/vmscan.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2022-03-21 12:34:57 +0300
committerBorislav Petkov <bp@suse.de>2022-03-21 12:34:57 +0300
commit1422df58e5eb83dca131dc64e0f307a1f9e56078 (patch)
treef54bb7952a406cd783cbdbfe1b5ac4f80de02d68 /mm/vmscan.c
parente1bca853dddcb57cbf084acbf35e3654cef6fc75 (diff)
parent2151c84ece920dc55942495004a823cbecb921e5 (diff)
downloadlinux-1422df58e5eb83dca131dc64e0f307a1f9e56078.tar.xz
Merge branch 'edac-amd64' into edac-updates-for-v5.18
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r--mm/vmscan.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 090bfb605ecf..59b14e0d696c 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1066,8 +1066,10 @@ void reclaim_throttle(pg_data_t *pgdat, enum vmscan_throttle_state reason)
* forward progress (e.g. journalling workqueues or kthreads).
*/
if (!current_is_kswapd() &&
- current->flags & (PF_IO_WORKER|PF_KTHREAD))
+ current->flags & (PF_IO_WORKER|PF_KTHREAD)) {
+ cond_resched();
return;
+ }
/*
* These figures are pulled out of thin air.