On Sat, Apr 24, Christoph Hellwig wrote:
> On Sat, Apr 24, 2004 at 05:02:51PM +1000, Benjamin Herrenschmidt wrote:
> > Hi Sven !
> >
> > The current CDs won't boot a G5 with the -power4 option. The problem
> > is that the kernel contains legacy drivers (8250 serial, etc...) that
> > are fine for IBM POWER4 hardware, but will lockup a G5. You really need
> > different kernel images for now.
>
> Sure seems to have lots of little patches to check the ppc subarch in
> all those drivers. Any plan to get them into mainline while we're at
> it.
and that one is needed for g5 as well. Ben, that one is for you.
diff -p -purN R/linux-2.6.3/drivers/macintosh/adb.c
linux-2.6.3/drivers/macintosh/adb.c
--- R/linux-2.6.3/drivers/macintosh/adb.c 2004-02-18 04:59:56.000000000
+0100
+++ linux-2.6.3/drivers/macintosh/adb.c 2004-02-22 15:16:43.000000000 +0100
@@ -294,6 +294,10 @@ int __init adb_init(void)
if ( (_machine != _MACH_chrp) && (_machine != _MACH_Pmac) )
return 0;
#endif
+#ifdef CONFIG_PPC64
+ if (_machine != _MACH_Pmac)
+ return 0;
+#endif
#ifdef CONFIG_MAC
if (!MACH_IS_MAC)
return 0;
diff -p -purN R/linux-2.6.3/drivers/macintosh/adbhid.c
linux-2.6.3/drivers/macintosh/adbhid.c
--- R/linux-2.6.3/drivers/macintosh/adbhid.c 2004-02-18 04:59:57.000000000
+0100
+++ linux-2.6.3/drivers/macintosh/adbhid.c 2004-02-22 15:41:34.000000000
+0100
@@ -1021,10 +1021,14 @@ init_ms_a3(int id)
static int __init adbhid_init(void)
{
-#ifndef CONFIG_MAC
+#ifdef CONFIG_PPC32
if ( (_machine != _MACH_chrp) && (_machine != _MACH_Pmac) )
return 0;
#endif
+#ifdef CONFIG_PPC64
+ if (_machine != _MACH_Pmac)
+ return 0;
+#endif
led_request.complete = 1;
--
USB is for mice, FireWire is for men!
sUse lINUX ag, nÜRNBERG
