linux-next: build failure after merge of the powerpc-mpe tree

[Stephen Rothwell]

Hi all,

After merging the powerpc-mpe tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:


In file included from arch/powerpc/platforms/powernv/setup.c:36:0:
arch/powerpc/include/asm/opal.h:214:17: error: 'enum OpalMessageType' declared inside parameter list [-Werror]
          struct notifier_block *nb);
                 ^

Caused by commit d7cf83fcaf1b ("powerpc/powernv: Move opal-api.h closer
to the Skiboot version") interacting with commit b921e90260ce
("powerpc/powernv: Add OPAL message notifier unregister function") from
the powerpc tree.

I have added the following merge fix patch:

From: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Thu, 26 Mar 2015 13:25:58 +1100
Subject: [PATCH] powerpc/powernv: fix for OpalMessageType name change

Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
---
 arch/powerpc/include/asm/opal.h       | 2 +-
 arch/powerpc/platforms/powernv/opal.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index d430ec7e60c6..c08de77f398a 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -210,7 +210,7 @@ extern int opal_notifier_unregister(struct notifier_block *nb);
 
 extern int opal_message_notifier_register(enum opal_msg_type msg_type,
 						struct notifier_block *nb);
-extern int opal_message_notifier_unregister(enum OpalMessageType msg_type,
+extern int opal_message_notifier_unregister(enum opal_msg_type msg_type,
 					    struct notifier_block *nb);
 extern void opal_notifier_enable(void);
 extern void opal_notifier_disable(void);
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index 2c590e69a928..d403b2b08626 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -318,7 +318,7 @@ int opal_message_notifier_register(enum opal_msg_type msg_type,
 				&opal_msg_notifier_head[msg_type], nb);
 }
 
-int opal_message_notifier_unregister(enum OpalMessageType msg_type,
+int opal_message_notifier_unregister(enum opal_msg_type msg_type,
 				     struct notifier_block *nb)
 {
 	return atomic_notifier_chain_unregister(
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20150326/eceabf73/attachment.sig>