From 09aa3367ff6a0bbff7ce35eb770aab23bc9d4213 Mon Sep 17 00:00:00 2001 From: Andrea Arcangeli Date: Mon, 7 Mar 2005 18:49:39 -0800 Subject: [PATCH] remove vmalloc guard page knowledge from arch code Now that we cleaned up the guard page handling in vmalloc, we have to remove the p-PAGE_SIZE hack that was put in there for the original guard page handling. This also removes some spurious tab. Signed-off-by: Andrea Arcangeli Signed-off-by: Linus Torvalds --- arch/i386/mm/ioremap.c | 4 ++-- arch/x86_64/mm/ioremap.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c index dc47cdd86386..e6209fe7d509 100644 --- a/arch/i386/mm/ioremap.c +++ b/arch/i386/mm/ioremap.c @@ -253,8 +253,8 @@ void iounmap(volatile void __iomem *addr) if ((p->flags >> 20) && p->phys_addr < virt_to_phys(high_memory) - 1) { /* p->size includes the guard page, but cpa doesn't like that */ change_page_attr(virt_to_page(__va(p->phys_addr)), - (p->size - PAGE_SIZE) >> PAGE_SHIFT, - PAGE_KERNEL); + p->size >> PAGE_SHIFT, + PAGE_KERNEL); global_flush_tlb(); } kfree(p); diff --git a/arch/x86_64/mm/ioremap.c b/arch/x86_64/mm/ioremap.c index 911262d8ca19..f3fad903503e 100644 --- a/arch/x86_64/mm/ioremap.c +++ b/arch/x86_64/mm/ioremap.c @@ -267,8 +267,8 @@ void iounmap(volatile void __iomem *addr) p->phys_addr + p->size - 1 < virt_to_phys(high_memory)) { /* p->size includes the guard page, but cpa doesn't like that */ change_page_attr(virt_to_page(__va(p->phys_addr)), - (p->size - PAGE_SIZE) >> PAGE_SHIFT, - PAGE_KERNEL); + p->size >> PAGE_SHIFT, + PAGE_KERNEL); global_flush_tlb(); } out_unlock: -- cgit v1.2.3