patch-2.2.0-pre2 linux/ipc/shm.c

• Lines: 34
• Date: Tue Dec 29 11:21:49 1998
• Orig file: v2.2.0-pre1/linux/ipc/shm.c
• Orig date: Tue Dec 22 14:16:59 1998

diff -u --recursive --new-file v2.2.0-pre1/linux/ipc/shm.c linux/ipc/shm.c
@@ -624,6 +624,7 @@
 	unsigned int id, idx;
 
 	id = SWP_OFFSET(code) & SHM_ID_MASK;
+#ifdef DEBUG_SHM
 	if (id != (SWP_OFFSET(shmd->vm_pte) & SHM_ID_MASK)) {
 		printk ("shm_swap_in: code id = %d and shmd id = %ld differ\n",
 			id, SWP_OFFSET(shmd->vm_pte) & SHM_ID_MASK);
@@ -633,12 +634,17 @@
 		printk ("shm_swap_in: id=%d too big. proc mem corrupted\n", id);
 		return BAD_PAGE;
 	}
+#endif
 	shp = shm_segs[id];
+
+#ifdef DEBUG_SHM
 	if (shp == IPC_UNUSED || shp == IPC_NOID) {
 		printk ("shm_swap_in: id=%d invalid. Race.\n", id);
 		return BAD_PAGE;
 	}
+#endif
 	idx = (SWP_OFFSET(code) >> SHM_IDX_SHIFT) & SHM_IDX_MASK;
+#ifdef DEBUG_SHM
 	if (idx != (offset >> PAGE_SHIFT)) {
 		printk ("shm_swap_in: code idx = %u and shmd idx = %lu differ\n",
 			idx, offset >> PAGE_SHIFT);
@@ -648,6 +654,7 @@
 		printk ("shm_swap_in : too large page index. id=%d\n", id);
 		return BAD_PAGE;
 	}
+#endif
 
 	pte = __pte(shp->shm_pages[idx]);
 	if (!pte_present(pte)) {