2005-03-21 15:19:18

by Mikael Pettersson

Subject: [PATCH][2.6.12-rc1-mm1] fix compile error in ppc64 prom.c

Compiling 2.6.12-rc1-mm1 for ppc64 fails with:

arch/ppc64/kernel/prom.c:1691: error: syntax error before 'prom_reconfig_notifier'
arch/ppc64/kernel/prom.c:1692: error: field name not in record or union initializer
arch/ppc64/kernel/prom.c:1692: error: (near initialization for 'prom_reconfig_nb')
arch/ppc64/kernel/prom.c:1692: warning: initialization makes pointer from integer without a cast
make[1]: *** [arch/ppc64/kernel/prom.o] Error 1
make: *** [arch/ppc64/kernel] Error 2

Fix: repair the obvious syntax error (missing "=").

Signed-off-by: Mikael Pettersson <[email protected]>

--- linux-2.6.12-rc1-mm1/arch/ppc64/kernel/prom.c.~1~ 2005-03-21 14:48:51.000000000 +0100
+++ linux-2.6.12-rc1-mm1/arch/ppc64/kernel/prom.c 2005-03-21 15:14:19.000000000 +0100
@@ -1688,7 +1688,7 @@ static int prom_reconfig_notifier(struct
}

static struct notifier_block prom_reconfig_nb = {
- .notifier_call prom_reconfig_notifier,
+ .notifier_call = prom_reconfig_notifier,
.priority = 10, /* This one needs to run first */
};

2005-03-21 16:45:33

by Nathan Lynch

Subject: Re: [PATCH][2.6.12-rc1-mm1] fix compile error in ppc64 prom.c

On Mon, Mar 21, 2005 at 04:19:01PM +0100, Mikael Pettersson wrote:
> Compiling 2.6.12-rc1-mm1 for ppc64 fails with:
>
> arch/ppc64/kernel/prom.c:1691: error: syntax error before 'prom_reconfig_notifier'
> arch/ppc64/kernel/prom.c:1692: error: field name not in record or union initializer
> arch/ppc64/kernel/prom.c:1692: error: (near initialization for 'prom_reconfig_nb')
> arch/ppc64/kernel/prom.c:1692: warning: initialization makes pointer from integer without a cast
> make[1]: *** [arch/ppc64/kernel/prom.o] Error 1
> make: *** [arch/ppc64/kernel] Error 2
>
> Fix: repair the obvious syntax error (missing "=").

Thanks for the fix; the mistake was mine. Lest Andrew and Paulus
think I'm sending untested patches, the compiler I'm using (gcc
3.3.3-hammer) does not give an error or even a warning. Sorry for the
inconvenience; I'll have to upgrade to a less forgiving version of
gcc.


Nathan

2005-03-21 22:31:49

by Paul Mackerras

Subject: Re: [PATCH][2.6.12-rc1-mm1] fix compile error in ppc64 prom.c

Mikael Pettersson writes:

> Compiling 2.6.12-rc1-mm1 for ppc64 fails with:
>
> arch/ppc64/kernel/prom.c:1691: error: syntax error before 'prom_reconfig_notifier'

Currently prom.c is in a mess because Linus applied the last 2 of 8
patches from Nathan Lynch but not the first 6. :-P

Paul.

2005-03-21 23:02:32

by Nathan Lynch

Subject: Re: [PATCH][2.6.12-rc1-mm1] fix compile error in ppc64 prom.c

On Tue, Mar 22, 2005 at 08:55:15AM +1100, Paul Mackerras wrote:
> Mikael Pettersson writes:
>
> > Compiling 2.6.12-rc1-mm1 for ppc64 fails with:
> >
> > arch/ppc64/kernel/prom.c:1691: error: syntax error before 'prom_reconfig_notifier'
>
> Currently prom.c is in a mess because Linus applied the last 2 of 8
> patches from Nathan Lynch but not the first 6. :-P

Actually, this one is my fault, although unless I'm really missing
something gcc 3.4.2 silently accepts the invalid syntax.

All eight of the patches from the pSeries reconfig series are present
in 2.6.12-rc1-mm1. The error Mikael reported is unrelated to the
state of Linus' tree, and his patch is correct. (The mistake is
present in both versions of the patches which I posted for review on
linuxppc64-dev; nobody caught it.)


Nathan