From 7933bd2d62b7fd5fda3d91fae501cabe07943394 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Tue, 19 Aug 2008 16:32:43 +0200 Subject: [PATCH] --- yaml --- r: 112557 b: refs/heads/master c: a3a76532e0caa093c279806d8fe8608232538af0 h: refs/heads/master i: 112555: aa5fa66139e8656c6b1fc36725481cd6db797c5b v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pci-nommu.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5e9b24352e83..f4ab8f60593a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5e835f9641e9fcb95d1afb24906821e98b2c6a8 +refs/heads/master: a3a76532e0caa093c279806d8fe8608232538af0 diff --git a/trunk/arch/x86/kernel/pci-nommu.c b/trunk/arch/x86/kernel/pci-nommu.c index b8ce83c98211..73853d3fdcac 100644 --- a/trunk/arch/x86/kernel/pci-nommu.c +++ b/trunk/arch/x86/kernel/pci-nommu.c @@ -126,8 +126,15 @@ nommu_alloc_coherent(struct device *hwdev, size_t size, return NULL; } +static void nommu_free_coherent(struct device *dev, size_t size, void *vaddr, + dma_addr_t dma_addr) +{ + free_pages((unsigned long)vaddr, get_order(size)); +} + struct dma_mapping_ops nommu_dma_ops = { .alloc_coherent = nommu_alloc_coherent, + .free_coherent = nommu_free_coherent, .map_single = nommu_map_single, .map_sg = nommu_map_sg, .is_phys = 1,