Commit af53fb8d authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[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
parent 26e12098
...@@ -19,7 +19,7 @@ void *dma_alloc_coherent(struct device *dev, size_t size, ...@@ -19,7 +19,7 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
void *ret; void *ret;
int gfp = GFP_ATOMIC; int gfp = GFP_ATOMIC;
if (dev == NULL || ((u32)*dev->dma_mask != 0xffffffff)) if (dev == NULL || (*dev->dma_mask < 0xffffffff))
gfp |= GFP_DMA; gfp |= GFP_DMA;
ret = (void *)__get_free_pages(gfp, get_order(size)); ret = (void *)__get_free_pages(gfp, get_order(size));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment