diff options
| -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 1c5fcacbcf3..6db42ff8d52 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);  |