summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/pci-nommu.c
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2005-10-28 12:18:07 -0400
committerKyle McMartin <kyle@parisc-linux.org>2005-10-28 12:18:07 -0400
commit210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch)
treef0816c90ae937a159f8bfec6018a6271223b954a /arch/x86_64/kernel/pci-nommu.c
parente0f998930eb67c49f2862c58a45262ad0bc03eca (diff)
parent260b23674fdb570f3235ce55892246bef1c24c2a (diff)
downloadop-kernel-dev-210cc679faf0e1cabda9fc5d1279644f5e52aecb.zip
op-kernel-dev-210cc679faf0e1cabda9fc5d1279644f5e52aecb.tar.gz
Auto-update from upstream
Diffstat (limited to 'arch/x86_64/kernel/pci-nommu.c')
-rw-r--r--arch/x86_64/kernel/pci-nommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/pci-nommu.c b/arch/x86_64/kernel/pci-nommu.c
index 67d90b8..5a981dc 100644
--- a/arch/x86_64/kernel/pci-nommu.c
+++ b/arch/x86_64/kernel/pci-nommu.c
@@ -24,7 +24,7 @@ EXPORT_SYMBOL(iommu_sac_force);
*/
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;
u64 mask;
OpenPOWER on IntegriCloud