patch-2.3.24 linux/ipc/shm.c

• Lines: 26
• Date: Tue Oct 26 10:21:04 1999
• Orig file: v2.3.23/linux/ipc/shm.c
• Orig date: Fri Oct 22 13:21:55 1999

diff -u --recursive --new-file v2.3.23/linux/ipc/shm.c linux/ipc/shm.c
@@ -33,7 +33,7 @@
 static void shm_open (struct vm_area_struct *shmd);
 static void shm_close (struct vm_area_struct *shmd);
 static struct page * shm_nopage(struct vm_area_struct *, unsigned long, int);
-static int shm_swapout(struct vm_area_struct *, struct page *);
+static int shm_swapout(struct page *, struct file *);
 #ifdef CONFIG_PROC_FS
 static int sysvipc_shm_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data);
 #endif
@@ -646,7 +646,7 @@
  * data structures already, and shm_swap_out() will just
  * work off them..
  */
-static int shm_swapout(struct vm_area_struct * vma, struct page * page)
+static int shm_swapout(struct page * page, struct file *file)
 {
 	return 0;
 }
@@ -681,7 +681,6 @@
 			pte_t entry = pte;
 
 			spin_unlock(&shm_lock);
-			BUG();
 			page = lookup_swap_cache(entry);
 			if (!page) {
 				lock_kernel();