diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-01-30 12:32:41 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 12:32:41 (GMT) |
commit | 83a5101bf2fa7dcf09ffd436078a021d32c97f85 (patch) | |
tree | 57a99676a79c33274a4c0db5638fe30f434c4f94 /include/asm-x86/page_32.h | |
parent | 9566e91d494ed0668edf88f852de7f251fe8fe9a (diff) | |
download | linux-fsl-qoriq-83a5101bf2fa7dcf09ffd436078a021d32c97f85.tar.xz |
x86: page.h: unify constants
# HG changeset patch
# User Jeremy Fitzhardinge <jeremy@xensource.com>
# Date 1199317360 28800
# Node ID ba0ec40a50a7aef1a3153cea124c35e261f5a2df
# Parent c45c263179cb78284b6b869c574457df088027d1
x86: page.h: unify constants
There are many constants which are shared by 32 and 64-bit.
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>
Diffstat (limited to 'include/asm-x86/page_32.h')
-rw-r--r-- | include/asm-x86/page_32.h | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index c620c93..69e5200 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h @@ -1,14 +1,6 @@ #ifndef _I386_PAGE_H #define _I386_PAGE_H -/* PAGE_SHIFT determines the page size */ -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) - -#define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1)) -#define LARGE_PAGE_SIZE (1UL << PMD_SHIFT) - #ifdef __KERNEL__ #ifndef __ASSEMBLY__ @@ -111,7 +103,6 @@ static inline pte_t native_make_pte(unsigned long long val) #define __pmd(x) native_make_pmd(x) #endif -#define HPAGE_SHIFT 21 #include <asm-generic/pgtable-nopud.h> #else /* !CONFIG_X86_PAE */ typedef struct { unsigned long pte_low; } pte_t; @@ -139,19 +130,11 @@ static inline pte_t native_make_pte(unsigned long val) return (pte_t) { .pte_low = val }; } -#define HPAGE_SHIFT 22 #include <asm-generic/pgtable-nopmd.h> #endif /* CONFIG_X86_PAE */ #define PTE_MASK PAGE_MASK -#ifdef CONFIG_HUGETLB_PAGE -#define HPAGE_SIZE ((1UL) << HPAGE_SHIFT) -#define HPAGE_MASK (~(HPAGE_SIZE - 1)) -#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) -#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA -#endif - #define pgprot_val(x) ((x).pgprot) #define __pgprot(x) ((pgprot_t) { (x) } ) @@ -164,22 +147,6 @@ static inline pte_t native_make_pte(unsigned long val) #endif /* !__ASSEMBLY__ */ -/* to align the pointer to the (next) page boundary */ -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) - -/* - * This handles the memory map.. We could make this a config - * option, but too many people screw it up, and too few need - * it. - * - * A __PAGE_OFFSET of 0xC0000000 means that the kernel has - * a virtual address space of one gigabyte, which limits the - * amount of physical memory you can use to about 950MB. - * - * If you want more physical memory than this then see the CONFIG_HIGHMEM4G - * and CONFIG_HIGHMEM64G options in the kernel configuration. - */ - #ifndef __ASSEMBLY__ struct vm_area_struct; @@ -196,14 +163,6 @@ extern int page_is_ram(unsigned long pagenr); #endif /* __ASSEMBLY__ */ -#ifdef __ASSEMBLY__ -#define __PAGE_OFFSET CONFIG_PAGE_OFFSET -#else -#define __PAGE_OFFSET ((unsigned long)CONFIG_PAGE_OFFSET) -#endif - - -#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) #define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE) #define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) @@ -219,11 +178,6 @@ extern int page_is_ram(unsigned long pagenr); #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) -#define VM_DATA_DEFAULT_FLAGS \ - (VM_READ | VM_WRITE | \ - ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - #include <asm-generic/memory_model.h> #include <asm-generic/page.h> |