From e22625f596273f4b84dd46634e8ccad4ce038cf1 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 16 Dec 2008 12:17:38 -0800 Subject: [PATCH] --- yaml --- r: 123214 b: refs/heads/master c: a08636690d06b2e36cfb4c2b3ee133a81c47e1e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pci-swiotlb_64.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fd340d624ae0..6efe231ff373 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d32251e846ccbcf9d2da041dffd1199f94b2a3b +refs/heads/master: a08636690d06b2e36cfb4c2b3ee133a81c47e1e0 diff --git a/trunk/arch/x86/kernel/pci-swiotlb_64.c b/trunk/arch/x86/kernel/pci-swiotlb_64.c index 93a8371f2c22..242c3440687f 100644 --- a/trunk/arch/x86/kernel/pci-swiotlb_64.c +++ b/trunk/arch/x86/kernel/pci-swiotlb_64.c @@ -33,6 +33,11 @@ phys_addr_t swiotlb_bus_to_phys(dma_addr_t baddr) return baddr; } +int __weak swiotlb_arch_range_needs_mapping(void *ptr, size_t size) +{ + return 0; +} + static dma_addr_t swiotlb_map_single_phys(struct device *hwdev, phys_addr_t paddr, size_t size, int direction)