[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <m14p7iy8up.fsf@frodo.ebiederm.org>
Date: Tue, 24 Jun 2008 11:40:46 -0700
From: ebiederm@...ssion.com (Eric W. Biederman)
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: LKML <linux-kernel@...r.kernel.org>, kexec@...ts.infradead.org,
WANG Cong <xiyou.wangcong@...il.com>
Subject: Re: [Patch] kernel/kexec.c: make 'kimage_terminate' void
From: WANG Cong <xiyou.wangcong@...il.com>
Since kimage_terminate() always returns 0, make it void.
Signed-off-by: WANG Cong <wangcong@...ux.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@...ssion.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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists