From 1e3f66a70bbeb9116e4dbbf4b7b670733800857d Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 30 Jan 2008 13:32:58 +0100
Subject: [PATCH] --- yaml --- r: 80225 b: refs/heads/master c:
 8405b122ad0dd75354b3bfed4de9a96514fd40cb h: refs/heads/master i:   80223:
 58fd5a0d78ceaef5148d8c1b0600dacf68d64f43 v: v3

---
 [refs]                             | 2 +-
 trunk/include/asm-x86/pgtable.h    | 8 ++++++++
 trunk/include/asm-x86/pgtable_32.h | 6 ------
 trunk/include/asm-x86/pgtable_64.h | 7 -------
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 0c58ccb24832..a57ad24fcb69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8d89827fc0c9c2ea6ac4c22e14e30586a856f58
+refs/heads/master: 8405b122ad0dd75354b3bfed4de9a96514fd40cb
diff --git a/trunk/include/asm-x86/pgtable.h b/trunk/include/asm-x86/pgtable.h
index 820db41dbe4c..eb14a70a4728 100644
--- a/trunk/include/asm-x86/pgtable.h
+++ b/trunk/include/asm-x86/pgtable.h
@@ -117,6 +117,14 @@ extern unsigned long long __PAGE_KERNEL, __PAGE_KERNEL_EXEC;
 
 #ifndef __ASSEMBLY__
 
+/*
+ * ZERO_PAGE is a global shared page that is always zero: used
+ * for zero-mapped memory areas etc..
+ */
+extern unsigned long empty_zero_page[PAGE_SIZE/sizeof(unsigned long)];
+#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
+
+
 /*
  * The following only work if pte_present() is true.
  * Undefined behaviour if not..
diff --git a/trunk/include/asm-x86/pgtable_32.h b/trunk/include/asm-x86/pgtable_32.h
index d4d238c10293..eb8cccfa6a49 100644
--- a/trunk/include/asm-x86/pgtable_32.h
+++ b/trunk/include/asm-x86/pgtable_32.h
@@ -25,12 +25,6 @@
 struct mm_struct;
 struct vm_area_struct;
 
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
-extern unsigned long empty_zero_page[1024];
 extern pgd_t swapper_pg_dir[1024];
 extern struct kmem_cache *pmd_cache;
 extern spinlock_t pgd_lock;
diff --git a/trunk/include/asm-x86/pgtable_64.h b/trunk/include/asm-x86/pgtable_64.h
index 987f51f684a5..435e17187eb6 100644
--- a/trunk/include/asm-x86/pgtable_64.h
+++ b/trunk/include/asm-x86/pgtable_64.h
@@ -23,13 +23,6 @@ extern pgd_t init_level4_pgt[];
 extern void paging_init(void);
 extern void clear_kernel_mapping(unsigned long addr, unsigned long size);
 
-/*
- * ZERO_PAGE is a global shared page that is always zero: used
- * for zero-mapped memory areas etc..
- */
-extern unsigned long empty_zero_page[PAGE_SIZE/sizeof(unsigned long)];
-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
-
 #endif /* !__ASSEMBLY__ */
 
 /*