aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2008-07-25 22:45:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 15:00:04 -0400
commit7fccf0326536c1b245b98740d489abb9aab69a12 (patch)
tree33344d665a3927d97e105351308b2d425ddd0749
parentf1d82698029b92a88f5500b99f66514b6dee2bc3 (diff)
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>
-rw-r--r--kernel/kexec.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 1c5fcacbcf33..6db42ff8d520 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -589,14 +589,12 @@ static void kimage_free_extra_pages(struct kimage *image)
589 kimage_free_page_list(&image->unuseable_pages); 589 kimage_free_page_list(&image->unuseable_pages);
590 590
591} 591}
592static int kimage_terminate(struct kimage *image) 592static void kimage_terminate(struct kimage *image)
593{ 593{
594 if (*image->entry != 0) 594 if (*image->entry != 0)
595 image->entry++; 595 image->entry++;
596 596
597 *image->entry = IND_DONE; 597 *image->entry = IND_DONE;
598
599 return 0;
600} 598}
601 599
602#define for_each_kimage_entry(image, ptr, entry) \ 600#define for_each_kimage_entry(image, ptr, entry) \
@@ -997,9 +995,7 @@ asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments,
997 if (result) 995 if (result)
998 goto out; 996 goto out;
999 } 997 }
1000 result = kimage_terminate(image); 998 kimage_terminate(image);
1001 if (result)
1002 goto out;
1003 } 999 }
1004 /* Install the new kernel, and Uninstall the old */ 1000 /* Install the new kernel, and Uninstall the old */
1005 image = xchg(dest_image, image); 1001 image = xchg(dest_image, image);