diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-20 21:57:04 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-21 01:58:20 -0400 |
commit | bfce281c287a427d0841fadf5d59242757b4e620 (patch) | |
tree | abca9ebeef4c668021e85e4d54e6e779121e92cc /mm | |
parent | 9f3a4afb276e4d8b3be7f3e678d4dbd11470416f (diff) |
kill mm argument of vm_munmap()
it's always current->mm
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/mmap.c | 5 | ||||
-rw-r--r-- | mm/nommu.c | 5 |
2 files changed, 6 insertions, 4 deletions
@@ -2134,9 +2134,10 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) | |||
2134 | } | 2134 | } |
2135 | EXPORT_SYMBOL(do_munmap); | 2135 | EXPORT_SYMBOL(do_munmap); |
2136 | 2136 | ||
2137 | int vm_munmap(struct mm_struct *mm, unsigned long start, size_t len) | 2137 | int vm_munmap(unsigned long start, size_t len) |
2138 | { | 2138 | { |
2139 | int ret; | 2139 | int ret; |
2140 | struct mm_struct *mm = current->mm; | ||
2140 | 2141 | ||
2141 | down_write(&mm->mmap_sem); | 2142 | down_write(&mm->mmap_sem); |
2142 | ret = do_munmap(mm, start, len); | 2143 | ret = do_munmap(mm, start, len); |
@@ -2148,7 +2149,7 @@ EXPORT_SYMBOL(vm_munmap); | |||
2148 | SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) | 2149 | SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) |
2149 | { | 2150 | { |
2150 | profile_munmap(addr); | 2151 | profile_munmap(addr); |
2151 | return vm_munmap(current->mm, addr, len); | 2152 | return vm_munmap(addr, len); |
2152 | } | 2153 | } |
2153 | 2154 | ||
2154 | static inline void verify_mm_writelocked(struct mm_struct *mm) | 2155 | static inline void verify_mm_writelocked(struct mm_struct *mm) |
diff --git a/mm/nommu.c b/mm/nommu.c index dd00383be2d..bb8f4f004a8 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
@@ -1734,8 +1734,9 @@ erase_whole_vma: | |||
1734 | } | 1734 | } |
1735 | EXPORT_SYMBOL(do_munmap); | 1735 | EXPORT_SYMBOL(do_munmap); |
1736 | 1736 | ||
1737 | int vm_munmap(struct mm_struct *mm, unsigned long addr, size_t len) | 1737 | int vm_munmap(unsigned long addr, size_t len) |
1738 | { | 1738 | { |
1739 | struct mm_struct *mm = current->mm; | ||
1739 | int ret; | 1740 | int ret; |
1740 | 1741 | ||
1741 | down_write(&mm->mmap_sem); | 1742 | down_write(&mm->mmap_sem); |
@@ -1747,7 +1748,7 @@ EXPORT_SYMBOL(vm_munmap); | |||
1747 | 1748 | ||
1748 | SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) | 1749 | SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) |
1749 | { | 1750 | { |
1750 | return vm_munmap(current->mm, addr, len); | 1751 | return vm_munmap(addr, len); |
1751 | } | 1752 | } |
1752 | 1753 | ||
1753 | /* | 1754 | /* |