From 133d66962e99b1f2f1e0f4bd0b47a2d5083cdba4 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Wed, 22 Mar 2006 00:08:29 -0800 Subject: [PATCH] --- yaml --- r: 22467 b: refs/heads/master c: a6f563db09c54c80d80e9013182dc512a5e53d0f h: refs/heads/master i: 22465: aceee1ee94cd49a142e8f8283abaea05439ed922 22463: e2472809f05790c6246473742d3cb38c12996b3f v: v3 --- [refs] | 2 +- trunk/mm/mmap.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 923b77d18369..b0207fb21090 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb8d14e172a29ba5ac69a73b61196be86fdfc3e1 +refs/heads/master: a6f563db09c54c80d80e9013182dc512a5e53d0f diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c index 47556d2b3e90..0eb9894db6de 100644 --- a/trunk/mm/mmap.c +++ b/trunk/mm/mmap.c @@ -612,7 +612,7 @@ again: remove_next = 1 + (end > next->vm_end); * If the vma has a ->close operation then the driver probably needs to release * per-vma resources, so we don't attempt to merge those. */ -#define VM_SPECIAL (VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_PFNMAP) +#define VM_SPECIAL (VM_IO | VM_DONTEXPAND | VM_RESERVED | VM_PFNMAP) static inline int is_mergeable_vma(struct vm_area_struct *vma, struct file *file, unsigned long vm_flags) @@ -845,14 +845,6 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags, const unsigned long stack_flags = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN); -#ifdef CONFIG_HUGETLB - if (flags & VM_HUGETLB) { - if (!(flags & VM_DONTCOPY)) - mm->shared_vm += pages; - return; - } -#endif /* CONFIG_HUGETLB */ - if (file) { mm->shared_vm += pages; if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)