diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-07 12:45:20 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-07 12:45:20 -0600 |
| commit | 65f619d2535197d97067eeeef75a40f25b552e69 (patch) | |
| tree | 13f96c51a2b591ed22f1771541998bb77178f685 /mm | |
| parent | fbbaf700e7b163a0f1704b2d542ee28be11fce21 (diff) | |
| parent | 6d8c6c0f97ad8a3517c42b179c1dc8e77397d0e2 (diff) | |
| download | linux-65f619d2535197d97067eeeef75a40f25b552e69.tar.bz2 | |
Merge branch 'for-linus' into for-4.12/block
We've added a considerable amount of fixes for stalls and issues
with the blk-mq scheduling in the 4.11 series since forking
off the for-4.12/block branch. We need to do improvements on
top of that for 4.12, so pull in the previous fixes to make
our lives easier going forward.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/swap_slots.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/swap_slots.c b/mm/swap_slots.c index 7ebb23836f68..b1ccb58ad397 100644 --- a/mm/swap_slots.c +++ b/mm/swap_slots.c @@ -267,8 +267,6 @@ int free_swap_slot(swp_entry_t entry) { struct swap_slots_cache *cache; - WARN_ON_ONCE(!swap_slot_cache_initialized); - cache = &get_cpu_var(swp_slots); if (use_swap_slot_cache && cache->slots_ret) { spin_lock_irq(&cache->free_lock); |