aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/init.c10
-rw-r--r--arch/x86/mm/init_32.c6
-rw-r--r--arch/x86/mm/init_64.c5
3 files changed, 3 insertions, 18 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 6475693a81ab..6d63e3d1253d 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -3,21 +3,13 @@
3 3
4#include <asm/cacheflush.h> 4#include <asm/cacheflush.h>
5#include <asm/e820.h> 5#include <asm/e820.h>
6#include <asm/init.h>
6#include <asm/page.h> 7#include <asm/page.h>
7#include <asm/page_types.h> 8#include <asm/page_types.h>
8#include <asm/sections.h> 9#include <asm/sections.h>
9#include <asm/system.h> 10#include <asm/system.h>
10#include <asm/tlbflush.h> 11#include <asm/tlbflush.h>
11 12
12#ifdef CONFIG_X86_32
13extern void __init early_ioremap_page_table_range_init(void);
14#endif
15
16extern unsigned long __init
17kernel_physical_mapping_init(unsigned long start,
18 unsigned long end,
19 unsigned long page_size_mask);
20
21unsigned long __initdata e820_table_start; 13unsigned long __initdata e820_table_start;
22unsigned long __meminitdata e820_table_end; 14unsigned long __meminitdata e820_table_end;
23unsigned long __meminitdata e820_table_top; 15unsigned long __meminitdata e820_table_top;
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 5ca9c6c3439e..1669693e97de 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -49,6 +49,7 @@
49#include <asm/paravirt.h> 49#include <asm/paravirt.h>
50#include <asm/setup.h> 50#include <asm/setup.h>
51#include <asm/cacheflush.h> 51#include <asm/cacheflush.h>
52#include <asm/init.h>
52 53
53unsigned long max_low_pfn_mapped; 54unsigned long max_low_pfn_mapped;
54unsigned long max_pfn_mapped; 55unsigned long max_pfn_mapped;
@@ -58,11 +59,6 @@ unsigned long highstart_pfn, highend_pfn;
58 59
59static noinline int do_test_wp_bit(void); 60static noinline int do_test_wp_bit(void);
60 61
61
62extern unsigned long __initdata e820_table_start;
63extern unsigned long __meminitdata e820_table_end;
64extern unsigned long __meminitdata e820_table_top;
65
66static __init void *alloc_low_page(void) 62static __init void *alloc_low_page(void)
67{ 63{
68 unsigned long pfn = e820_table_end++; 64 unsigned long pfn = e820_table_end++;
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index f441ae316312..7dd7ce49d69b 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -48,6 +48,7 @@
48#include <asm/kdebug.h> 48#include <asm/kdebug.h>
49#include <asm/numa.h> 49#include <asm/numa.h>
50#include <asm/cacheflush.h> 50#include <asm/cacheflush.h>
51#include <asm/init.h>
51 52
52/* 53/*
53 * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries. 54 * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
@@ -283,10 +284,6 @@ void __init cleanup_highmap(void)
283 } 284 }
284} 285}
285 286
286extern unsigned long __initdata e820_table_start;
287extern unsigned long __meminitdata e820_table_end;
288extern unsigned long __meminitdata e820_table_top;
289
290static __ref void *alloc_low_page(unsigned long *phys) 287static __ref void *alloc_low_page(unsigned long *phys)
291{ 288{
292 unsigned long pfn = e820_table_end++; 289 unsigned long pfn = e820_table_end++;