aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2008-01-30 13:32:58 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:32:58 +0100
commit8405b122ad0dd75354b3bfed4de9a96514fd40cb (patch)
tree764cb9bc9f262e1191ed8c2785042819dcf2db64 /include
parentd8d89827fc0c9c2ea6ac4c22e14e30586a856f58 (diff)
x86: unify zero_page definition
Move ZERO_PAGE/empty_zero_page to common place. Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/pgtable.h8
-rw-r--r--include/asm-x86/pgtable_32.h6
-rw-r--r--include/asm-x86/pgtable_64.h7
3 files changed, 8 insertions, 13 deletions
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h
index 820db41dbe4..eb14a70a472 100644
--- a/include/asm-x86/pgtable.h
+++ b/include/asm-x86/pgtable.h
@@ -118,6 +118,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/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h
index d4d238c1029..eb8cccfa6a4 100644
--- a/include/asm-x86/pgtable_32.h
+++ b/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/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h
index 987f51f684a..435e17187eb 100644
--- a/include/asm-x86/pgtable_64.h
+++ b/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__ */
/*