The patch titled kernel/kexec.c: make 'kimage_terminate' void has been added to the -mm tree. Its filename is kernel-kexecc-make-kimage_terminate-void.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: kernel/kexec.c: make 'kimage_terminate' void From: WANG Cong <xiyou.wangcong@xxxxxxxxx> Since kimage_terminate() always returns 0, make it void. Signed-off-by: WANG Cong <wangcong@xxxxxxxxx> Signed-off-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/kexec.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff -puN kernel/kexec.c~kernel-kexecc-make-kimage_terminate-void kernel/kexec.c --- a/kernel/kexec.c~kernel-kexecc-make-kimage_terminate-void +++ a/kernel/kexec.c @@ -589,14 +589,12 @@ static void kimage_free_extra_pages(stru kimage_free_page_list(&image->unuseable_pages); } -static int kimage_terminate(struct kimage *image) +static void kimage_terminate(struct kimage *image) { if (*image->entry != 0) image->entry++; *image->entry = IND_DONE; - - return 0; } #define for_each_kimage_entry(image, ptr, entry) \ @@ -997,9 +995,7 @@ asmlinkage long sys_kexec_load(unsigned if (result) goto out; } - result = kimage_terminate(image); - if (result) - goto out; + kimage_terminate(image); } /* Install the new kernel, and Uninstall the old */ image = xchg(dest_image, image); _ Patches currently in -mm which might be from xiyou.wangcong@xxxxxxxxx are arch-um-kernel-irqc-clean-up-some-functions.patch arch-um-kernel-memc-remove-arch_validate.patch uml-make-several-more-things-static.patch kernel-kexecc-make-kimage_terminate-void.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