aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/mm/init.c')
-rw-r--r--arch/x86/mm/init.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 5bbdfe7459d2..6475693a81ab 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -11,17 +11,12 @@
11 11
12#ifdef CONFIG_X86_32 12#ifdef CONFIG_X86_32
13extern void __init early_ioremap_page_table_range_init(void); 13extern void __init early_ioremap_page_table_range_init(void);
14extern void __init kernel_physical_mapping_init(unsigned long start_pfn,
15 unsigned long end_pfn,
16 int use_pse);
17#endif 14#endif
18 15
19#ifdef CONFIG_X86_64 16extern unsigned long __init
20extern unsigned long __meminit
21kernel_physical_mapping_init(unsigned long start, 17kernel_physical_mapping_init(unsigned long start,
22 unsigned long end, 18 unsigned long end,
23 unsigned long page_size_mask); 19 unsigned long page_size_mask);
24#endif
25 20
26unsigned long __initdata e820_table_start; 21unsigned long __initdata e820_table_start;
27unsigned long __meminitdata e820_table_end; 22unsigned long __meminitdata e820_table_end;
@@ -301,10 +296,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
301 296
302#ifdef CONFIG_X86_32 297#ifdef CONFIG_X86_32
303 for (i = 0; i < nr_range; i++) 298 for (i = 0; i < nr_range; i++)
304 kernel_physical_mapping_init( 299 kernel_physical_mapping_init(mr[i].start, mr[i].end,
305 mr[i].start >> PAGE_SHIFT, 300 mr[i].page_size_mask);
306 mr[i].end >> PAGE_SHIFT,
307 mr[i].page_size_mask == (1<<PG_LEVEL_2M));
308 ret = end; 301 ret = end;
309#else /* CONFIG_X86_64 */ 302#else /* CONFIG_X86_64 */
310 for (i = 0; i < nr_range; i++) 303 for (i = 0; i < nr_range; i++)