aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-11-16 22:39:07 -0500
committerH. Peter Anvin <hpa@linux.intel.com>2012-11-17 14:59:36 -0500
commitcf47065961b48727b4e47bc3e2e67f4996878437 (patch)
treec8bf9664368172d33ae0263ad4f04e79f320ab17
parent719272c45b821d38608fc333700bde1a89c56c59 (diff)
x86, mm: Move back pgt_buf_* to mm/init.c
Also change them to static. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Link: http://lkml.kernel.org/r/1353123563-3103-31-git-send-email-yinghai@kernel.org Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--arch/x86/include/asm/init.h4
-rw-r--r--arch/x86/mm/init.c6
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/include/asm/init.h b/arch/x86/include/asm/init.h
index 4f13998be59a..626ea8d31b6d 100644
--- a/arch/x86/include/asm/init.h
+++ b/arch/x86/include/asm/init.h
@@ -12,8 +12,4 @@ kernel_physical_mapping_init(unsigned long start,
12 unsigned long end, 12 unsigned long end,
13 unsigned long page_size_mask); 13 unsigned long page_size_mask);
14 14
15extern unsigned long __initdata pgt_buf_start;
16extern unsigned long __meminitdata pgt_buf_end;
17extern unsigned long __meminitdata pgt_buf_top;
18
19#endif /* _ASM_X86_INIT_32_H */ 15#endif /* _ASM_X86_INIT_32_H */
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index bed4888c6f4f..3cadf1013cea 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -19,9 +19,9 @@
19 19
20#include "mm_internal.h" 20#include "mm_internal.h"
21 21
22unsigned long __initdata pgt_buf_start; 22static unsigned long __initdata pgt_buf_start;
23unsigned long __meminitdata pgt_buf_end; 23static unsigned long __initdata pgt_buf_end;
24unsigned long __meminitdata pgt_buf_top; 24static unsigned long __initdata pgt_buf_top;
25 25
26static unsigned long min_pfn_mapped; 26static unsigned long min_pfn_mapped;
27 27