From e40f84418588afaaaf10d8fb027bfb4571c9e133 Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Tue, 24 Oct 2006 10:12:41 +0200 Subject: [PATCH] --- yaml --- r: 40351 b: refs/heads/master c: bee8ce809fb1c877388be032b468574a1cfff9ef h: refs/heads/master i: 40349: 3229ac48491f26601f8526d1fbe16e2c987a1cf6 40347: f6fb4bdc04d34a84ff205dd31c925c339f77ef57 40343: fccbcff5612968546775f48140483f6f57ae3fab 40335: 27c2eafdb263be7ab62b0b6413458095ae6de661 40319: 055b19267a1cfe34dee36e7cfb17b3c1e725ba55 v: v3 --- [refs] | 2 +- trunk/arch/avr32/mm/ioremap.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4c796106b905..4633ee579f00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ea850b5eb17f6d21ac1b3d99406d213a10c64e9 +refs/heads/master: bee8ce809fb1c877388be032b468574a1cfff9ef diff --git a/trunk/arch/avr32/mm/ioremap.c b/trunk/arch/avr32/mm/ioremap.c index 8cfec65e37f7..3437c82434ac 100644 --- a/trunk/arch/avr32/mm/ioremap.c +++ b/trunk/arch/avr32/mm/ioremap.c @@ -77,6 +77,8 @@ void __iounmap(void __iomem *addr) 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)) {