diff options
| author | Andi Kleen <ak@suse.de> | 2008-01-30 13:33:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:50 +0100 |
| commit | c93c82bbea20bef627dbe8e34a4bc8e526217104 (patch) | |
| tree | a09faa5f8b21769ee6382d89b1fa8afc09a72aac | |
| parent | a3ae91b0a02a4ca0088f30d572c848f5d522573a (diff) | |
x86: shrink __PAGE_KERNEL/__PAGE_KERNEL_EXEC on non PAE kernels
No need to make it 64bit there.
Signed-off-by: Andi Kleen <ak@suse.de>
Acked-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/mm/init_32.c | 4 | ||||
| -rw-r--r-- | include/asm-x86/pgtable.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index e00c1d7128b..08ba3a14c72 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -332,9 +332,9 @@ static void __init set_highmem_pages_init(int bad_ppro) #define set_highmem_pages_init(bad_ppro) do { } while (0) #endif /* CONFIG_HIGHMEM */ -unsigned long long __PAGE_KERNEL = _PAGE_KERNEL; +pteval_t __PAGE_KERNEL = _PAGE_KERNEL; EXPORT_SYMBOL(__PAGE_KERNEL); -unsigned long long __PAGE_KERNEL_EXEC = _PAGE_KERNEL_EXEC; +pteval_t __PAGE_KERNEL_EXEC = _PAGE_KERNEL_EXEC; #ifdef CONFIG_NUMA extern void __init remap_numa_kva(void); diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h index 18a5f9e3283..0c3ecca0f79 100644 --- a/include/asm-x86/pgtable.h +++ b/include/asm-x86/pgtable.h @@ -69,7 +69,7 @@ #define _PAGE_KERNEL (_PAGE_KERNEL_EXEC | _PAGE_NX) #ifndef __ASSEMBLY__ -extern unsigned long long __PAGE_KERNEL, __PAGE_KERNEL_EXEC; +extern pteval_t __PAGE_KERNEL, __PAGE_KERNEL_EXEC; #endif /* __ASSEMBLY__ */ #else #define __PAGE_KERNEL_EXEC \ |