From f38ae5705c09580b103f93e139e6ffb7855f32b3 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 30 Jan 2008 13:32:44 +0100
Subject: [PATCH] --- yaml --- r: 80175 b: refs/heads/master c:
 e62f4473f32a882a537b32cb7202da8d5d7c4f1f h: refs/heads/master i:   80173:
 fcb591891bf7589d3b648f8f5631aaff2f648236   80171:
 4401342ac1ae2c6e9894b459f5663155bec02a26   80167:
 116c4f305802802c66b73e5f57cc177ccc8a75b3   80159:
 e3355ff995b519ef0a8bbb57096a719c90be36d7 v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-x86/page.h    | 23 +++++++++++++++++++++++
 trunk/include/asm-x86/page_32.h | 17 -----------------
 trunk/include/asm-x86/page_64.h | 13 -------------
 4 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/[refs] b/[refs]
index 3d791a97c1ce..b956984b018f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98fd5aee348f0420afd1c636790d50aaaec6ceec
+refs/heads/master: e62f4473f32a882a537b32cb7202da8d5d7c4f1f
diff --git a/trunk/include/asm-x86/page.h b/trunk/include/asm-x86/page.h
index 9830eeb57173..f65a2ae6e323 100644
--- a/trunk/include/asm-x86/page.h
+++ b/trunk/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 @@ typedef struct { pteval_t pte; } pte_t;
 #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 @@ static inline pte_t native_make_pte(unsigned long val)
 #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 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
 
 #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"
diff --git a/trunk/include/asm-x86/page_32.h b/trunk/include/asm-x86/page_32.h
index a27424a2ee0d..c27b41fd0254 100644
--- a/trunk/include/asm-x86/page_32.h
+++ b/trunk/include/asm-x86/page_32.h
@@ -7,7 +7,6 @@
 /*
  * These are used to make use of C type-checking..
  */
-extern int nx_enabled;
 
 #endif /* !__ASSEMBLY__ */
 
@@ -15,26 +14,10 @@ extern int nx_enabled;
 
 struct vm_area_struct;
 
-/*
- * 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);
-
 #endif /* __ASSEMBLY__ */
 
-#define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)
-#define MAXMEM			(-__PAGE_OFFSET-__VMALLOC_RESERVE)
-
 
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
 
-#define __HAVE_ARCH_GATE_AREA 1
 #endif /* __KERNEL__ */
 
 #endif /* _I386_PAGE_H */
diff --git a/trunk/include/asm-x86/page_64.h b/trunk/include/asm-x86/page_64.h
index 7094684270a6..94d4803aab2d 100644
--- a/trunk/include/asm-x86/page_64.h
+++ b/trunk/include/asm-x86/page_64.h
@@ -4,26 +4,13 @@
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
-extern unsigned long end_pfn;
-extern unsigned long end_pfn_map;
-
-
-extern unsigned long phys_base;
-
 #endif /* !__ASSEMBLY__ */
 
 #ifndef __ASSEMBLY__
 
-#include <asm/bug.h>
 
 #endif /* __ASSEMBLY__ */
 
-#define __HAVE_ARCH_GATE_AREA 1	
-#define vmemmap ((struct page *)VMEMMAP_START)
-
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
-
 #endif /* __KERNEL__ */
 
 #ifdef CONFIG_FLATMEM