From d626c39d78bf22976b2961b6ab1bb202274833f4 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Fri, 20 May 2005 14:27:57 -0700 Subject: [PATCH] --- yaml --- r: 1299 b: refs/heads/master c: 4057923614e2868a865aa6c6e3bc53542c818d4d h: refs/heads/master i: 1297: a5b9a121fb2fb66dee55c824c2d7d0a51d80fd78 1295: 3aa9c7ac607deac63df4da95caab79a2d90125c8 v: v3 --- [refs] | 2 +- trunk/arch/i386/mm/ioremap.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 32eb0e1610db..13bbe751f739 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7856dfeb23c16ef3d8dac8871b4d5b93c70b59b9 +refs/heads/master: 4057923614e2868a865aa6c6e3bc53542c818d4d diff --git a/trunk/arch/i386/mm/ioremap.c b/trunk/arch/i386/mm/ioremap.c index db06f7399913..ab542792b27b 100644 --- a/trunk/arch/i386/mm/ioremap.c +++ b/trunk/arch/i386/mm/ioremap.c @@ -238,19 +238,21 @@ void iounmap(volatile void __iomem *addr) addr < phys_to_virt(ISA_END_ADDRESS)) return; - p = remove_vm_area((void *) (PAGE_MASK & (unsigned long __force) addr)); + write_lock(&vmlist_lock); + p = __remove_vm_area((void *) (PAGE_MASK & (unsigned long __force) addr)); if (!p) { - printk("__iounmap: bad address %p\n", addr); - return; + printk("iounmap: bad address %p\n", addr); + goto out_unlock; } if ((p->flags >> 20) && p->phys_addr < virt_to_phys(high_memory) - 1) { - /* p->size includes the guard page, but cpa doesn't like that */ change_page_attr(virt_to_page(__va(p->phys_addr)), p->size >> PAGE_SHIFT, PAGE_KERNEL); global_flush_tlb(); } +out_unlock: + write_unlock(&vmlist_lock); kfree(p); }