mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-11-20 08:38:24 +08:00
kernel/kexec.c: make 'kimage_terminate' void
Since kimage_terminate() always returns 0, make it void. Signed-off-by: WANG Cong <wangcong@zeuux.org> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
f1d8269802
commit
7fccf03265
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user