aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/init_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r--arch/x86/mm/init_32.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 187522a0c66b..e9df0d9cdeb6 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -59,16 +59,16 @@ unsigned long highstart_pfn, highend_pfn;
59static noinline int do_test_wp_bit(void); 59static noinline int do_test_wp_bit(void);
60 60
61 61
62extern unsigned long __initdata table_start; 62extern unsigned long __initdata e820_table_start;
63extern unsigned long __meminitdata table_end; 63extern unsigned long __meminitdata e820_table_end;
64extern unsigned long __meminitdata table_top; 64extern unsigned long __meminitdata e820_table_top;
65 65
66static __init void *alloc_low_page(void) 66static __init void *alloc_low_page(void)
67{ 67{
68 unsigned long pfn = table_end++; 68 unsigned long pfn = e820_table_end++;
69 void *adr; 69 void *adr;
70 70
71 if (pfn >= table_top) 71 if (pfn >= e820_table_top)
72 panic("alloc_low_page: ran out of memory"); 72 panic("alloc_low_page: ran out of memory");
73 73
74 adr = __va(pfn * PAGE_SIZE); 74 adr = __va(pfn * PAGE_SIZE);
@@ -149,8 +149,8 @@ static pte_t *__init page_table_kmap_check(pte_t *pte, pmd_t *pmd,
149 if (pmd_idx_kmap_begin != pmd_idx_kmap_end 149 if (pmd_idx_kmap_begin != pmd_idx_kmap_end
150 && (vaddr >> PMD_SHIFT) >= pmd_idx_kmap_begin 150 && (vaddr >> PMD_SHIFT) >= pmd_idx_kmap_begin
151 && (vaddr >> PMD_SHIFT) <= pmd_idx_kmap_end 151 && (vaddr >> PMD_SHIFT) <= pmd_idx_kmap_end
152 && ((__pa(pte) >> PAGE_SHIFT) < table_start 152 && ((__pa(pte) >> PAGE_SHIFT) < e820_table_start
153 || (__pa(pte) >> PAGE_SHIFT) >= table_end)) { 153 || (__pa(pte) >> PAGE_SHIFT) >= e820_table_end)) {
154 pte_t *newpte; 154 pte_t *newpte;
155 int i; 155 int i;
156 156