From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from outbound-cpk.frontbridge.com ([207.46.163.16] helo=outbound2-cpk-R.bigfish.com) by pentafluge.infradead.org with esmtps (Exim 4.63 #1 (Red Hat Linux)) id 1Hla7c-0003gc-3g for kexec@lists.infradead.org; Wed, 09 May 2007 01:33:37 +0100 Message-ID: <464116D2.2000101@am.sony.com> Date: Tue, 08 May 2007 17:33:22 -0700 From: Geoff Levand MIME-Version: 1.0 Subject: [patch 2/2] kexec fix prototypes for ppc64 References: <20070507235727.631477448@am.sony.com>> <463FBE30.8080500@am.sony.com> <20070508023811.GA8170@verge.net.au> In-Reply-To: <20070508023811.GA8170@verge.net.au> 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+dwmw2=infradead.org@lists.infradead.org To: Simon Horman Cc: kexec@lists.infradead.org Fixup the ppc64 files to remove warnings generated by the -Wstrict-prototypes compiler flag. Signed-off-by: Geoff Levand --- kexec/arch/ppc64/kexec-ppc64.c | 61 +++++++++++++++++++---------------------- --- kexec-tools-hacked.orig/kexec/arch/ppc64/kexec-ppc64.c +++ kexec-tools-hacked/kexec/arch/ppc64/kexec-ppc64.c @@ -45,10 +45,7 @@ unsigned long long crash_base, crash_siz unsigned int rtas_base, rtas_size; int max_memory_ranges; -static int sort_base_ranges(); - - -static void cleanup_memory_ranges() +static void cleanup_memory_ranges(void) { if (memory_range) free(memory_range); @@ -64,7 +61,7 @@ static void cleanup_memory_ranges() * Allocate memory for various data structures used to hold * values of different memory ranges */ -static int alloc_memory_ranges() +static int alloc_memory_ranges(void) { int memory_range_len; @@ -105,7 +102,7 @@ err1: * max_memory_ranges variable. This variable replaces MAX_MEMORY_RANGES * macro used earlier. */ -static int count_memory_ranges() +static int count_memory_ranges(void) { char device_tree[256] = "/proc/device-tree/"; struct dirent *dentry; @@ -132,8 +129,32 @@ static int count_memory_ranges() return 0; } +/* Sort the base ranges in memory - this is useful for ensuring that our + * ranges are in ascending order, even if device-tree read of memory nodes + * is done differently. Also, could be used for other range coalescing later + */ +static int sort_base_ranges(void) +{ + int i, j; + unsigned long long tstart, tend; + + for (i = 0; i < nr_memory_ranges - 1; i++) { + for (j = 0; j < nr_memory_ranges - i - 1; j++) { + if (base_memory_range[j].start > base_memory_range[j+1].start) { + tstart = base_memory_range[j].start; + tend = base_memory_range[j].end; + base_memory_range[j].start = base_memory_range[j+1].start; + base_memory_range[j].end = base_memory_range[j+1].end; + base_memory_range[j+1].start = tstart; + base_memory_range[j+1].end = tend; + } + } + } + return 0; +} + /* Get base memory ranges */ -static int get_base_ranges() +static int get_base_ranges(void) { int local_memory_ranges = 0; char device_tree[256] = "/proc/device-tree/"; @@ -204,32 +225,8 @@ static int get_base_ranges() return 0; } -/* Sort the base ranges in memory - this is useful for ensuring that our - * ranges are in ascending order, even if device-tree read of memory nodes - * is done differently. Also, could be used for other range coalescing later - */ -static int sort_base_ranges() -{ - int i, j; - unsigned long long tstart, tend; - - for (i = 0; i < nr_memory_ranges - 1; i++) { - for (j = 0; j < nr_memory_ranges - i - 1; j++) { - if (base_memory_range[j].start > base_memory_range[j+1].start) { - tstart = base_memory_range[j].start; - tend = base_memory_range[j].end; - base_memory_range[j].start = base_memory_range[j+1].start; - base_memory_range[j].end = base_memory_range[j+1].end; - base_memory_range[j+1].start = tstart; - base_memory_range[j+1].end = tend; - } - } - } - return 0; -} - /* Sort the exclude ranges in memory */ -static int sort_ranges() +static int sort_ranges(void) { int i, j; unsigned long long tstart, tend; _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec