Re: Compile fix for 4xx (linuxppc_2_4_devel)

Re: Compile fix for 4xx (linuxppc_2_4_devel)

[Pete Smithers]

> This fixes compile on 4xx machines, which was broken by the recent
> heartbeat changes.  Please apply.
>
> [...]
> --- /home/dgibson/kernel/linuxppc_2_4_devel/arch/ppc/kernel/ppc4xx_setup.c	2002-08-05 10:37:17.000000000 +1000
> +++ linux-grinch/arch/ppc/kernel/ppc4xx_setup.c	2002-08-19 15:05:01.000000000 +1000
> @@ -415,7 +415,7 @@
>  #ifdef CONFIG_PPC405_WDT
>  	ppc_md.heartbeat = ppc4xx_wdt_heartbeat;

of course this one has to be changes as well

Pete
--


** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/

Compile fix for 4xx (linuxppc_2_4_devel)

[David Gibson]

This fixes compile on 4xx machines, which was broken by the recent
heartbeat changes.  Please apply.

diff -urN /home/dgibson/kernel/linuxppc_2_4_devel/arch/ppc/kernel/ppc4xx_setup.c linux-grinch/arch/ppc/kernel/ppc4xx_setup.c
--- /home/dgibson/kernel/linuxppc_2_4_devel/arch/ppc/kernel/ppc4xx_setup.c	2002-08-05 10:37:17.000000000 +1000
+++ linux-grinch/arch/ppc/kernel/ppc4xx_setup.c	2002-08-19 15:05:01.000000000 +1000
@@ -415,7 +415,7 @@
 #ifdef CONFIG_PPC405_WDT
 	ppc_md.heartbeat = ppc4xx_wdt_heartbeat;
 #endif
-	ppc_md.heartbeat_count = 0;
+	ppc_md.heartbeat_count[0] = 0;

 	ppc_md.find_end_of_memory = ppc4xx_find_end_of_memory;
 	ppc_md.setup_io_mappings = m4xx_map_io;


--
David Gibson			| For every complex problem there is a
david@gibson.dropbear.id.au	| solution which is simple, neat and
				| wrong.
http://www.ozlabs.org/people/dgibson

** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/

Re: Compile fix for 4xx (linuxppc_2_4_devel)

[Tom Rini]

On Tue, Aug 20, 2002 at 10:45:00AM +1000, David Gibson wrote:

> This fixes compile on 4xx machines, which was broken by the recent
> heartbeat changes.  Please apply.

Actually, I'd rather keep it broken until either no one comments on
Milton's continued patching of this code (and it's implicitily OK'ed,
and myself or Troy will commit it), or there's comments on his changes
and ....

--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/

Re: Compile fix for 4xx (linuxppc_2_4_devel)

[Cort Dougan]

I can submit patches to break other ports if you'd like that, as well.

} Actually, I'd rather keep it broken until either no one comments on
} Milton's continued patching of this code (and it's implicitily OK'ed,
} and myself or Troy will commit it), or there's comments on his changes
} and ....

** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/

Re: Compile fix for 4xx (linuxppc_2_4_devel)

[Tom Rini]

On Tue, Aug 20, 2002 at 02:47:07PM -0600, Cort Dougan wrote:

> } Actually, I'd rather keep it broken until either no one comments on
> } Milton's continued patching of this code (and it's implicitily OK'ed,
> } and myself or Troy will commit it), or there's comments on his changes
> } and ....
>
> I can submit patches to break other ports if you'd like that, as well.

Well, since what Troy commited came from you, IIRC, you already have. :)

But seriously, I'd rather not apply a fix for one port that still leaves
other ports broken.  Milton's patch fixes 4xx, as well as CHRP (which is
currently unhappy) along with the cleanups introduced in what he did.

--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/