aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-11-16 22:39:02 -0500
committerH. Peter Anvin <hpa@linux.intel.com>2012-11-17 14:59:24 -0500
commit9985b4c6fa7d660f685918a58282275e9e35d8e0 (patch)
tree5cf8aac4a2500bbb0ada1ba3b4a47fffe6e1e57c /arch
parent5c51bdbe4c74dce7996d0bbfa39974775cc3f13c (diff)
x86, mm: Move min_pfn_mapped back to mm/init.c
Also change it to static. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Link: http://lkml.kernel.org/r/1353123563-3103-26-git-send-email-yinghai@kernel.org Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/page_types.h1
-rw-r--r--arch/x86/kernel/setup.c1
-rw-r--r--arch/x86/mm/init.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
index 9f6f3e66e84d..54c97879195e 100644
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
@@ -45,7 +45,6 @@ extern int devmem_is_allowed(unsigned long pagenr);
45 45
46extern unsigned long max_low_pfn_mapped; 46extern unsigned long max_low_pfn_mapped;
47extern unsigned long max_pfn_mapped; 47extern unsigned long max_pfn_mapped;
48extern unsigned long min_pfn_mapped;
49 48
50static inline phys_addr_t get_max_mapped(void) 49static inline phys_addr_t get_max_mapped(void)
51{ 50{
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f7634092931b..20151941cce8 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -124,7 +124,6 @@
124 */ 124 */
125unsigned long max_low_pfn_mapped; 125unsigned long max_low_pfn_mapped;
126unsigned long max_pfn_mapped; 126unsigned long max_pfn_mapped;
127unsigned long min_pfn_mapped;
128 127
129#ifdef CONFIG_DMI 128#ifdef CONFIG_DMI
130RESERVE_BRK(dmi_alloc, 65536); 129RESERVE_BRK(dmi_alloc, 65536);
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 848189229b2d..6392bf9a3947 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -23,6 +23,8 @@ unsigned long __initdata pgt_buf_start;
23unsigned long __meminitdata pgt_buf_end; 23unsigned long __meminitdata pgt_buf_end;
24unsigned long __meminitdata pgt_buf_top; 24unsigned long __meminitdata pgt_buf_top;
25 25
26static unsigned long min_pfn_mapped;
27
26__ref void *alloc_low_page(void) 28__ref void *alloc_low_page(void)
27{ 29{
28 unsigned long pfn; 30 unsigned long pfn;