RE: [PATCH] Allow x86-64 compilation for ips.c

RE: [PATCH] Allow x86-64 compilation for ips.c

[Hammer, Jack]

James,

Please do not apply this patch - It is incomplete.  A complete patch (
there's more to x86_64 than just this one change ) to ips for x86_64 support
is coming from the maintainers at Adaptec ( probably within a week ).

Adaptec Raid Development Team




-----Original Message-----
From: Andi Kleen [mailto:ak@muc.de]
Sent: Sunday, August 10, 2003 10:15 AM
To: linux-scsi@vger.kernel.org; James.Bottomley@HansenPartnership.com;
IpsLinux
Subject: [PATCH] Allow x86-64 compilation for ips.c



ips.c seems to work on x86-64 fine. Disable the rogue error checking
for unsupported architectures.

Also make this check a soft error, not a hard error.

-Andi

diff -burpN -X ../KDIFX linux/drivers/scsi/ips.c
linux-2.6.0test3-amd64/drivers/scsi/ips.c
--- linux/drivers/scsi/ips.c	2003-08-09 16:48:09.000000000 +0200
+++ linux-2.6.0test3-amd64/drivers/scsi/ips.c	2003-08-09
16:50:20.000000000 +0200
@@ -198,8 +198,8 @@
 #define IPS_VERSION_LOW         ".01-BETA"
 
 
-#if !defined(__i386__) && !defined(__ia64__)
-   #error "This driver has only been tested on the x86/ia64 platforms"
+#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__)
+   #warning "This driver has only been tested on the x86/ia64 platforms"
 #endif
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH] Allow x86-64 compilation for ips.c

[James Bottomley]

On Mon, 2003-08-11 at 06:48, Hammer, Jack wrote:
> Please do not apply this patch - It is incomplete.  A complete patch (
> there's more to x86_64 than just this one change ) to ips for x86_64 support
> is coming from the maintainers at Adaptec ( probably within a week ).

OK, I'll await the complete solution.

I'm very behind with all the conferences/expo's anyway, just getting the
last month's fixes into the kernel.

James

Re: [PATCH] Allow x86-64 compilation for ips.c

[Andi Kleen]

On Mon, Aug 11, 2003 at 07:48:30AM -0400, Hammer, Jack wrote:
> Please do not apply this patch - It is incomplete.  A complete patch (
> there's more to x86_64 than just this one change ) to ips for x86_64 support
> is coming from the maintainers at Adaptec ( probably within a week ).

I tested with this patch on x86-64 and it worked fine.

What other changes do you intend to make? 

-Andi

Re: [PATCH] Allow x86-64 compilation for ips.c

[Andi Kleen]

On Tue, Aug 12, 2003 at 12:52:24AM +0200, Andi Kleen wrote:
> On Mon, Aug 11, 2003 at 07:48:30AM -0400, Hammer, Jack wrote:
> > Please do not apply this patch - It is incomplete.  A complete patch (
> > there's more to x86_64 than just this one change ) to ips for x86_64 support
> > is coming from the maintainers at Adaptec ( probably within a week ).
> 
> I tested with this patch on x86-64 and it worked fine.
> 
> What other changes do you intend to make? 

Ok one issue I see is that you do not test the return value of pci_map_sg()
Hopefully that's fixed in the upcomming patchkit.

-Andi

[PATCH] Allow x86-64 compilation for ips.c

[Andi Kleen]

ips.c seems to work on x86-64 fine. Disable the rogue error checking
for unsupported architectures.

Also make this check a soft error, not a hard error.

-Andi

diff -burpN -X ../KDIFX linux/drivers/scsi/ips.c linux-2.6.0test3-amd64/drivers/scsi/ips.c
--- linux/drivers/scsi/ips.c	2003-08-09 16:48:09.000000000 +0200
+++ linux-2.6.0test3-amd64/drivers/scsi/ips.c	2003-08-09 16:50:20.000000000 +0200
@@ -198,8 +198,8 @@
 #define IPS_VERSION_LOW         ".01-BETA"
 
 
-#if !defined(__i386__) && !defined(__ia64__)
-   #error "This driver has only been tested on the x86/ia64 platforms"
+#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__)
+   #warning "This driver has only been tested on the x86/ia64 platforms"
 #endif
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)