2 files changed, 11 insertions, 23 deletions

diff --git a/arch/powerpc/oprofile/cell/spu_task_sync.c b/arch/powerpc/oprofile/cell/spu_task_sync.c
index 642fca137ccb..28f1af2db1f5 100644
--- a/arch/powerpc/oprofile/cell/spu_task_sync.c
+++ b/arch/powerpc/oprofile/cell/spu_task_sync.c
@@ -304,7 +304,7 @@ static inline unsigned long fast_get_dcookie(struct path *path)
         return cookie;
 }
 
-/* Look up the dcookie for the task's first VM_EXECUTABLE mapping,
+/* Look up the dcookie for the task's mm->exe_file,
  * which corresponds loosely to "application name". Also, determine
  * the offset for the SPU ELF object.  If computed offset is
  * non-zero, it implies an embedded SPU object; otherwise, it's a
@@ -321,7 +321,6 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp,
 {
         unsigned long app_cookie = 0;
         unsigned int my_offset = 0;
-        struct file *app = NULL;
         struct vm_area_struct *vma;
         struct mm_struct *mm = spu->mm;
 
@@ -330,16 +329,10 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp,
 
         down_read(&mm->mmap_sem);
 
-        for (vma = mm->mmap; vma; vma = vma->vm_next) {
-                if (!vma->vm_file)
-                        continue;
-                if (!(vma->vm_flags & VM_EXECUTABLE))
-                        continue;
-                app_cookie = fast_get_dcookie(&vma->vm_file->f_path);
+        if (mm->exe_file) {
+                app_cookie = fast_get_dcookie(&mm->exe_file->f_path);
                 pr_debug("got dcookie for %s\n",
-                         vma->vm_file->f_dentry->d_name.name);
-                app = vma->vm_file;
-                break;
+                         mm->exe_file->f_dentry->d_name.name);
         }
 
         for (vma = mm->mmap; vma; vma = vma->vm_next) {
diff --git a/arch/tile/mm/elf.c b/arch/tile/mm/elf.c
index 758b6038c2b7..3cfa98bf9125 100644
--- a/arch/tile/mm/elf.c
+++ b/arch/tile/mm/elf.c
@@ -36,19 +36,14 @@ static void sim_notify_exec(const char *binary_name)
         } while (c);
 }
 
-static int notify_exec(void)
+static int notify_exec(struct mm_struct *mm)
 {
         int retval = 0;  /* failure */
-        struct vm_area_struct *vma = current->mm->mmap;
-        while (vma) {
-                if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
-                        break;
-                vma = vma->vm_next;
-        }
-        if (vma) {
+
+        if (mm->exe_file) {
                 char *buf = (char *) __get_free_page(GFP_KERNEL);
                 if (buf) {
-                        char *path = d_path(&vma->vm_file->f_path,
+                        char *path = d_path(&mm->exe_file->f_path,
                                             buf, PAGE_SIZE);
                         if (!IS_ERR(path)) {
                                 sim_notify_exec(path);
@@ -106,16 +101,16 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
         unsigned long vdso_base;
         int retval = 0;
 
+        down_write(&mm->mmap_sem);
+
         /*
          * Notify the simulator that an exec just occurred.
          * If we can't find the filename of the mapping, just use
          * whatever was passed as the linux_binprm filename.
          */
-        if (!notify_exec())
+        if (!notify_exec(mm))
                 sim_notify_exec(bprm->filename);
 
-        down_write(&mm->mmap_sem);
-
         /*
          * MAYWRITE to allow gdb to COW and set breakpoints
          */