git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPI: remove Asus P2B-DS from acpi=ht blacklist
[safe/jmp/linux-2.6]
/
arch
/
avr32
/
mm
/
ioremap.c
diff --git
a/arch/avr32/mm/ioremap.c
b/arch/avr32/mm/ioremap.c
index
8cfec65
..
f03b79f
100644
(file)
--- a/
arch/avr32/mm/ioremap.c
+++ b/
arch/avr32/mm/ioremap.c
@@
-6,6
+6,7
@@
* published by the Free Software Foundation.
*/
#include <linux/vmalloc.h>
* published by the Free Software Foundation.
*/
#include <linux/vmalloc.h>
+#include <linux/mm.h>
#include <linux/module.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/io.h>
@@
-77,6
+78,8
@@
void __iounmap(void __iomem *addr)
if ((unsigned long)addr >= P4SEG)
return;
if ((unsigned long)addr >= P4SEG)
return;
+ if (PXSEG(addr) == P2SEG)
+ return;
p = remove_vm_area((void *)(PAGE_MASK & (unsigned long __force)addr));
if (unlikely(!p)) {
p = remove_vm_area((void *)(PAGE_MASK & (unsigned long __force)addr));
if (unlikely(!p)) {