* linux-next: build failure after merge of the powerpc-mpe tree
@ 2015-03-26 2:29 Stephen Rothwell
2015-03-26 2:35 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2015-03-26 2:29 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, linuxppc-dev
Cc: linux-next, linux-kernel, Neelesh Gupta
[-- Attachment #1: Type: text/plain, Size: 2350 bytes --]
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@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@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@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: linux-next: build failure after merge of the powerpc-mpe tree
2015-03-26 2:29 linux-next: build failure after merge of the powerpc-mpe tree Stephen Rothwell
@ 2015-03-26 2:35 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2015-03-26 2:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michael Ellerman, linuxppc-dev, linux-next, linux-kernel, Neelesh Gupta
On Thu, 2015-03-26 at 13:29 +1100, Stephen Rothwell wrote:
> 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:
Michael, you can pull my next-misc branch and apply this fix to the
merge commit to avoid bisection breakage.
Cheers,
Ben.
> From: Stephen Rothwell <sfr@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@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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: build failure after merge of the powerpc-mpe tree
2015-04-10 10:02 Stephen Rothwell
@ 2015-04-11 10:39 ` Michael Ellerman
0 siblings, 0 replies; 4+ messages in thread
From: Michael Ellerman @ 2015-04-11 10:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Benjamin Herrenschmidt, linuxppc-dev, Andrew Morton, linux-next,
linux-kernel
On Fri, 2015-04-10 at 20:02 +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the powerpc-mpe tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> mm/gup.c: In function 'gup_pte_range':
> mm/gup.c:904:3: error: conversion to non-scalar type requested
> pte_t pte = ACCESS_ONCE(*ptep);
> ^
> mm/gup.c: In function '__get_user_pages_fast':
> mm/gup.c:1194:3: error: conversion to non-scalar type requested
> pgd_t pgd = ACCESS_ONCE(*pgdp);
> ^
>
> Caused by commit 4bcad5b3b3ea ("powerpc: Make STRICT_MM_TYPECHECKS a
> config option").
>
> I have reverted that commit for today.
I've dropped it from my tree for now.
You can kill me on Monday.
cheers
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: build failure after merge of the powerpc-mpe tree
@ 2015-04-10 10:02 Stephen Rothwell
2015-04-11 10:39 ` Michael Ellerman
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2015-04-10 10:02 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, linuxppc-dev, Andrew Morton
Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 624 bytes --]
Hi all,
After merging the powerpc-mpe tree, today's linux-next build (powerpc
allyesconfig) failed like this:
mm/gup.c: In function 'gup_pte_range':
mm/gup.c:904:3: error: conversion to non-scalar type requested
pte_t pte = ACCESS_ONCE(*ptep);
^
mm/gup.c: In function '__get_user_pages_fast':
mm/gup.c:1194:3: error: conversion to non-scalar type requested
pgd_t pgd = ACCESS_ONCE(*pgdp);
^
Caused by commit 4bcad5b3b3ea ("powerpc: Make STRICT_MM_TYPECHECKS a
config option").
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-04-11 10:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-26 2:29 linux-next: build failure after merge of the powerpc-mpe tree Stephen Rothwell
2015-03-26 2:35 ` Benjamin Herrenschmidt
2015-04-10 10:02 Stephen Rothwell
2015-04-11 10:39 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).