---

yaml --- r: 338744 b: refs/heads/master c: 4de22c0 h: refs/heads/master v: v3
git-mirror · Dec 12, 2012 · f5b5fc8 · f5b5fc8
1 parent af4bbb9
commit f5b5fc8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6555bc035731eab76c0901925034465d3ad2099c
+refs/heads/master: 4de22c0584fb0566487b2cba5cdfbce346b18402
diff --git a/trunk/mm/highmem.c b/trunk/mm/highmem.c
@@ -99,7 +99,7 @@ struct page *kmap_to_page(void *vaddr)
 	unsigned long addr = (unsigned long)vaddr;
 
 	if (addr >= PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP)) {
-		int i = (addr - PKMAP_ADDR(0)) >> PAGE_SHIFT;
+		int i = PKMAP_NR(addr);
 		return pte_page(pkmap_page_table[i]);
 	}