x86: page.h: move remaining bits and pieces
# HG changeset patch
# User Jeremy Fitzhardinge <jeremy@xensource.com>
# Date 1199319657 28800
# Node ID bba9287641ff90e836d090d80b5c0a846aab7162
# Parent d617b72a0cc9d14bde2087d065c36d4ed3265761
x86: page.h: move remaining bits and pieces
Move the remaining odds and ends into page.h.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h
index 9830eeb..f65a2ae 100644
--- a/include/asm-x86/page.h
+++ b/include/asm-x86/page.h
@@ -80,6 +80,10 @@
void clear_page(void *page);
void copy_page(void *to, void *from);
+extern unsigned long end_pfn;
+extern unsigned long end_pfn_map;
+extern unsigned long phys_base;
+
extern unsigned long __phys_addr(unsigned long);
#define __phys_reloc_hide(x) (x)
@@ -98,6 +102,8 @@
#define native_pte_val(x) ((x).pte)
#define native_make_pte(x) ((pte_t) { (x) } )
+#define vmemmap ((struct page *)VMEMMAP_START)
+
#endif /* !__ASSEMBLY__ */
#endif /* CONFIG_X86_64 */
@@ -184,6 +190,19 @@
#define pfn_valid(pfn) ((pfn) < max_mapnr)
#endif /* CONFIG_FLATMEM */
+extern int nx_enabled;
+
+/*
+ * This much address space is reserved for vmalloc() and iomap()
+ * as well as fixmap mappings.
+ */
+extern unsigned int __VMALLOC_RESERVE;
+extern int sysctl_legacy_va_layout;
+extern int page_is_ram(unsigned long pagenr);
+
+#define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)
+#define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE)
+
#ifdef CONFIG_X86_USE_3DNOW
#include <asm/mmx.h>
@@ -325,6 +344,10 @@
#endif /* __ASSEMBLY__ */
+#include <asm-generic/memory_model.h>
+#include <asm-generic/page.h>
+
+#define __HAVE_ARCH_GATE_AREA 1
#ifdef CONFIG_X86_32
# include "page_32.h"