From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from nf-out-0910.google.com ([64.233.182.185]) by bombadil.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux)) id 1KBBer-0008If-Lm for kexec@lists.infradead.org; Tue, 24 Jun 2008 16:46:17 +0000 Received: by nf-out-0910.google.com with SMTP id d21so28420nfb.22 for ; Tue, 24 Jun 2008 09:46:16 -0700 (PDT) Date: Tue, 24 Jun 2008 17:42:40 +0100 From: WANG Cong Subject: [Patch] kernel/kexec.c: make 'kimage_terminate' void Message-ID: <20080624164240.GF10512@hack.voiplan.pt> MIME-Version: 1.0 Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: kexec-bounces@lists.infradead.org Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: LKML Cc: kexec@lists.infradead.org, ebiederm@xmission.com Since kimage_terminate() always returns 0, make it void. Signed-off-by: WANG Cong Cc: Eric Biederman --- 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); _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec