lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: page.h: move remaining bits and pieces

Browse Source 
# 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>
This commit is contained in:
Jeremy Fitzhardinge
2008-01-30 13:32:44 +01:00
committed by Ingo Molnar
parent 98fd5aee34
commit e62f4473f3
3 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/asm-x86/page.h
View File

@@ -80,6 +80,10 @@
void clear_page(void *page); void clear_page(void *page);
void copy_page(void *to, void *from); 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); extern unsigned long __phys_addr(unsigned long);
#define __phys_reloc_hide(x) (x) #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_pte_val(x) ((x).pte)
#define native_make_pte(x) ((pte_t) { (x) } ) #define native_make_pte(x) ((pte_t) { (x) } )
#define vmemmap ((struct page *)VMEMMAP_START)
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* CONFIG_X86_64 */ #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) #define pfn_valid(pfn) ((pfn) < max_mapnr)
#endif /* CONFIG_FLATMEM */ #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 #ifdef CONFIG_X86_USE_3DNOW
#include <asm/mmx.h> #include <asm/mmx.h>
@@ -325,6 +344,10 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
#define __HAVE_ARCH_GATE_AREA 1
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
# include "page_32.h" # include "page_32.h"

17
include/asm-x86/page_32.h
View File

@@ -7,7 +7,6 @@
/* /*
* These are used to make use of C type-checking.. * These are used to make use of C type-checking..
*/ */
extern int nx_enabled;
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
@@ -15,26 +14,10 @@ extern int nx_enabled;
struct vm_area_struct; 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__ */ #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 /* __KERNEL__ */
#endif /* _I386_PAGE_H */ #endif /* _I386_PAGE_H */

13
include/asm-x86/page_64.h
View File

@@ -4,26 +4,13 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern unsigned long end_pfn;
extern unsigned long end_pfn_map;
extern unsigned long phys_base;
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/bug.h>
#endif /* __ASSEMBLY__ */ #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__ */ #endif /* __KERNEL__ */
#ifdef CONFIG_FLATMEM #ifdef CONFIG_FLATMEM