diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-01-30 13:32:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:32:44 +0100 |
| commit | e62f4473f32a882a537b32cb7202da8d5d7c4f1f (patch) | |
| tree | d407a2b5bda90cfc999b763f7398e7f50a087b5a | |
| parent | 98fd5aee348f0420afd1c636790d50aaaec6ceec (diff) | |
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>
| -rw-r--r-- | include/asm-x86/page.h | 23 | ||||
| -rw-r--r-- | include/asm-x86/page_32.h | 17 | ||||
| -rw-r--r-- | include/asm-x86/page_64.h | 13 |
3 files changed, 23 insertions, 30 deletions
diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h index 9830eeb5717..f65a2ae6e32 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 index a27424a2ee0..c27b41fd025 100644 --- a/include/asm-x86/page_32.h +++ b/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/include/asm-x86/page_64.h b/include/asm-x86/page_64.h index 7094684270a..94d4803aab2 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 |