[Patch] kernel/kexec.c: make 'kimage_terminate' void

Eric W. Biederman ebiederm at xmission.com
Tue Jun 24 14:40:46 EDT 2008


From: WANG Cong <xiyou.wangcong at gmail.com>

Since kimage_terminate() always returns 0, make it void.

Signed-off-by: WANG Cong <wangcong at zeuux.org>
Signed-off-by: "Eric W. Biederman" <ebiederm at xmission.com>

---
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 1c5fcac..6db42ff 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);



More information about the kexec mailing list