diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /ipc | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -498,8 +498,14 @@ asmlinkage int sys_shmat (int shmid, char *shmaddr, int shmflg, ulong *raddr) 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 */ |