[PATCH] Use return value of count_dyn_reconf_memory_ranges()

Bernhard Walle bwalle at suse.de
Thu Oct 9 13:01:25 EDT 2008


This patch fixes the build error

    kexec/arch/ppc64/kexec-ppc64.c:140: \
        warning: control reaches end of non-void function

The patch returns 0 on success, and checks when the function is called
for a non-zero value.


Signed-off-by: Bernhard Walle <bwalle at suse.de>
---
 kexec/arch/ppc64/kexec-ppc64.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/kexec/arch/ppc64/kexec-ppc64.c b/kexec/arch/ppc64/kexec-ppc64.c
index 40258b7..069a9fc 100644
--- a/kexec/arch/ppc64/kexec-ppc64.c
+++ b/kexec/arch/ppc64/kexec-ppc64.c
@@ -137,6 +137,8 @@ static int count_dyn_reconf_memory_ranges(void)
 	num_of_lmbs = ((unsigned int *)buf)[0];
 	max_memory_ranges += num_of_lmbs;
 	fclose(file);
+
+	return 0;
 }
 
 /*
@@ -158,7 +160,8 @@ static int count_memory_ranges(void)
 	while ((dentry = readdir(dir)) != NULL) {
 		if (!strncmp(dentry->d_name,
 				"ibm,dynamic-reconfiguration-memory", 35)){
-			count_dyn_reconf_memory_ranges();
+			if (count_dyn_reconf_memory_ranges() != 0)
+				return -1;
 			continue;
 		}
 
-- 
1.6.0.2




More information about the kexec mailing list