---

yaml --- r: 181134 b: refs/heads/master c: 920efaa h: refs/heads/master v: v3
git-mirror · Jan 20, 2010 · 1e79348 · 1e79348
1 parent 85c7661
commit 1e79348
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b51989b8afe9409ee68c67ce2a5de4390693bd2b
+refs/heads/master: 920efaabcbd34e6b8dc05c5b777df3e936af5812
diff --git a/trunk/arch/sh/mm/ioremap_fixed.c b/trunk/arch/sh/mm/ioremap_fixed.c
@@ -93,9 +93,7 @@ ioremap_fixed(resource_size_t phys_addr, unsigned long offset,
 int iounmap_fixed(void __iomem *addr)
 {
 	enum fixed_addresses idx;
-	unsigned long virt_addr;
 	struct ioremap_map *map;
-	unsigned long offset;
 	unsigned int nrpages;
 	int i, slot;
 
@@ -114,12 +112,9 @@ int iounmap_fixed(void __iomem *addr)
 	if (slot < 0)
 		return -EINVAL;
 
-	virt_addr = (unsigned long)addr;
+	nrpages = map->size >> PAGE_SHIFT;
 
-	offset = virt_addr & ~PAGE_MASK;
-	nrpages = PAGE_ALIGN(offset + map->size - 1) >> PAGE_SHIFT;
-
-	idx = FIX_IOREMAP_BEGIN + slot + nrpages;
+	idx = FIX_IOREMAP_BEGIN + slot + nrpages - 1;
 	while (nrpages > 0) {
 		__clear_fixmap(idx, __pgprot(_PAGE_WIRED));
 		--idx;