skb: api to report errors for zero copy skbs

[~andy/linux] / fs / binfmt_elf.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 28a64e76952788146d24b4fe0e0069918c0b9584..fbd9f60bd763310c452a08dbb34fc8bbf2515560 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -36,7 +36,6 @@
 #include <asm/uaccess.h>
 #include <asm/param.h>
 #include <asm/page.h>
-#include <asm/exec.h>
 
 #ifndef user_long_t
 #define user_long_t long
@@ -1123,7 +1122,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
        if (always_dump_vma(vma))
                goto whole;
 
-       if (vma->vm_flags & VM_NODUMP)
+       if (vma->vm_flags & VM_DONTDUMP)
                return 0;
 
        /* Hugetlb memory check */
@@ -1135,7 +1134,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
        }
 
        /* Do not dump I/O mapped devices or special mappings */
-       if (vma->vm_flags & (VM_IO | VM_RESERVED))
+       if (vma->vm_flags & VM_IO)
                return 0;
 
        /* By default, dump shared memory if mapped from an anonymous file. */