Commit a354e2c8 authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Linus Torvalds

mm, highmem: remove page_address_pool list

We can find free page_address_map instance without the page_address_pool.
So remove it.
Signed-off-by: default avatarJoonsoo Kim <js1304@gmail.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Reviewed-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cc33a303
...@@ -324,10 +324,7 @@ struct page_address_map { ...@@ -324,10 +324,7 @@ struct page_address_map {
struct list_head list; struct list_head list;
}; };
/* static struct page_address_map page_address_maps[LAST_PKMAP];
* page_address_map freelist, allocated from page_address_maps.
*/
static struct list_head page_address_pool; /* freelist */
/* /*
* Hash table bucket * Hash table bucket
...@@ -392,12 +389,7 @@ void set_page_address(struct page *page, void *virtual) ...@@ -392,12 +389,7 @@ void set_page_address(struct page *page, void *virtual)
pas = page_slot(page); pas = page_slot(page);
if (virtual) { /* Add */ if (virtual) { /* Add */
BUG_ON(list_empty(&page_address_pool)); pam = &page_address_maps[PKMAP_NR((unsigned long)virtual)];
pam = list_entry(page_address_pool.next,
struct page_address_map, list);
list_del(&pam->list);
pam->page = page; pam->page = page;
pam->virtual = virtual; pam->virtual = virtual;
...@@ -410,7 +402,6 @@ void set_page_address(struct page *page, void *virtual) ...@@ -410,7 +402,6 @@ void set_page_address(struct page *page, void *virtual)
if (pam->page == page) { if (pam->page == page) {
list_del(&pam->list); list_del(&pam->list);
spin_unlock_irqrestore(&pas->lock, flags); spin_unlock_irqrestore(&pas->lock, flags);
list_add_tail(&pam->list, &page_address_pool);
goto done; goto done;
} }
} }
...@@ -420,15 +411,10 @@ void set_page_address(struct page *page, void *virtual) ...@@ -420,15 +411,10 @@ void set_page_address(struct page *page, void *virtual)
return; return;
} }
static struct page_address_map page_address_maps[LAST_PKMAP];
void __init page_address_init(void) void __init page_address_init(void)
{ {
int i; 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++) { for (i = 0; i < ARRAY_SIZE(page_address_htable); i++) {
INIT_LIST_HEAD(&page_address_htable[i].lh); INIT_LIST_HEAD(&page_address_htable[i].lh);
spin_lock_init(&page_address_htable[i].lock); spin_lock_init(&page_address_htable[i].lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment