--- d961e1914d17a7fb74cb7c907ddee44dcd5aae76
+++ c897885ae3159373cf5f72f0dce7d174a8fa14bb
@@ -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) {