--- linux.vanilla/ipc/shm.c	Tue Jan  4 21:19:03 2000
+++ linux.15p6/ipc/shm.c	Mon Feb  7 12:46:06 2000
@@ -630,11 +630,12 @@
 		printk ("shm_nopage: id=%d invalid. Race.\n", id);
 		return 0;
 	}
+#endif
+	/* This can occur on a remap */
+	
 	if (idx >= shp->shm_npages) {
-		printk ("shm_nopage : too large page index. id=%d\n", id);
-		return 0;
+		return NULL;
 	}
-#endif
 
 	pte = __pte(shp->shm_pages[idx]);
 	if (!pte_present(pte)) {