diff --git a/[refs] b/[refs] index 9f23ae9488bd..c984ab0fc553 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1d82698029b92a88f5500b99f66514b6dee2bc3 +refs/heads/master: 7fccf0326536c1b245b98740d489abb9aab69a12 diff --git a/trunk/kernel/kexec.c b/trunk/kernel/kexec.c index 1c5fcacbcf33..6db42ff8d520 100644 --- a/trunk/kernel/kexec.c +++ b/trunk/kernel/kexec.c @@ -589,14 +589,12 @@ static void kimage_free_extra_pages(struct kimage *image) 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 long entry, unsigned long nr_segments, 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);