Compile fails an Alpha: include/asm/pci.h included from arch/alpha/kernel/setup.c

Compile fails an Alpha: include/asm/pci.h included from arch/alpha/kernel/setup.c

[Jan-Benedict Glaw]

Hi!

Kernel 2.4.5-pre[34] don't compile on Alpha:

In incluse/asm-alpha/pci.h (include during compile of
arch/alpha/kernel/setup.c), there is

    150 static __inline__ int pci_controller_num(struct pci_dev *pdev)
    151 {
    152         struct pci_controller *hose = pdev->sysdata;
    153 
    154         if (hose != NULL)
    155                 return hose->index;
    156 
    157         return -ENXIO;
    158 }

which breaks on line 152:
In file included from arch/alpha/kernel/setup.c:52:
/usr/src/packages/linux-2.4.5-pre4/include/asm/pci.h: In function `pci_controller_num':
/usr/src/packages/linux-2.4.5-pre4/include/asm/pci.h:152: dereferencing pointer to incomplete type
make: *** [arch/alpha/kernel/setup.o] Error 1

MfG, JBG

-- 
Fehler eingestehen, Größe zeigen: Nehmt die Rechtschreibreform zurück!!!
/* Jan-Benedict Glaw <jbglaw@lug-owl.de> -- +49-172-7608481 */
keyID=0x8399E1BB fingerprint=250D 3BCF 7127 0D8C A444 A961 1DBD 5E75 8399 E1BB
     "insmod vi.o and there we go..." (Alexander Viro on linux-kernel)

Re: Compile fails an Alpha: include/asm/pci.h included from arch/alpha/kernel/setup.c

[Jeff Garzik]

Jan-Benedict Glaw wrote:
> 
> Hi!
> 
> Kernel 2.4.5-pre[34] don't compile on Alpha:
> 
> In incluse/asm-alpha/pci.h (include during compile of
> arch/alpha/kernel/setup.c), there is

include linux/pci.h not asm/pci.h...   I've got a fix patch going to
Linus today, along with some other small Alpha build fixes like this.

-- 
Jeff Garzik      | "Are you the police?"
Building 1024    | "No, ma'am.  We're musicians."
MandrakeSoft     |

Re: Compile fails an Alpha: include/asm/pci.h included from arch/alpha/kernel/setup.c

[Michal Jaegermann]

On Mon, May 21, 2001 at 05:18:55PM +0200, Jan-Benedict Glaw wrote:
> 
> Kernel 2.4.5-pre[34] don't compile on Alpha:
> 
....

>     152         struct pci_controller *hose = pdev->sysdata;
                                                 ^^^

This is the problem (a type for 'pdev' is not defined).
And this is a possible fix:


--- linux-2.4.4ac/include/asm-alpha/pci.h~	Sat May 19 16:43:11 2001
+++ linux-2.4.4ac/include/asm-alpha/pci.h	Sat May 19 17:23:56 2001
@@ -6,6 +6,7 @@
 #include <linux/spinlock.h>
 #include <asm/scatterlist.h>
 #include <asm/machvec.h>
+#include <linux/pci.h>
 
 /*
  * The following structure is used to manage multiple PCI busses.

The patch is for 2.4.4-ac11, so offsets are possibly slightly different,
but probably not. :-)

  Michal