[folded-merged] kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix
has been removed from the -mm tree.  Its filename was
     kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix.patch

This patch was dropped because it was folded into kexec-split-kexec_file-syscall-code-to-kexec_filec.patch

------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Cc: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/linux/kexec.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN include/linux/kexec.h~kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix include/linux/kexec.h
--- a/include/linux/kexec.h~kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix
+++ a/include/linux/kexec.h
@@ -321,7 +321,7 @@ void crash_free_reserved_phys_range(unsi
 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,
_

Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are

procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix-fix.patch
kexec-split-kexec_file-syscall-code-to-kexec_filec.patch
kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix-fix.patch
kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes.patch
align-crash_notes-allocation-to-make-it-be-inside-one-physical-page-fix.patch
mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux