--- mm/memory.c

+++ mm/memory.c

@@ -2995,7 +2995,7 @@ static int do_swap_page(struct mm_struct

mem_cgroup_commit_charge_swapin(page, ptr);

swap_free(entry);

- if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))

+ if ((vma->vm_flags & VM_LOCKED) || PageMlocked(page))

try_to_free_swap(page);

unlock_page(page);

if (swapcache) {