From a4ab3669ebdeccfd9c00d68d8ec235985e518d5b Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 17 Dec 2008 17:18:45 +0900 Subject: [PATCH] --- yaml --- r: 120155 b: refs/heads/master c: da9fdc8b44c421f14a68988ae4d1fb414d5edbf0 h: refs/heads/master i: 120153: 78aa3715a697d2b72ddbb2a31ada740a40e1e37e 120151: 58085efd69fe6cf43125d0af874487a86f1e21b9 v: v3 --- [refs] | 2 +- trunk/arch/sh/mm/consistent.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3c6320d1d70b..9b33e6dfa803 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78fb40263f34c65ade1693664db1af168d479588 +refs/heads/master: da9fdc8b44c421f14a68988ae4d1fb414d5edbf0 diff --git a/trunk/arch/sh/mm/consistent.c b/trunk/arch/sh/mm/consistent.c index 9f8ea3ada4db..edcd5fbf9651 100644 --- a/trunk/arch/sh/mm/consistent.c +++ b/trunk/arch/sh/mm/consistent.c @@ -42,6 +42,8 @@ void *dma_alloc_coherent(struct device *dev, size_t size, return NULL; } + split_page(pfn_to_page(virt_to_phys(ret) >> PAGE_SHIFT), order); + *dma_handle = virt_to_phys(ret); return ret_nocache; } @@ -51,10 +53,13 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) { int order = get_order(size); + unsigned long pfn = dma_handle >> PAGE_SHIFT; + int k; if (!dma_release_from_coherent(dev, order, vaddr)) { WARN_ON(irqs_disabled()); /* for portability */ - free_pages((unsigned long)phys_to_virt(dma_handle), order); + for (k = 0; k < (1 << order); k++) + __free_pages(pfn_to_page(pfn + k), 0); iounmap(vaddr); } }