patch-2.1.54 linux/ipc/shm.c

• Lines: 16
• Date: Sat Sep 6 10:12:16 1997
• Orig file: v2.1.53/linux/ipc/shm.c
• Orig date: Thu Jul 17 10:06:09 1997

diff -u --recursive --new-file v2.1.53/linux/ipc/shm.c linux/ipc/shm.c
@@ -498,8 +498,14 @@
 		if (shmflg & SHM_REMAP)
 			goto out;
 		err = -ENOMEM;
-		if (!(addr = get_unmapped_area(0, shp->shm_segsz)))
+		addr = 0;
+	again:
+		if (!(addr = get_unmapped_area(addr, shp->shm_segsz)))
 			goto out;
+		if(addr & (SHMLBA - 1)) {
+			addr = (addr + (SHMLBA - 1)) & ~(SHMLBA - 1);
+			goto again;
+		}
 	} else if (addr & (SHMLBA-1)) {
 		if (shmflg & SHM_RND)
 			addr &= ~(SHMLBA-1);       /* round down */