Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fccf032 authored by WANG Cong's avatar WANG Cong Committed by Linus Torvalds
Browse files

kernel/kexec.c: make 'kimage_terminate' void 



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

Signed-off-by: default avatarWANG Cong <wangcong@zeuux.org>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f1d82698

kernel/kexec.c

+2 −6
Original line number Diff line number Diff line
@@ -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);