dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

kill mm argument of vm_munmap() 

it's always current->mm

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-04-20 21:57:04 -04:00
parent 9f3a4afb27
commit bfce281c28
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/kernel/perfmon.c
View File

@ -1468,7 +1468,7 @@ pfm_remove_smpl_mapping(void *vaddr, unsigned long size)
/*
* does the actual unmapping
*/
r = vm_munmap(current->mm, (unsigned long)vaddr, size);
r = vm_munmap((unsigned long)vaddr, size);
if (r !=0) {
printk(KERN_ERR "perfmon: [%d] unable to unmap sampling buffer @%p size=%lu\n", task_pid_nr(task), vaddr, size);

2
arch/sparc/kernel/sys_sparc_64.c
View File

@ -569,7 +569,7 @@ SYSCALL_DEFINE2(64_munmap, unsigned long, addr, size_t, len)
if (invalid_64bit_range(addr, len))
return -EINVAL;
return vm_munmap(current->mm, addr, len);
return vm_munmap(addr, len);
}
extern unsigned long do_mremap(unsigned long addr,

2
arch/x86/kvm/x86.c
View File

@ -6364,7 +6364,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
if (!user_alloc && !old.user_alloc && old.rmap && !npages) {
int ret;
ret = vm_munmap(current->mm, old.userspace_addr,
ret = vm_munmap(old.userspace_addr,
old.npages * PAGE_SIZE);
if (ret < 0)
printk(KERN_WARNING

3
drivers/gpu/drm/i810/i810_dma.c
View File

@ -158,8 +158,7 @@ static int i810_unmap_buffer(struct drm_buf *buf)
if (buf_priv->currently_mapped != I810_BUF_MAPPED)
return -EINVAL;
retcode = vm_munmap(current->mm,
(unsigned long)buf_priv->virtual,
retcode = vm_munmap((unsigned long)buf_priv->virtual,
(size_t) buf->total);
buf_priv->currently_mapped = I810_BUF_UNMAPPED;

2
fs/aio.c
View File

@ -94,7 +94,7 @@ static void aio_free_ring(struct kioctx *ctx)
if (info->mmap_size) {
BUG_ON(ctx->mm != current->mm);
vm_munmap(ctx->mm, info->mmap_base, info->mmap_size);
vm_munmap(info->mmap_base, info->mmap_size);
}
if (info->ring_pages && info->ring_pages != info->internal_pages)

2
include/linux/mm.h
View File

@ -1403,7 +1403,7 @@ extern int do_munmap(struct mm_struct *, unsigned long, size_t);
/* These take the mm semaphore themselves */
extern unsigned long vm_brk(unsigned long, unsigned long);
extern int vm_munmap(struct mm_struct *, unsigned long, size_t);
extern int vm_munmap(unsigned long, size_t);
extern unsigned long vm_mmap(struct file *, unsigned long,
unsigned long, unsigned long,
unsigned long, unsigned long);

5
mm/mmap.c
View File

@ -2134,9 +2134,10 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
}
EXPORT_SYMBOL(do_munmap);
int vm_munmap(struct mm_struct *mm, unsigned long start, size_t len)
int vm_munmap(unsigned long start, size_t len)
{
int ret;
struct mm_struct *mm = current->mm;
down_write(&mm->mmap_sem);
ret = do_munmap(mm, start, len);
@ -2148,7 +2149,7 @@ EXPORT_SYMBOL(vm_munmap);
SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
{
profile_munmap(addr);
return vm_munmap(current->mm, addr, len);
return vm_munmap(addr, len);
}
static inline void verify_mm_writelocked(struct mm_struct *mm)

5
mm/nommu.c
View File

@ -1734,8 +1734,9 @@ erase_whole_vma:
}
EXPORT_SYMBOL(do_munmap);
int vm_munmap(struct mm_struct *mm, unsigned long addr, size_t len)
int vm_munmap(unsigned long addr, size_t len)
{
struct mm_struct *mm = current->mm;
int ret;
down_write(&mm->mmap_sem);
@ -1747,7 +1748,7 @@ EXPORT_SYMBOL(vm_munmap);
SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
{
return vm_munmap(current->mm, addr, len);
return vm_munmap(addr, len);
}
/*