Merge branch 'linus'

1 files changed, 1 insertions, 9 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 47556d2b3e90..0eb9894db6de 100644
--- a/mm/mmap.c
+++ b/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)