patch-1.3.43 linux/mm/swap.c

• Lines: 18
• Date: Fri Nov 17 15:02:45 1995
• Orig file: v1.3.42/linux/mm/swap.c
• Orig date: Wed Nov 8 07:11:43 1995

diff -u --recursive --new-file v1.3.42/linux/mm/swap.c linux/mm/swap.c
@@ -566,15 +566,10 @@
 	unsigned long end;
 
 	/* Don't swap out areas like shared memory which have their
-	    own separate swapping mechanism. */
-	if (vma->vm_flags & VM_SHM)
+	    own separate swapping mechanism or areas which are locked down */
+	if (vma->vm_flags & (VM_SHM | VM_LOCKED))
 		return 0;
 
-	/* Don't swap out areas like shared memory which have their
-           own separate swapping mechanism. */
-	if (vma->vm_flags & VM_DONTSWAP)
-		return 0;
-	
 	end = vma->vm_end;
 	while (start < end) {
 		int result = swap_out_pgd(tsk, vma, pgdir, start, end, limit);