Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e62f4473f32a882a537b32cb7202da8d5d7c4f1f
Commit: e62f4473f32a882a537b32cb7202da8d5d7c4f1f
Parent: 98fd5aee348f0420afd1c636790d50aaaec6ceec
Author: Jeremy Fitzhardinge <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:32:44 2008 +0100
Committer: Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:32:44 2008 +0100
x86: page.h: move remaining bits and pieces
# HG changeset patch
# User Jeremy Fitzhardinge <[EMAIL PROTECTED]>
# 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 <[EMAIL PROTECTED]>
Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
include/asm-x86/page.h | 23 ++++++++++++++++
include/asm-x86/page_32.h | 63 ++++++++++++++++----------------------------
include/asm-x86/page_64.h | 13 ---------
3 files changed, 46 insertions(+), 53 deletions(-)
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 @@ 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/include/asm-x86/page_32.h b/include/asm-x86/page_32.h
dissimilarity index 61%
index a27424a..c27b41f 100644
--- a/include/asm-x86/page_32.h
+++ b/include/asm-x86/page_32.h
@@ -1,40 +1,23 @@
-#ifndef _I386_PAGE_H
-#define _I386_PAGE_H
-
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-/*
- * These are used to make use of C type-checking..
- */
-extern int nx_enabled;
-
-#endif /* !__ASSEMBLY__ */
-
-#ifndef __ASSEMBLY__
-
-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 */
+#ifndef _I386_PAGE_H
+#define _I386_PAGE_H
+
+#ifdef __KERNEL__
+#ifndef __ASSEMBLY__
+
+/*
+ * These are used to make use of C type-checking..
+ */
+
+#endif /* !__ASSEMBLY__ */
+
+#ifndef __ASSEMBLY__
+
+struct vm_area_struct;
+
+#endif /* __ASSEMBLY__ */
+
+
+
+#endif /* __KERNEL__ */
+
+#endif /* _I386_PAGE_H */
diff --git a/include/asm-x86/page_64.h b/include/asm-x86/page_64.h
index 7094684..94d4803 100644
--- a/include/asm-x86/page_64.h
+++ b/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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
