projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4b40fce
)
x86: use remove_vm_are in ioremap_32 error path
author
Thomas Gleixner
<tglx@linutronix.de>
Wed, 30 Jan 2008 12:34:05 +0000
(13:34 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 30 Jan 2008 12:34:05 +0000
(13:34 +0100)
When ioremap_page_range fails, then we can use remove_vm_area instead
of vunmap safely.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/mm/ioremap_32.c
patch
|
blob
|
history
diff --git
a/arch/x86/mm/ioremap_32.c
b/arch/x86/mm/ioremap_32.c
index
5273ac4
..
4d919c3
100644
(file)
--- 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;
}