1 files changed, 3 insertions, 13 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 47556d2b3e..4f5b570913 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)
@@ -1048,12 +1040,11 @@ munmap_back:
          * specific mapper. the address has already been validated, but
          * not unmapped, but the maps are removed from the list.
          */
-        vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
         if (!vma) {
                 error = -ENOMEM;
                 goto unacct_error;
         }
-        memset(vma, 0, sizeof(*vma));
 
         vma->vm_mm = mm;
         vma->vm_start = addr;
@@ -1904,12 +1895,11 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
         /*
          * create a vma struct for an anonymous mapping
          */
-        vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+        vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
         if (!vma) {
                 vm_unacct_memory(len >> PAGE_SHIFT);
                 return -ENOMEM;
         }
-        memset(vma, 0, sizeof(*vma));
 
         vma->vm_mm = mm;
         vma->vm_start = addr;