From a805f968fb71be4d7c18feafcab53144fa49120c Mon Sep 17 00:00:00 2001
From: Florian Zumbiehl <florz@florz.de>
Date: Tue, 20 Jul 2010 15:19:47 -0700
Subject: [PATCH] --- yaml --- r: 205495 b: refs/heads/master c:
 468c30f2bbdf1ba0fbf16667eade23a46eaa8f06 h: refs/heads/master i:   205493:
 560efd999a3f9fe35f3e757a12a2bff459961b6d   205491:
 5a28766415850838d0cd8bb860eb1b3615f935d2   205487:
 accbbb116d8f79cbbf7cb29889d5c21dedbd183d v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/ioremap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 73e753a84dfa..43d25d3175c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92851e2fca48f1893f899963c13b55b61ac6956c
+refs/heads/master: 468c30f2bbdf1ba0fbf16667eade23a46eaa8f06
diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c
index d41d3a9036ca..3ba6e0608c55 100644
--- a/trunk/arch/x86/mm/ioremap.c
+++ b/trunk/arch/x86/mm/ioremap.c
@@ -611,7 +611,7 @@ void __init early_iounmap(void __iomem *addr, unsigned long size)
 		return;
 	}
 	offset = virt_addr & ~PAGE_MASK;
-	nrpages = PAGE_ALIGN(offset + size - 1) >> PAGE_SHIFT;
+	nrpages = PAGE_ALIGN(offset + size) >> PAGE_SHIFT;
 
 	idx = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*slot;
 	while (nrpages > 0) {