aboutsummaryrefslogtreecommitdiffstats
path: root/lib/swiotlb.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-10-31 13:51:57 -0500
committerTony Luck <tony.luck@intel.com>2005-10-31 13:51:57 -0500
commitc7fb577e2a6cb04732541f2dc402bd46747f7558 (patch)
treedf3b1a1922ed13bfbcc45d08650c38beeb1a7bd1 /lib/swiotlb.c
parent9cec58dc138d6fcad9f447a19c8ff69f6540e667 (diff)
parent581c1b14394aee60aff46ea67d05483261ed6527 (diff)
manual update from upstream:
Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4 to new location of swiotlb.c Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'lib/swiotlb.c')
-rw-r--r--lib/swiotlb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 5bdeaaea57fd..57216f3544ca 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -433,7 +433,7 @@ sync_single(struct device *hwdev, char *dma_addr, size_t size,
433 433
434void * 434void *
435swiotlb_alloc_coherent(struct device *hwdev, size_t size, 435swiotlb_alloc_coherent(struct device *hwdev, size_t size,
436 dma_addr_t *dma_handle, int flags) 436 dma_addr_t *dma_handle, gfp_t flags)
437{ 437{
438 unsigned long dev_addr; 438 unsigned long dev_addr;
439 void *ret; 439 void *ret;