From 87eca9c88562e90d811dc7bb7227e6a1395f4b2f Mon Sep 17 00:00:00 2001 From: Naoya Horiguchi Date: Wed, 17 Apr 2013 15:58:28 -0700 Subject: [PATCH] --- yaml --- r: 362594 b: refs/heads/master c: 23d9e482136e31c9d287633a6e473daa172767c4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/binfmt_elf.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 61ddabc66948..ef564fdf8b1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2fce9143057f4eb7675a21cca1b6beabe585c8b +refs/heads/master: 23d9e482136e31c9d287633a6e473daa172767c4 diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c index 3939829f6c5c..86af964c2425 100644 --- a/trunk/fs/binfmt_elf.c +++ b/trunk/fs/binfmt_elf.c @@ -1137,6 +1137,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma, goto whole; if (!(vma->vm_flags & VM_SHARED) && FILTER(HUGETLB_PRIVATE)) goto whole; + return 0; } /* Do not dump I/O mapped devices or special mappings */