From c47f505509ba41870ccfa42e10eddf34af9c856f Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 2 May 2007 19:27:10 +0200
Subject: [PATCH] --- yaml --- r: 53815 b: refs/heads/master c:
 2bff73830c3df5f575d3bc21bf19df1a10bf7091 h: refs/heads/master i:   53813:
 de989d3a9c72fab0efba8898365c85790b5c8da9   53811:
 0595453b520dc67490cb9c40451a6b417b1a0c67   53807:
 34b39274a56041baffbbc7ac202fea639f35b4a2 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86_64/mm/fault.c       |  5 ++---
 trunk/include/asm-x86_64/pgalloc.h | 14 +++-----------
 trunk/include/asm-x86_64/pgtable.h |  2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index fef2bcef6751..8bfbcf9c41ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05f36927eddd83e2840a981ef4d9af754dcb86e9
+refs/heads/master: 2bff73830c3df5f575d3bc21bf19df1a10bf7091
diff --git a/trunk/arch/x86_64/mm/fault.c b/trunk/arch/x86_64/mm/fault.c
index 6ada7231f3ab..de99dba2c515 100644
--- a/trunk/arch/x86_64/mm/fault.c
+++ b/trunk/arch/x86_64/mm/fault.c
@@ -585,7 +585,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
 }
 
 DEFINE_SPINLOCK(pgd_lock);
-struct page *pgd_list;
+LIST_HEAD(pgd_list);
 
 void vmalloc_sync_all(void)
 {
@@ -605,8 +605,7 @@ void vmalloc_sync_all(void)
 			if (pgd_none(*pgd_ref))
 				continue;
 			spin_lock(&pgd_lock);
-			for (page = pgd_list; page;
-			     page = (struct page *)page->index) {
+			list_for_each_entry(page, &pgd_list, lru) {
 				pgd_t *pgd;
 				pgd = (pgd_t *)page_address(page) + pgd_index(address);
 				if (pgd_none(*pgd))
diff --git a/trunk/include/asm-x86_64/pgalloc.h b/trunk/include/asm-x86_64/pgalloc.h
index 31d497171969..8bb564687860 100644
--- a/trunk/include/asm-x86_64/pgalloc.h
+++ b/trunk/include/asm-x86_64/pgalloc.h
@@ -44,24 +44,16 @@ static inline void pgd_list_add(pgd_t *pgd)
 	struct page *page = virt_to_page(pgd);
 
 	spin_lock(&pgd_lock);
-	page->index = (pgoff_t)pgd_list;
-	if (pgd_list)
-		pgd_list->private = (unsigned long)&page->index;
-	pgd_list = page;
-	page->private = (unsigned long)&pgd_list;
+	list_add(&page->lru, &pgd_list);
 	spin_unlock(&pgd_lock);
 }
 
 static inline void pgd_list_del(pgd_t *pgd)
 {
-	struct page *next, **pprev, *page = virt_to_page(pgd);
+	struct page *page = virt_to_page(pgd);
 
 	spin_lock(&pgd_lock);
-	next = (struct page *)page->index;
-	pprev = (struct page **)page->private;
-	*pprev = next;
-	if (next)
-		next->private = (unsigned long)pprev;
+	list_del(&page->lru);
 	spin_unlock(&pgd_lock);
 }
 
diff --git a/trunk/include/asm-x86_64/pgtable.h b/trunk/include/asm-x86_64/pgtable.h
index c1865e38c7b7..599993f6ba84 100644
--- a/trunk/include/asm-x86_64/pgtable.h
+++ b/trunk/include/asm-x86_64/pgtable.h
@@ -410,7 +410,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 #define __swp_entry_to_pte(x)		((pte_t) { (x).val })
 
 extern spinlock_t pgd_lock;
-extern struct page *pgd_list;
+extern struct list_head pgd_list;
 void vmalloc_sync_all(void);
 
 extern int kern_addr_valid(unsigned long addr);