--- 028stab028_1/arch/x86_64/mm/ioremap.c~orig  2007-04-19 14:30:35.000000000 +0400
+++ 028stab028_1/arch/x86_64/mm/ioremap.c       2007-04-19 15:04:30.000000000 +0400
@@ -287,7 +287,8 @@ void iounmap(volatile void __iomem *addr

        /* Reset the direct mapping. Can block */
        if (p->flags >> 20)
-               ioremap_change_attr(p->phys_addr, p->size, 0);
+               /* p->size includes the guard page, but cpa doesn't like that */
+               ioremap_change_attr(p->phys_addr, p->size - PAGE_SIZE, 0);

        /* Finally remove it */
        o = remove_vm_area((void *)addr);