From eff0bcb2ed21cac3b2ca3be1b72635a4f99381e2 Mon Sep 17 00:00:00 2001
From: Joonsoo Kim <js1304@gmail.com>
Date: Tue, 11 Dec 2012 16:01:24 -0800
Subject: [PATCH] --- yaml --- r: 338747 b: refs/heads/master c:
 eb2db439a3203ae86c35ad277ac4a3268a94baa1 h: refs/heads/master i:   338745:
 122a2aede1902d1b5855cbb8ea0c05ebc45b95a9   338743:
 af4bbb9f68bbb1e7f8473f9f2ab1ff50833f4793 v: v3

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

diff --git a/[refs] b/[refs]
index cb1d30ec5771..a74aa4b4cc54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a354e2c84eeebcd7d7bbdd71216895b8e9866b5c
+refs/heads/master: eb2db439a3203ae86c35ad277ac4a3268a94baa1
diff --git a/trunk/mm/highmem.c b/trunk/mm/highmem.c
index 4d6f96c20191..d999077431df 100644
--- a/trunk/mm/highmem.c
+++ b/trunk/mm/highmem.c
@@ -137,8 +137,7 @@ static void flush_all_zero_pkmaps(void)
 		 * So no dangers, even with speculative execution.
 		 */
 		page = pte_page(pkmap_page_table[i]);
-		pte_clear(&init_mm, (unsigned long)page_address(page),
-			  &pkmap_page_table[i]);
+		pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
 
 		set_page_address(page, NULL);
 		need_flush = 1;