Re: Compile failure: 2.2.19 + eide patch on PPC

[Mike Fedyk <mfedyk@matchmail.com>]

On Tue, Aug 07, 2001 at 02:43:53PM -0500, Phil Brutsche wrote:
> A long time ago, in a galaxy far, far way, someone said...
> 
> > I am trying to compile 2.2.19 + ide.2.2.19.05042001.patch.  When doing this,
> > I get the errors below.
> >
> > I've also tried:
> > ide.2.2.19.03252001.patch
> > ide.2.2.19.04092001.patch
> 
> These patches are broken for PPC machines and have been for some time.  I
> suppose I should file a bug report...
> 
> It's simple enough to fix however.
> 


> You need an
> 
> #include <linux/ide.h>
> 
> before the
> 
> #include <asm/ide.h>
> 
> in ll_rw_blk.c.
> 
> Lines 27-30 of ll_rw_blk.c would end up looking like this:
> 
> #ifdef CONFIG_POWERMAC
> #include <linux/ide.h>
> #include <asm/ide.h>
> #endif
>

Ok, I've applied this, and also saved the changes in diff -u format:

--- 2.2.19-ide-05042001/drivers/block/ll_rw_blk.c~	Tue Aug  7 15:34:29 2001
+++ 2.2.19-ide-05042001/drivers/block/ll_rw_blk.c	Tue Aug  7 15:50:08 2001
@@ -25,6 +25,7 @@
 #include <linux/blk.h>
 
 #ifdef CONFIG_POWERMAC
+#include <linux/ide.h>
 #include <asm/ide.h>
 #endif
 
> Note that you will need the PCI fixup patch from
> http://www.cpu.lu/~mlan/linux/dev/pci.html if you want to be able to use a
> PCI IDE controller card, like the Promise Ultra33/Ultra66/Ultra100, in
> your PowerMac.  It seems that the PCI resources won't get seupt correctly
> by OpenFirmware otherwise.

I have three patches applied:
ide.2.2.19.05042001.patch.bz2
2.2.18-pci.diff.bz2 (applies with only one hunk shifted, no rejects on 2.2.19)
ide-fix.diff (The above diff you described)

> There are a number of other compilation problems in the code that will
> need similar "fixes".
> 

I still get this same error below:

> > # gcc -v
> > Reading specs from /usr/lib/gcc-lib/powerpc-linux/2.95.2/specs
> > gcc version 2.95.2 20000220 (Debian GNU/Linux)
> >
> > Error:
> > make[3]: Entering directory /usr/src/lk2.2/2.2.19-ide-05042001/drivers/block'
> > cc -D__KERNEL__ -I/usr/src/lk2.2/2.2.19-ide-05042001/include -Wall
> > -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strict-aliasing
> > -D__powerpc__ -fsigned-char -msoft-float -pipe -fno-builtin -ffixed-r2
> > -Wno-uninitialized -mmultiple -mstring   -DEXPORT_SYMTAB -c ll_rw_blk.c
> > In file included from ll_rw_blk.c:28:
> > /usr/src/lk2.2/2.2.19-ide-05042001/include/asm/ide.h:53: parse error before *'
> > /usr/src/lk2.2/2.2.19-ide-05042001/include/asm/ide.h:56: warning: function
> > declaration isn't a prototype
> 

Is LKML the best place for this question, or should I look for a PPC
specific list?  If so, can someone point me in the right direction?

Mike