patch-2.2.14 linux/ipc/shm.c

• Lines: 13
• Date: Tue Jan 4 10:12:25 2000
• Orig file: v2.2.13/linux/ipc/shm.c
• Orig date: Tue Jan 4 11:10:42 2000

diff -u --recursive --new-file v2.2.13/linux/ipc/shm.c linux/ipc/shm.c
@@ -639,10 +639,8 @@
 	pte = __pte(shp->shm_pages[idx]);
 	if (!pte_present(pte)) {
 		unsigned long page = get_free_page(GFP_USER);
-		if (!page) {
-			oom(current);
-			return 0;
-		}
+		if (!page)
+			return -1;
 		pte = __pte(shp->shm_pages[idx]);
 		if (pte_present(pte)) {
 			free_page (page); /* doesn't sleep */