From: Dave Jones <davej@codemonkey.org.uk>
Date: Wed, 8 Jan 2003 10:54:58 +0000 (-0800)
Subject: [PATCH] Fix up dma_alloc_coherent with 64bit DMA masks on i386.
X-Git-Tag: v2.5.55~13
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=af53fb8d07581e540ae62f19871d99de40be2ba6;p=history.git

[PATCH] Fix up dma_alloc_coherent with 64bit DMA masks on i386.

Cset 1.808 in 2.4 never got propagated forward to 2.5

It's pretty much the same fix as below (s/!=/</), but with the following
changes
 - This was a patch to pci_alloc_consistant(), which now wants to be
   dma_alloc_coherent()
 - Removal of the u32 cast
---

diff --git a/arch/i386/kernel/pci-dma.c b/arch/i386/kernel/pci-dma.c
index 85b374f6bde0..af365ef1cae2 100644
--- a/arch/i386/kernel/pci-dma.c
+++ b/arch/i386/kernel/pci-dma.c
@@ -19,7 +19,7 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 	void *ret;
 	int gfp = GFP_ATOMIC;
 
-	if (dev == NULL || ((u32)*dev->dma_mask != 0xffffffff))
+	if (dev == NULL || (*dev->dma_mask < 0xffffffff))
 		gfp |= GFP_DMA;
 	ret = (void *)__get_free_pages(gfp, get_order(size));