projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'gpio-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
proc
/
vmcore.c
diff --git
a/fs/proc/vmcore.c
b/fs/proc/vmcore.c
index 88d4585b30f1531b6e609825315d0868cc2edbe6..6a8e785b29da9d39f8cc258087fff94e3ef16af9 100644
(file)
--- a/
fs/proc/vmcore.c
+++ b/
fs/proc/vmcore.c
@@
-484,7
+484,6
@@
static int __init update_note_header_size_elf64(const Elf64_Ehdr *ehdr_ptr)
phdr_ptr->p_memsz = real_sz;
if (real_sz == 0) {
pr_warn("Warning: Zero PT_NOTE entries found\n");
phdr_ptr->p_memsz = real_sz;
if (real_sz == 0) {
pr_warn("Warning: Zero PT_NOTE entries found\n");
- return -EINVAL;
}
}
}
}
@@
-671,7
+670,6
@@
static int __init update_note_header_size_elf32(const Elf32_Ehdr *ehdr_ptr)
phdr_ptr->p_memsz = real_sz;
if (real_sz == 0) {
pr_warn("Warning: Zero PT_NOTE entries found\n");
phdr_ptr->p_memsz = real_sz;
if (real_sz == 0) {
pr_warn("Warning: Zero PT_NOTE entries found\n");
- return -EINVAL;
}
}
}
}
@@
-1118,4
+1116,3
@@
void vmcore_cleanup(void)
}
free_elfcorebuf();
}
}
free_elfcorebuf();
}
-EXPORT_SYMBOL_GPL(vmcore_cleanup);