projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core/iommu' into core/urgent
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
pci-swiotlb_64.c
diff --git
a/arch/x86/kernel/pci-swiotlb_64.c
b/arch/x86/kernel/pci-swiotlb_64.c
index 8cba3749a511dc7a28191966be51be06b871c2b2..d59c9174766586c01f3377a13a7763cb716eceeb 100644
(file)
--- a/
arch/x86/kernel/pci-swiotlb_64.c
+++ b/
arch/x86/kernel/pci-swiotlb_64.c
@@
-23,7
+23,7
@@
void *swiotlb_alloc(unsigned order, unsigned long nslabs)
return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);
}
-dma_addr_t swiotlb_phys_to_bus(phys_addr_t paddr)
+dma_addr_t swiotlb_phys_to_bus(
struct device *hwdev,
phys_addr_t paddr)
{
return paddr;
}