From 29aaf7f060ba249cb264d9b180a60e55192aa025 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 7 Jul 2005 17:56:02 -0700 Subject: [PATCH] --- yaml --- r: 4204 b: refs/heads/master c: c23a4e9649f80a9379d7df4a33bc63b365d5e7fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/mm/ioremap.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ffdf8e820b31..a7ea660897a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eda80228860641b7b0e963e6bd219b960c500af9 +refs/heads/master: c23a4e9649f80a9379d7df4a33bc63b365d5e7fc diff --git a/trunk/arch/i386/mm/ioremap.c b/trunk/arch/i386/mm/ioremap.c index 6b25afc933b6..f379b8d67558 100644 --- a/trunk/arch/i386/mm/ioremap.c +++ b/trunk/arch/i386/mm/ioremap.c @@ -228,7 +228,8 @@ EXPORT_SYMBOL(ioremap_nocache); void iounmap(volatile void __iomem *addr) { struct vm_struct *p; - if ((void __force *) addr <= high_memory) + + if ((void __force *)addr <= high_memory) return; /* @@ -241,9 +242,10 @@ void iounmap(volatile void __iomem *addr) return; write_lock(&vmlist_lock); - p = __remove_vm_area((void *) (PAGE_MASK & (unsigned long __force) addr)); + p = __remove_vm_area((void *)(PAGE_MASK & (unsigned long __force)addr)); if (!p) { printk(KERN_WARNING "iounmap: bad address %p\n", addr); + dump_stack(); goto out_unlock; }