aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/mm/init_32.c4
-rw-r--r--include/asm-x86/pgtable.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index e00c1d7128b1..08ba3a14c72c 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)
332#define set_highmem_pages_init(bad_ppro) do { } while (0) 332#define set_highmem_pages_init(bad_ppro) do { } while (0)
333#endif /* CONFIG_HIGHMEM */ 333#endif /* CONFIG_HIGHMEM */
334 334
335unsigned long long __PAGE_KERNEL = _PAGE_KERNEL; 335pteval_t __PAGE_KERNEL = _PAGE_KERNEL;
336EXPORT_SYMBOL(__PAGE_KERNEL); 336EXPORT_SYMBOL(__PAGE_KERNEL);
337unsigned long long __PAGE_KERNEL_EXEC = _PAGE_KERNEL_EXEC; 337pteval_t __PAGE_KERNEL_EXEC = _PAGE_KERNEL_EXEC;
338 338
339#ifdef CONFIG_NUMA 339#ifdef CONFIG_NUMA
340extern void __init remap_numa_kva(void); 340extern void __init remap_numa_kva(void);
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h
index 18a5f9e32834..0c3ecca0f79c 100644
--- a/include/asm-x86/pgtable.h
+++ b/include/asm-x86/pgtable.h
@@ -69,7 +69,7 @@
69#define _PAGE_KERNEL (_PAGE_KERNEL_EXEC | _PAGE_NX) 69#define _PAGE_KERNEL (_PAGE_KERNEL_EXEC | _PAGE_NX)
70 70
71#ifndef __ASSEMBLY__ 71#ifndef __ASSEMBLY__
72extern unsigned long long __PAGE_KERNEL, __PAGE_KERNEL_EXEC; 72extern pteval_t __PAGE_KERNEL, __PAGE_KERNEL_EXEC;
73#endif /* __ASSEMBLY__ */ 73#endif /* __ASSEMBLY__ */
74#else 74#else
75#define __PAGE_KERNEL_EXEC \ 75#define __PAGE_KERNEL_EXEC \