--- mm/swapfile.c

+++ mm/swapfile.c

@@ -330,8 +330,10 @@ checks:

if (offset > si->highest_bit)

scan_base = offset = si->lowest_bit;

- /* reuse swap entry of cache-only swap if not busy. */

- if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {

+ /* reuse swap entry of cache-only swap if not hibernation. */

+ if (vm_swap_full()

+ && cache == SWAP_CACHE

+ && si->swap_map[offset] == SWAP_HAS_CACHE) {

int swap_was_freed;

spin_unlock(&swap_lock);

swap_was_freed = __try_to_reclaim_swap(si, offset);