diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2008-07-25 19:45:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 12:00:04 -0700 |
| commit | 7fccf0326536c1b245b98740d489abb9aab69a12 (patch) | |
| tree | 33344d665a3927d97e105351308b2d425ddd0749 | |
| parent | f1d82698029b92a88f5500b99f66514b6dee2bc3 (diff) | |
| download | linux-7fccf0326536c1b245b98740d489abb9aab69a12.tar.gz linux-7fccf0326536c1b245b98740d489abb9aab69a12.tar.bz2 linux-7fccf0326536c1b245b98740d489abb9aab69a12.zip | |
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.c | 8 |
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) 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); |