diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-18 15:02:27 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-18 15:02:27 -0700 |
commit | 038c4bf85ba2bca715db3ca4d190de3e5299c6c3 (patch) | |
tree | 087d4159caceecb334a322f5f1a3908d57159468 /mm | |
parent | c853246539f37936f20a38c12e55d54fe72f1c2a (diff) | |
parent | d95bca4fbde0a29a3d987c39fd17e414f1ed5ec6 (diff) | |
download | linux-038c4bf85ba2bca715db3ca4d190de3e5299c6c3.tar.bz2 |
Merge branch 'ib/5.17-cros-ec-keyb' into next
Merge changes to ChromeOS EC Keyboard driver.
Diffstat (limited to 'mm')
-rw-r--r-- | mm/swap_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/swap_state.c b/mm/swap_state.c index 8d4104242100..ee67164531c0 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -478,7 +478,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, * __read_swap_cache_async(), which has set SWAP_HAS_CACHE * in swap_map, but not yet added its page to swap cache. */ - cond_resched(); + schedule_timeout_uninterruptible(1); } /* |