diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-03-02 11:28:33 -0500 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-03-02 11:28:33 -0500 |
| commit | 230bc2bed518632602bd2cdad6ba5d2081d448b5 (patch) | |
| tree | f08bf885fe7d2a81939d74e3051a8cc8185c4915 /mm/vmscan.c | |
| parent | 17003d109e6cd08d4db5f6525a1023537ce6c743 (diff) | |
| parent | 38a15ad9488e21cad8f42d3befca20f91e5b2874 (diff) | |
| download | linux-230bc2bed518632602bd2cdad6ba5d2081d448b5.tar.bz2 | |
Merge drm/drm-next into drm-intel-next
To catch up with recent rounds of pull requests
and get some drm-misc dependencies so we can merge
linux/string_helpers related changes.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 4 |
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. |