leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel/kexec.c: make 'kimage_terminate' void

Browse Source 
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:
WANG Cong 2008-07-25 19:45:02 -07:00 committed by Linus Torvalds
parent f1d8269802
commit 7fccf03265
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/kexec.c
View File

@ -589,14 +589,12 @@ static void kimage_free_extra_pages(struct kimage *image)
kimage_free_page_list(&image->unuseable_pages); 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) if (*image->entry != 0)
image->entry++; image->entry++;
*image->entry = IND_DONE; *image->entry = IND_DONE;
return 0;
} }
#define for_each_kimage_entry(image, ptr, entry) \ #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) if (result)
goto out; goto out;
} }
result = kimage_terminate(image); kimage_terminate(image);
if (result)
goto out;
} }
/* Install the new kernel, and Uninstall the old */ /* Install the new kernel, and Uninstall the old */
image = xchg(dest_image, image); image = xchg(dest_image, image);