From f5b5fc884a1c0b6741945c360896eb3430c7af55 Mon Sep 17 00:00:00 2001
From: Joonsoo Kim <js1304@gmail.com>
Date: Tue, 11 Dec 2012 16:01:17 -0800
Subject: [PATCH] --- yaml --- r: 338744 b: refs/heads/master c:
 4de22c0584fb0566487b2cba5cdfbce346b18402 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 99922f6fc3c0..83cb81210279 100644
--- 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
index 2da13a5c50e2..2576a7118981 100644
--- 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]);
 	}