2003-07-05 10:57:56

by Michael Buesch

Subject: [PATCH 2.5.74, 2.5.74-mjb1] i2o compile fix

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Martin, Alan,
lk-list.

I need this patch to compile i2o support. Otherwise I get this error:

mb@lfs:~/linux-2.5/linux-2.5.74-mjb1> make bzImage
make[1]: ?arch/i386/kernel/asm-offsets.s? ist bereits aktualisiert.
CHK include/linux/compile.h
CC drivers/message/i2o/i2o_scsi.o
i2o_scsi.c: In function `i2o_scsi_reply':
i2o_scsi.c:328: Warnung: implicit declaration of function `pci_unmap_sg'
i2o_scsi.c:330: Warnung: implicit declaration of function `pci_unmap_single'
i2o_scsi.c: In function `i2o_scsi_queuecommand':
i2o_scsi.c:764: Warnung: implicit declaration of function `pci_map_sg'
i2o_scsi.c:834: Warnung: implicit declaration of function `pci_map_single'
LD drivers/message/i2o/built-in.o
LD drivers/message/built-in.o
LD drivers/built-in.o
GEN .version
CHK include/linux/compile.h
UPD include/linux/compile.h
CC init/version.o
LD init/built-in.o
LD .tmp_vmlinux1
drivers/built-in.o(.text+0xcb8a8): In function `i2o_scsi_reply':
: undefined reference to `pci_unmap_single'
drivers/built-in.o(.text+0xcb8d5): In function `i2o_scsi_reply':
: undefined reference to `pci_unmap_sg'
drivers/built-in.o(.text+0xcc1b3): In function `i2o_scsi_queuecommand':
: undefined reference to `pci_map_single'
drivers/built-in.o(.text+0xcc212): In function `i2o_scsi_queuecommand':
: undefined reference to `pci_map_sg'
make: *** [.tmp_vmlinux1] Fehler 1


This patch is tested to apply to 2.5.74 and 2.5.74-mjb1

- --- drivers/message/i2o/i2o_scsi.c.orig 2003-07-05 13:00:07.000000000 +0200
+++ drivers/message/i2o/i2o_scsi.c 2003-07-05 13:02:59.000000000 +0200
@@ -53,6 +53,7 @@
#include <asm/system.h>
#include <asm/io.h>
#include <asm/atomic.h>
+#include <linux/pci.h>
#include <linux/blk.h>
#include <linux/i2o.h>
#include "../../scsi/scsi.h"

- --
Regards Michael Buesch
http://www.8ung.at/tuxsoft
13:03:37 up 1:43, 3 users, load average: 1.84, 2.19, 1.85

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE/BrJXoxoigfggmSgRAingAJ9x0WNlzzi70kclnbMr15DxuaIqvwCfaGeK
7ONfRL6a9w0FTJeJmtu4Btg=
=bj3c
-----END PGP SIGNATURE-----

2003-07-05 13:26:31

by Alan

Subject: Re: [PATCH 2.5.74, 2.5.74-mjb1] i2o compile fix

On Sad, 2003-07-05 at 12:11, Michael Buesch wrote:
> This patch is tested to apply to 2.5.74 and 2.5.74-mjb1
>
> - --- drivers/message/i2o/i2o_scsi.c.orig 2003-07-05 13:00:07.000000000 +0200
> +++ drivers/message/i2o/i2o_scsi.c 2003-07-05 13:02:59.000000000 +0200
> @@ -53,6 +53,7 @@
> #include <asm/system.h>
> #include <asm/io.h>
> #include <asm/atomic.h>
> +#include <linux/pci.h>
> #include <linux/blk.h>
> #include <linux/i2o.h>
> #include "../../scsi/scsi.h"

Looks fine to me.