Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e4c1b977f0036c00ebabb60375cb63d0de9d43fa
Commit:     e4c1b977f0036c00ebabb60375cb63d0de9d43fa
Parent:     4b40fcee131847069543cc60a3a79887743c53db
Author:     Thomas Gleixner <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:34:05 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:34:05 2008 +0100

    x86: use remove_vm_are in ioremap_32 error path
    
    When ioremap_page_range fails, then we can use remove_vm_area instead
    of vunmap safely.
    
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
    
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 arch/x86/mm/ioremap_32.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/mm/ioremap_32.c b/arch/x86/mm/ioremap_32.c
index 5273ac4..4d919c3 100644
--- a/arch/x86/mm/ioremap_32.c
+++ b/arch/x86/mm/ioremap_32.c
@@ -118,7 +118,7 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned 
long size,
        addr = (void __iomem *) area->addr;
        if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
                               phys_addr, pgprot)) {
-               vunmap((void __force *) addr);
+               remove_vm_area((void *)(PAGE_MASK & (unsigned long) addr));
                return NULL;
        }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to