* [patch 2/2] libsas fails to compile on s390
@ 2006-11-09 3:57 akpm
2006-11-09 8:34 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: akpm @ 2006-11-09 3:57 UTC (permalink / raw)
To: James.Bottomley; +Cc: linux-scsi, akpm, schwidefsky
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Explicitly include scatterlist.h in sas_internal.h to avoid the implicit
include dependency via the pci.h header. For s390 the scatterlist.h header
is not included because CONFIG_PCI=n.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
drivers/scsi/libsas/sas_internal.h | 1 +
1 file changed, 1 insertion(+)
diff -puN drivers/scsi/libsas/sas_internal.h~libsas-fails-to-compile-on-s390 drivers/scsi/libsas/sas_internal.h
--- a/drivers/scsi/libsas/sas_internal.h~libsas-fails-to-compile-on-s390
+++ a/drivers/scsi/libsas/sas_internal.h
@@ -26,6 +26,7 @@
#ifndef _SAS_INTERNAL_H_
#define _SAS_INTERNAL_H_
+#include <linux/scatterlist.h>
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_transport_sas.h>
_
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 2/2] libsas fails to compile on s390
2006-11-09 3:57 [patch 2/2] libsas fails to compile on s390 akpm
@ 2006-11-09 8:34 ` Andrew Morton
2006-11-10 7:50 ` Heiko Carstens
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2006-11-09 8:34 UTC (permalink / raw)
To: James.Bottomley, linux-scsi, schwidefsky
On Wed, 08 Nov 2006 19:57:09 -0800
akpm@osdl.org wrote:
> From: Martin Schwidefsky <schwidefsky@de.ibm.com>
>
> Explicitly include scatterlist.h in sas_internal.h to avoid the implicit
> include dependency via the pci.h header. For s390 the scatterlist.h header
> is not included because CONFIG_PCI=n.
>
> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: James Bottomley <James.Bottomley@steeleye.com>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> ---
>
> drivers/scsi/libsas/sas_internal.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff -puN drivers/scsi/libsas/sas_internal.h~libsas-fails-to-compile-on-s390 drivers/scsi/libsas/sas_internal.h
> --- a/drivers/scsi/libsas/sas_internal.h~libsas-fails-to-compile-on-s390
> +++ a/drivers/scsi/libsas/sas_internal.h
> @@ -26,6 +26,7 @@
> #ifndef _SAS_INTERNAL_H_
> #define _SAS_INTERNAL_H_
>
> +#include <linux/scatterlist.h>
> #include <scsi/scsi.h>
> #include <scsi/scsi_host.h>
> #include <scsi/scsi_transport_sas.h>
err, please ignore this one....
In file included from include/linux/scatterlist.h:5,
from drivers/scsi/libsas/sas_internal.h:30,
from drivers/scsi/libsas/sas_phy.c:26:
include/asm/scatterlist.h:7: error: expected specifier-qualifier-list before 'dma_addr_t'
In file included from drivers/scsi/libsas/sas_internal.h:30,
from drivers/scsi/libsas/sas_phy.c:26:
include/linux/scatterlist.h: In function 'sg_set_buf':
include/linux/scatterlist.h:13: error: 'struct scatterlist' has no member named 'length'
In file included from include/linux/dma-mapping.h:35,
from include/asm-generic/pci-dma-compat.h:8,
from include/asm/pci.h:135,
from include/linux/pci.h:717,
from include/scsi/libsas.h:32,
from drivers/scsi/libsas/sas_internal.h:34,
from drivers/scsi/libsas/sas_phy.c:26:
include/asm/dma-mapping.h: In function 'dma_map_sg':
include/asm/dma-mapping.h:44: error: 'struct scatterlist' has no member named 'length'
include/asm/dma-mapping.h:44: warning: type defaults to 'int' in declaration of '__ret_warn_on'
include/asm/dma-mapping.h:44: error: 'struct scatterlist' has no member named 'length'
include/asm/dma-mapping.h:49: error: 'struct scatterlist' has no member named 'dma_address'
distcc[16143] ERROR: compile drivers/scsi/libsas/sas_phy.c on bix/32 failed
make[1]: *** [drivers/scsi/libsas/sas_phy.o] Error 1
make: *** [drivers/scsi/libsas/sas_phy.o] Error 2
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 2/2] libsas fails to compile on s390
2006-11-09 8:34 ` Andrew Morton
@ 2006-11-10 7:50 ` Heiko Carstens
2006-11-10 8:39 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Heiko Carstens @ 2006-11-10 7:50 UTC (permalink / raw)
To: Andrew Morton; +Cc: James.Bottomley, linux-scsi, schwidefsky
On Thu, Nov 09, 2006 at 12:34:07AM -0800, Andrew Morton wrote:
> > Explicitly include scatterlist.h in sas_internal.h to avoid the implicit
> > include dependency via the pci.h header. For s390 the scatterlist.h header
> > is not included because CONFIG_PCI=n.
> err, please ignore this one....
> [...]
> distcc[16143] ERROR: compile drivers/scsi/libsas/sas_phy.c on bix/32 failed
> make[1]: *** [drivers/scsi/libsas/sas_phy.o] Error 1
> make: *** [drivers/scsi/libsas/sas_phy.o] Error 2
Strange... compiles fine for me. But maybe we should simply merge this one
instead?
http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.19-rc5/2.6.19-rc5-mm1/broken-out/git-sas-kconfig-fix.patch
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 2/2] libsas fails to compile on s390
2006-11-10 7:50 ` Heiko Carstens
@ 2006-11-10 8:39 ` Andrew Morton
2006-11-10 9:00 ` Heiko Carstens
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2006-11-10 8:39 UTC (permalink / raw)
To: Heiko Carstens; +Cc: James.Bottomley, linux-scsi, schwidefsky
On Fri, 10 Nov 2006 08:50:50 +0100
Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
> On Thu, Nov 09, 2006 at 12:34:07AM -0800, Andrew Morton wrote:
> > > Explicitly include scatterlist.h in sas_internal.h to avoid the implicit
> > > include dependency via the pci.h header. For s390 the scatterlist.h header
> > > is not included because CONFIG_PCI=n.
> > err, please ignore this one....
> > [...]
> > distcc[16143] ERROR: compile drivers/scsi/libsas/sas_phy.c on bix/32 failed
> > make[1]: *** [drivers/scsi/libsas/sas_phy.o] Error 1
> > make: *** [drivers/scsi/libsas/sas_phy.o] Error 2
>
> Strange... compiles fine for me.
The above was with x86, iirc.
> But maybe we should simply merge this one
> instead?
>
> http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.19-rc5/2.6.19-rc5-mm1/broken-out/git-sas-kconfig-fix.patch
The original failure which we're tryimg to fix here occurred with that
patch applied.
Oh well.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 2/2] libsas fails to compile on s390
2006-11-10 8:39 ` Andrew Morton
@ 2006-11-10 9:00 ` Heiko Carstens
2006-11-10 9:22 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Heiko Carstens @ 2006-11-10 9:00 UTC (permalink / raw)
To: Andrew Morton; +Cc: James.Bottomley, linux-scsi, schwidefsky
On Fri, Nov 10, 2006 at 12:39:08AM -0800, Andrew Morton wrote:
> > But maybe we should simply merge this one
> > instead?
> >
> > http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.19-rc5/2.6.19-rc5-mm1/broken-out/git-sas-kconfig-fix.patch
>
> The original failure which we're tryimg to fix here occurred with that
> patch applied.
>
> Oh well.
How that? s390 doesn't have CONFIG_ATA... This compile error only happens on
2.6.19-rc5 but not your -mm tree. That's why I thought the above mentioned
patch should fix this.
Maybe SCSI_SAS_LIBSAS should depend on SCSI && ATA && PCI?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 2/2] libsas fails to compile on s390
2006-11-10 9:00 ` Heiko Carstens
@ 2006-11-10 9:22 ` Andrew Morton
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Morton @ 2006-11-10 9:22 UTC (permalink / raw)
To: Heiko Carstens; +Cc: James.Bottomley, linux-scsi, schwidefsky
On Fri, 10 Nov 2006 10:00:44 +0100
Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
> On Fri, Nov 10, 2006 at 12:39:08AM -0800, Andrew Morton wrote:
> > > But maybe we should simply merge this one
> > > instead?
> > >
> > > http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.19-rc5/2.6.19-rc5-mm1/broken-out/git-sas-kconfig-fix.patch
> >
> > The original failure which we're tryimg to fix here occurred with that
> > patch applied.
> >
> > Oh well.
>
> How that? s390 doesn't have CONFIG_ATA... This compile error only happens on
> 2.6.19-rc5 but not your -mm tree. That's why I thought the above mentioned
> patch should fix this.
> Maybe SCSI_SAS_LIBSAS should depend on SCSI && ATA && PCI?
umm, with git-sas-kconfig-fix.patch applied, `make allmodconfig' does:
box:/usr/src/25> grep SAS .config
CONFIG_SCSI_SAS_ATTRS=m
and... it compiles. I must be dreaming.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2006-11-10 9:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-09 3:57 [patch 2/2] libsas fails to compile on s390 akpm
2006-11-09 8:34 ` Andrew Morton
2006-11-10 7:50 ` Heiko Carstens
2006-11-10 8:39 ` Andrew Morton
2006-11-10 9:00 ` Heiko Carstens
2006-11-10 9:22 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox