The patch titled fix nommu path broken by procfs task exe symlink has been removed from the -mm tree. Its filename was procfs-task-exe-symlink-fix-2.patch This patch was dropped because it was folded into procfs-task-exe-symlink.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fix nommu path broken by procfs task exe symlink From: Matt Helsley <matthltc@xxxxxxxxxx> nommu configurations will not compile because the "mm" variable does not exist. Replace usage of the mm variable and the empty vma->vm_mm field with correct mm pointers. Signed-off-by: Matt Helsley <matthltc@xxxxxxxxxx> Cc: Mike Frysinger <vapier.adi@xxxxxxxxx> Cc: Oleg Nesterov <oleg@xxxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Hugh Dickins <hugh@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/nommu.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff -puN mm/nommu.c~procfs-task-exe-symlink-fix-2 mm/nommu.c --- a/mm/nommu.c~procfs-task-exe-symlink-fix-2 +++ a/mm/nommu.c @@ -964,8 +964,10 @@ unsigned long do_mmap_pgoff(struct file atomic_set(&vma->vm_usage, 1); if (file) { get_file(file); - if (vm_flags & VM_EXECUTABLE) - added_exe_file_vma(mm); + if (vm_flags & VM_EXECUTABLE) { + added_exe_file_vma(current->mm); + vma->vm_mm = current->mm; + } } vma->vm_file = file; vma->vm_flags = vm_flags; @@ -1055,7 +1057,7 @@ EXPORT_SYMBOL(do_mmap_pgoff); /* * handle mapping disposal for uClinux */ -static void put_vma(struct vm_area_struct *vma) +static void put_vma(struct mm_struct *mm, struct vm_area_struct *vma) { if (vma) { down_write(&nommu_vma_sem); @@ -1080,7 +1082,7 @@ static void put_vma(struct vm_area_struc if (vma->vm_file) { fput(vma->vm_file); if (vma->vm_flags & VM_EXECUTABLE) - removed_exe_file_vma(vma->vm_mm); + removed_exe_file_vma(mm); } kfree(vma); } @@ -1118,7 +1120,7 @@ int do_munmap(struct mm_struct *mm, unsi found: vml = *parent; - put_vma(vml->vma); + put_vma(mm, vml->vma); *parent = vml->next; realalloc -= kobjsize(vml); @@ -1163,7 +1165,7 @@ void exit_mmap(struct mm_struct * mm) while ((tmp = mm->context.vmlist)) { mm->context.vmlist = tmp->next; - put_vma(tmp->vma); + put_vma(mm, tmp->vma); realalloc -= kobjsize(tmp); askedalloc -= sizeof(*tmp); _ Patches currently in -mm which might be from matthltc@xxxxxxxxxx are ipc-scale-msgmni-to-the-amount-of-lowmem.patch ipc-scale-msgmni-to-the-number-of-ipc-namespaces.patch ipc-define-the-slab_memory_callback-priority-as-a-constant.patch ipc-recompute-msgmni-on-memory-add--remove.patch ipc-invoke-the-ipcns-notifier-chain-as-a-work-item.patch ipc-recompute-msgmni-on-ipc-namespace-creation-removal.patch ipc-do-not-recompute-msgmni-anymore-if-explicitly-set-by-user.patch ipc-re-enable-msgmni-automatic-recomputing-msgmni-if-set-to-negative.patch procfs-task-exe-symlink.patch procfs-task-exe-symlink-fix-2.patch procfs-task-exe-symlink-fix-3.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html