From 95f6a5ca13395426617c2140e789b5e1c4a8385b Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 30 May 2012 11:55:49 -0400 Subject: [PATCH] --- yaml --- r: 310035 b: refs/heads/master c: 4ad310b836d5c61ac6e9b5fd7db12d0cd57136d7 h: refs/heads/master i: 310033: 9b4f0b6269bd1dea76114be1b8ad25356885b453 310031: 2c2001657121c95c9ed07be79b5f44f13a1d393b v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/perfmon.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5ac640d60076..7c51224be821 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63a81db13205f21047a0799adfd3a2419f190577 +refs/heads/master: 4ad310b836d5c61ac6e9b5fd7db12d0cd57136d7 diff --git a/trunk/arch/ia64/kernel/perfmon.c b/trunk/arch/ia64/kernel/perfmon.c index f00ba025375d..d7f558c1e711 100644 --- a/trunk/arch/ia64/kernel/perfmon.c +++ b/trunk/arch/ia64/kernel/perfmon.c @@ -604,12 +604,6 @@ pfm_unprotect_ctx_ctxsw(pfm_context_t *x, unsigned long f) spin_unlock(&(x)->ctx_lock); } -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) -{ - return get_unmapped_area(file, addr, len, pgoff, flags); -} - /* forward declaration */ static const struct dentry_operations pfmfs_dentry_operations; @@ -2333,8 +2327,8 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t down_write(&task->mm->mmap_sem); /* find some free area in address space, must have mmap sem held */ - vma->vm_start = pfm_get_unmapped_area(NULL, 0, size, 0, MAP_PRIVATE|MAP_ANONYMOUS, 0); - if (vma->vm_start == 0UL) { + vma->vm_start = get_unmapped_area(NULL, 0, size, 0, MAP_PRIVATE|MAP_ANONYMOUS); + if (IS_ERR_VALUE(vma->vm_start)) { DPRINT(("Cannot find unmapped area for size %ld\n", size)); up_write(&task->mm->mmap_sem); goto error;