[Skiboot] [PATCH] external/opal-prd: fix compile error

Cédric Le Goater clg at fr.ibm.com
Mon Apr 13 23:10:37 AEST 2015


   CC  opal-prd.o
opal-prd.c:705:12: error: conflicting types for ‘prd_init’
 static int prd_init(struct opal_prd_ctx *ctx)
            ^
In file included from ../../include/opal-internal.h:22:0,
                 from ../../include/opal.h:22,
                 from opal-prd.c:46:
../../include/skiboot.h:235:13: note: previous declaration of ‘prd_init’ was here
 extern void prd_init(void);
             ^
Makefile:40: recipe for target 'opal-prd.o' failed

Signed-off-by: Cédric Le Goater <clg at fr.ibm.com>
---

 That's the quick and easy way. The alternative would be to rework the
 includes.

 external/opal-prd/opal-prd.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: skiboot.git/external/opal-prd/opal-prd.c
===================================================================
--- skiboot.git.orig/external/opal-prd/opal-prd.c
+++ skiboot.git/external/opal-prd/opal-prd.c
@@ -702,7 +702,7 @@ static void dump_hbrt_map(struct opal_pr
 		pr_debug("IMAGE: dumped HBRT binary to %s", dump_name);
 }
 
-static int prd_init(struct opal_prd_ctx *ctx)
+static int prd_open(struct opal_prd_ctx *ctx)
 {
 	int rc;
 
@@ -1024,7 +1024,7 @@ static int run_prd_daemon(struct opal_pr
 	}
 
 
-	rc = prd_init(ctx);
+	rc = prd_open(ctx);
 	if (rc) {
 		pr_log(LOG_ERR, "FW: Error initialising PRD channel");
 		goto out_close;



More information about the Skiboot mailing list