diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-31 19:51:57 +0100 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-31 19:51:57 +0100 |
| commit | c7fb577e2a6cb04732541f2dc402bd46747f7558 (patch) | |
| tree | df3b1a1922ed13bfbcc45d08650c38beeb1a7bd1 /lib/swiotlb.c | |
| parent | Update from upstream with manual merge of Yasunori Goto's (diff) | |
| parent | [PATCH] noop-iosched: avoid corrupted request merging (diff) | |
| download | linux-c7fb577e2a6cb04732541f2dc402bd46747f7558.tar.xz linux-c7fb577e2a6cb04732541f2dc402bd46747f7558.zip | |
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.c | 2 |
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, void * swiotlb_alloc_coherent(struct device *hwdev, size_t size, - dma_addr_t *dma_handle, int flags) + dma_addr_t *dma_handle, gfp_t flags) { unsigned long dev_addr; void *ret; |