Re: Linux 2.4.21-pre7

[mikpe@csd.uu.se]

Kaj-Michael Lang writes:
 > > So here goes -pre7. Hopefully the last -pre.
 > >
 > Won't compile for my PPC:
 > ---
 >         -o vmlinux
 > drivers/ide/idedriver.o(.text+0x1a544): In function `pmac_outbsync':
 > : undefined reference to `io_flush'
 > drivers/ide/idedriver.o(.text+0x1a544): In function `pmac_outbsync':
 > : relocation truncated to fit: R_PPC_REL24 io_flush

Someone updated pmac.c without testing it: io_flush() doesn't exist
in 2.4.21-pre. Based on the diff from -pre6 to -pre7, I'd say the
following is a reasonable approximation. My PM4400 runs with this
patch right now.

/Mikael

--- linux-2.4.21-pre7/drivers/ide/ppc/pmac.c.~1~	Wed Apr  9 10:33:30 2003
+++ linux-2.4.21-pre7/drivers/ide/ppc/pmac.c	Wed Apr  9 11:37:16 2003
@@ -50,6 +50,8 @@
 #undef IDE_PMAC_DEBUG
 #define DMA_WAIT_TIMEOUT	500
 
+#define io_flush(x) (void)(x)
+
 typedef struct pmac_ide_hwif {
 	ide_ioreg_t			regbase;
 	unsigned long			mapbase;