Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kill mm argument of vm_munmap()

it's always current->mm

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro bfce281c 9f3a4afb

+12 -11
+1 -1
arch/ia64/kernel/perfmon.c
··· 1468 1468 /* 1469 1469 * does the actual unmapping 1470 1470 */ 1471 - r = vm_munmap(current->mm, (unsigned long)vaddr, size); 1471 + r = vm_munmap((unsigned long)vaddr, size); 1472 1472 1473 1473 if (r !=0) { 1474 1474 printk(KERN_ERR "perfmon: [%d] unable to unmap sampling buffer @%p size=%lu\n", task_pid_nr(task), vaddr, size);
+1 -1
arch/sparc/kernel/sys_sparc_64.c
··· 569 569 if (invalid_64bit_range(addr, len)) 570 570 return -EINVAL; 571 571 572 - return vm_munmap(current->mm, addr, len); 572 + return vm_munmap(addr, len); 573 573 } 574 574 575 575 extern unsigned long do_mremap(unsigned long addr,
+1 -1
arch/x86/kvm/x86.c
··· 6364 6364 if (!user_alloc && !old.user_alloc && old.rmap && !npages) { 6365 6365 int ret; 6366 6366 6367 - ret = vm_munmap(current->mm, old.userspace_addr, 6367 + ret = vm_munmap(old.userspace_addr, 6368 6368 old.npages * PAGE_SIZE); 6369 6369 if (ret < 0) 6370 6370 printk(KERN_WARNING
+1 -2
drivers/gpu/drm/i810/i810_dma.c
··· 158 158 if (buf_priv->currently_mapped != I810_BUF_MAPPED) 159 159 return -EINVAL; 160 160 161 - retcode = vm_munmap(current->mm, 162 - (unsigned long)buf_priv->virtual, 161 + retcode = vm_munmap((unsigned long)buf_priv->virtual, 163 162 (size_t) buf->total); 164 163 165 164 buf_priv->currently_mapped = I810_BUF_UNMAPPED;
+1 -1
fs/aio.c
··· 94 94 95 95 if (info->mmap_size) { 96 96 BUG_ON(ctx->mm != current->mm); 97 - vm_munmap(ctx->mm, info->mmap_base, info->mmap_size); 97 + vm_munmap(info->mmap_base, info->mmap_size); 98 98 } 99 99 100 100 if (info->ring_pages && info->ring_pages != info->internal_pages)
+1 -1
include/linux/mm.h
··· 1403 1403 1404 1404 /* These take the mm semaphore themselves */ 1405 1405 extern unsigned long vm_brk(unsigned long, unsigned long); 1406 - extern int vm_munmap(struct mm_struct *, unsigned long, size_t); 1406 + extern int vm_munmap(unsigned long, size_t); 1407 1407 extern unsigned long vm_mmap(struct file *, unsigned long, 1408 1408 unsigned long, unsigned long, 1409 1409 unsigned long, unsigned long);
+3 -2
mm/mmap.c
··· 2134 2134 } 2135 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 2139 int ret; 2140 + struct mm_struct *mm = current->mm; 2140 2141 2141 2142 down_write(&mm->mmap_sem); 2142 2143 ret = do_munmap(mm, start, len); ··· 2149 2148 SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) 2150 2149 { 2151 2150 profile_munmap(addr); 2152 - return vm_munmap(current->mm, addr, len); 2151 + return vm_munmap(addr, len); 2153 2152 } 2154 2153 2155 2154 static inline void verify_mm_writelocked(struct mm_struct *mm)
+3 -2
mm/nommu.c
··· 1734 1734 } 1735 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 1740 int ret; 1740 1741 1741 1742 down_write(&mm->mmap_sem); ··· 1748 1747 1749 1748 SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) 1750 1749 { 1751 - return vm_munmap(current->mm, addr, len); 1750 + return vm_munmap(addr, len); 1752 1751 } 1753 1752 1754 1753 /*