Re: [BK PATCH] essential SCSI fixes for 2.6.5-rc2

[Andi Kleen <ak@muc.de>]

James Bottomley <James.Bottomley@steeleye.com> writes:

> These are the two oops related fixes from the scsi-misc-2.6 tree that
> testing has shaken out.  They are available at
>
> bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
>
> The shortlog is:
>

[...]

Any chance you could include the fusion consistent mask patch with this? 

Without this fusion is completely unusable with >4GB on 64bit.

-Andi

diff -burpN -X ../KDIFX -x '*-SLAB' linux-vanilla-2.6.5rc2/drivers/message/fusion/mptbase.c linux-2.6.5rc2-amd64/drivers/message/fusion/mptbase.c
--- linux-vanilla-2.6.5rc2/drivers/message/fusion/mptbase.c	2004-03-20 03:55:31.000000000 +0100
+++ linux-2.6.5rc2-amd64/drivers/message/fusion/mptbase.c	2004-03-20 04:11:24.000000000 +0100
@@ -1280,12 +1280,17 @@ mptbase_probe(struct pci_dev *pdev, cons
 		return r;
 	}
 
+#if 0
+	/* broken because some code assumes that multiple calls
+	   to pci_alloc_consistent return data in the same 4GB segment. 
+	   This cannot work on machines with enough memory. */
 	if (!pci_set_consistent_dma_mask(pdev, mask))
 		dprintk((KERN_INFO MYNAM
 			": Using 64 bit consistent mask\n"));
 	else
 		dprintk((KERN_INFO MYNAM
 			": Not using 64 bit consistent mask\n"));
+#endif
 
 	ioc = kmalloc(sizeof(MPT_ADAPTER), GFP_ATOMIC);
 	if (ioc == NULL) {