diff options
| author | Hugh Dickins <hugh@veritas.com> | 2002-07-29 01:27:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-29 01:27:36 -0700 |
| commit | a5271c10edcc1f090fba992760afdbbf67654bd7 (patch) | |
| tree | deb061e19c5d22b03a7359d5fb634c57acc9b751 /ipc | |
| parent | d9acf5fe72b5d512be31685803b6f362a2a6bb23 (diff) | |
| download | history-a5271c10edcc1f090fba992760afdbbf67654bd7.tar.gz | |
[PATCH] remove acct arg from do_munmap
An acct flag was added to do_munmap, true everywhere but in mremap's
move_vma: instead of updating the arch and driver sources, revert that
that change and temporarily mask VM_ACCOUNT around that one do_munmap.
Also, noticed that do_mremap fails needlessly if both shrinking _and_
moving a mapping: update old_len to pass vm area boundaries test.
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index 3d08a58a73890d..8618c5fb1977d8 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -671,7 +671,7 @@ asmlinkage long sys_shmdt (char *shmaddr) shmdnext = shmd->vm_next; if (shmd->vm_ops == &shm_vm_ops && shmd->vm_start - (shmd->vm_pgoff << PAGE_SHIFT) == (ulong) shmaddr) { - do_munmap(mm, shmd->vm_start, shmd->vm_end - shmd->vm_start, 1); + do_munmap(mm, shmd->vm_start, shmd->vm_end - shmd->vm_start); retval = 0; } } |