diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-02-09 21:05:25 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-02-09 21:25:40 +0100 |
| commit | 8697a258ae24703267d2a37d91ab757c91ef027e (patch) | |
| tree | 7a1798898ac64c72e6cf77d2320f036c963a16c1 /mm/swapfile.c | |
| parent | net: enable usercopy for skb_small_head_cache (diff) | |
| parent | Merge tag 'net-6.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-8697a258ae24703267d2a37d91ab757c91ef027e.tar.xz linux-8697a258ae24703267d2a37d91ab757c91ef027e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
net/devlink/leftover.c / net/core/devlink.c:
565b4824c39f ("devlink: change port event netdev notifier from per-net to global")
f05bd8ebeb69 ("devlink: move code to a dedicated directory")
687125b5799c ("devlink: split out core code")
https://lore.kernel.org/all/20230208094657.379f2b1a@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
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 908a529bca12..4fa440e87cd6 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: |