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

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

diff --git a/[refs] b/[refs]
index cbb4f856ca33..cb1d30ec5771 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc33a303f1c155cf0147964586bb80fa732d8a21
+refs/heads/master: a354e2c84eeebcd7d7bbdd71216895b8e9866b5c
diff --git a/trunk/mm/highmem.c b/trunk/mm/highmem.c
index f0f0f1d5e691..4d6f96c20191 100644
--- a/trunk/mm/highmem.c
+++ b/trunk/mm/highmem.c
@@ -324,10 +324,7 @@ struct page_address_map {
 	struct list_head list;
 };
 
-/*
- * page_address_map freelist, allocated from page_address_maps.
- */
-static struct list_head page_address_pool;	/* freelist */
+static struct page_address_map page_address_maps[LAST_PKMAP];
 
 /*
  * Hash table bucket
@@ -392,12 +389,7 @@ void set_page_address(struct page *page, void *virtual)
 
 	pas = page_slot(page);
 	if (virtual) {		/* Add */
-		BUG_ON(list_empty(&page_address_pool));
-
-		pam = list_entry(page_address_pool.next,
-				struct page_address_map, list);
-		list_del(&pam->list);
-
+		pam = &page_address_maps[PKMAP_NR((unsigned long)virtual)];
 		pam->page = page;
 		pam->virtual = virtual;
 
@@ -410,7 +402,6 @@ void set_page_address(struct page *page, void *virtual)
 			if (pam->page == page) {
 				list_del(&pam->list);
 				spin_unlock_irqrestore(&pas->lock, flags);
-				list_add_tail(&pam->list, &page_address_pool);
 				goto done;
 			}
 		}
@@ -420,15 +411,10 @@ void set_page_address(struct page *page, void *virtual)
 	return;
 }
 
-static struct page_address_map page_address_maps[LAST_PKMAP];
-
 void __init page_address_init(void)
 {
 	int i;
 
-	INIT_LIST_HEAD(&page_address_pool);
-	for (i = 0; i < ARRAY_SIZE(page_address_maps); i++)
-		list_add(&page_address_maps[i].list, &page_address_pool);
 	for (i = 0; i < ARRAY_SIZE(page_address_htable); i++) {
 		INIT_LIST_HEAD(&page_address_htable[i].lh);
 		spin_lock_init(&page_address_htable[i].lock);