patch-1.3.34 linux/ipc/shm.c

• Lines: 18
• Date: Thu Oct 12 16:00:05 1995
• Orig file: v1.3.33/linux/ipc/shm.c
• Orig date: Mon Sep 25 12:26:23 1995

diff -u --recursive --new-file v1.3.33/linux/ipc/shm.c linux/ipc/shm.c
@@ -516,7 +516,7 @@
 	shmd->vm_end = addr + shp->shm_npages * PAGE_SIZE;
 	shmd->vm_mm = current->mm;
 	shmd->vm_page_prot = (shmflg & SHM_RDONLY) ? PAGE_READONLY : PAGE_SHARED;
-	shmd->vm_flags = VM_SHM | VM_MAYSHARE | VM_SHARED
+	shmd->vm_flags = VM_SHM | VM_MAYSHARE | VM_SHARED | VM_DONTSWAP
 			 | VM_MAYREAD | VM_MAYEXEC | VM_READ | VM_EXEC
 			 | ((shmflg & SHM_RDONLY) ? 0 : VM_MAYWRITE | VM_WRITE);
 	shmd->vm_next_share = shmd->vm_prev_share = NULL;
@@ -683,7 +683,7 @@
 	unsigned long id, idx;
 	int loop = 0, invalid = 0;
 	int counter;
-
+	
 	counter = shm_rss >> prio;
 	if (!counter || !(swap_nr = get_swap_page()))
 		return 0;