diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2015-08-25 14:21:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-08-25 14:21:36 +1000 |
| commit | 3ccbaa9e0c1a8f6fdd7edac7292e7360068589ac (patch) | |
| tree | ad61d26af6b81ae99565cb876888aa1604c04bcd | |
| parent | 81a2e48b5aeca9fd2edbf3d192096a269a8d0fe9 (diff) | |
| download | linux-3ccbaa9e0c1a8f6fdd7edac7292e7360068589ac.tar.gz linux-3ccbaa9e0c1a8f6fdd7edac7292e7360068589ac.tar.xz | |
kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix
arch/x86/kernel/machine_kexec_64.c:381: error: conflicting types for 'arch_kimage_file_post_load_cleanup' include/linux/kexec.h:326: note: previous declaration of 'arch_kimage_file_post_load_cleanup' was here
Cc: Dave Young <dyoung@redhat.com>
Cc: Josh Boyer <jwboyer@fedoraproject.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | include/linux/kexec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 1305983bbe6e..5820323f1108 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -321,7 +321,7 @@ void crash_free_reserved_phys_range(unsigned long begin, unsigned long end); int __weak arch_kexec_kernel_image_probe(struct kimage *image, void *buf, unsigned long buf_len); void * __weak arch_kexec_kernel_image_load(struct kimage *image); -void __weak arch_kimage_file_post_load_cleanup(struct kimage *image); +int __weak arch_kimage_file_post_load_cleanup(struct kimage *image); int __weak arch_kexec_kernel_verify_sig(struct kimage *image, void *buf, unsigned long buf_len); int __weak arch_kexec_apply_relocations_add(const Elf_Ehdr *ehdr, |