[PATCH] gfp_t: dma-mapping (amd64)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
6dae2c2306
commit
f80aabb03a
@ -187,7 +187,7 @@ static void flush_gart(struct device *dev)
|
|||||||
|
|
||||||
/* Allocate DMA memory on node near device */
|
/* Allocate DMA memory on node near device */
|
||||||
noinline
|
noinline
|
||||||
static void *dma_alloc_pages(struct device *dev, unsigned gfp, unsigned order)
|
static void *dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)
|
||||||
{
|
{
|
||||||
struct page *page;
|
struct page *page;
|
||||||
int node;
|
int node;
|
||||||
@ -204,7 +204,7 @@ static void *dma_alloc_pages(struct device *dev, unsigned gfp, unsigned order)
|
|||||||
*/
|
*/
|
||||||
void *
|
void *
|
||||||
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
|
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
|
||||||
unsigned gfp)
|
gfp_t gfp)
|
||||||
{
|
{
|
||||||
void *memory;
|
void *memory;
|
||||||
unsigned long dma_mask = 0;
|
unsigned long dma_mask = 0;
|
||||||
|
@ -24,7 +24,7 @@ EXPORT_SYMBOL(iommu_sac_force);
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
void *dma_alloc_coherent(struct device *hwdev, size_t size,
|
void *dma_alloc_coherent(struct device *hwdev, size_t size,
|
||||||
dma_addr_t *dma_handle, unsigned gfp)
|
dma_addr_t *dma_handle, gfp_t gfp)
|
||||||
{
|
{
|
||||||
void *ret;
|
void *ret;
|
||||||
u64 mask;
|
u64 mask;
|
||||||
|
@ -17,7 +17,7 @@ extern dma_addr_t bad_dma_address;
|
|||||||
(swiotlb ? swiotlb_dma_mapping_error(x) : ((x) == bad_dma_address))
|
(swiotlb ? swiotlb_dma_mapping_error(x) : ((x) == bad_dma_address))
|
||||||
|
|
||||||
void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
|
void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
|
||||||
unsigned gfp);
|
gfp_t gfp);
|
||||||
void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
|
void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
|
||||||
dma_addr_t dma_handle);
|
dma_addr_t dma_handle);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user