diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-02-01 02:25:17 +0100 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-02-01 02:25:17 +0100 |
| commit | 5ab0fc155dc0cac3b74584f7bc972569b0f8a57b (patch) | |
| tree | fb43458b715be3a72c872bc4ce0e7c45e6f76ccb /mm/swapfile.c | |
| parent | selftests: vm: enable cross-compilation (diff) | |
| parent | mm: memcg: fix NULL pointer in mem_cgroup_track_foreign_dirty_slowpath() (diff) | |
| download | linux-5ab0fc155dc0cac3b74584f7bc972569b0f8a57b.tar.xz linux-5ab0fc155dc0cac3b74584f7bc972569b0f8a57b.zip | |
Sync mm-stable with mm-hotfixes-stable to pick up dependent patches
Merge branch 'mm-hotfixes-stable' into mm-stable
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index 6d3f60bd383b..af151679d13a 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1100,6 +1100,7 @@ start_over: goto check_out; pr_debug("scan_swap_map of si %d failed to find offset\n", si->type); + cond_resched(); spin_lock(&swap_avail_lock); nextsi: |