Skip to content

Commit

Permalink
kernel/kexec.c: make 'kimage_terminate' void
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
WANG Cong authored and Linus Torvalds committed Jul 26, 2008
1 parent f1d8269 commit 7fccf03
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions kernel/kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 7fccf03

Please sign in to comment.