[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 <andrea@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/i386/mm/ioremap.c

@@ -253,7 +253,7 @@ 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,
+				 p->size >> PAGE_SHIFT,
 				 PAGE_KERNEL);
 		global_flush_tlb();
 	} 

arch/x86_64/mm/ioremap.c

@@ -267,7 +267,7 @@ 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,
+				 p->size >> PAGE_SHIFT,
 				 PAGE_KERNEL);
 		global_flush_tlb();
 	}