lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perfmon: kill some helpers and arguments

Browse Source 
pfm_vm_munmap() is simply vm_munmap() and pfm_remove_smpl_mapping()
always get current as the first argument.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2012-04-20 21:53:35 -04:00
parent 936af1576e
commit 9f3a4afb27
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -604,12 +604,6 @@ pfm_unprotect_ctx_ctxsw(pfm_context_t *x, unsigned long f)
spin_unlock(&(x)->ctx_lock); spin_unlock(&(x)->ctx_lock);
} }
static inline unsigned int
pfm_vm_munmap(struct mm_struct *mm, unsigned long addr, size_t len)
{
return vm_munmap(mm, addr, len);
}
static inline unsigned long static inline unsigned long
pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags, unsigned long exec) pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags, unsigned long exec)
{ {
@@ -1458,8 +1452,9 @@ pfm_unreserve_session(pfm_context_t *ctx, int is_syswide, unsigned int cpu)
* a PROTECT_CTX() section. * a PROTECT_CTX() section.
*/ */
static int static int
pfm_remove_smpl_mapping(struct task_struct *task, void *vaddr, unsigned long size) pfm_remove_smpl_mapping(void *vaddr, unsigned long size)
{ {
struct task_struct *task = current;
int r; int r;
/* sanity checks */ /* sanity checks */
@@ -1473,7 +1468,7 @@ pfm_remove_smpl_mapping(struct task_struct *task, void *vaddr, unsigned long siz
/* /*
* does the actual unmapping * does the actual unmapping
*/ */
r = pfm_vm_munmap(task->mm, (unsigned long)vaddr, size); r = vm_munmap(current->mm, (unsigned long)vaddr, size);
if (r !=0) { if (r !=0) {
printk(KERN_ERR "perfmon: [%d] unable to unmap sampling buffer @%p size=%lu\n", task_pid_nr(task), vaddr, size); printk(KERN_ERR "perfmon: [%d] unable to unmap sampling buffer @%p size=%lu\n", task_pid_nr(task), vaddr, size);
@@ -1940,7 +1935,7 @@ pfm_flush(struct file *filp, fl_owner_t id)
* because some VM function reenables interrupts. * because some VM function reenables interrupts.
* *
*/ */
if (smpl_buf_vaddr) pfm_remove_smpl_mapping(current, smpl_buf_vaddr, smpl_buf_size); if (smpl_buf_vaddr) pfm_remove_smpl_mapping(smpl_buf_vaddr, smpl_buf_size);
return 0; return 0;
} }