aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/init_32.c6
-rw-r--r--arch/x86/mm/init_64.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 73dd0601166a..fc3ace2e88f1 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -51,7 +51,7 @@
51 51
52unsigned int __VMALLOC_RESERVE = 128 << 20; 52unsigned int __VMALLOC_RESERVE = 128 << 20;
53 53
54unsigned long end_pfn_map; 54unsigned long max_pfn_mapped;
55 55
56DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); 56DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
57unsigned long highstart_pfn, highend_pfn; 57unsigned long highstart_pfn, highend_pfn;
@@ -196,7 +196,7 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
196 set_pmd(pmd, pfn_pmd(pfn, prot)); 196 set_pmd(pmd, pfn_pmd(pfn, prot));
197 197
198 pfn += PTRS_PER_PTE; 198 pfn += PTRS_PER_PTE;
199 end_pfn_map = pfn; 199 max_pfn_mapped = pfn;
200 continue; 200 continue;
201 } 201 }
202 pte = one_page_table_init(pmd); 202 pte = one_page_table_init(pmd);
@@ -211,7 +211,7 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
211 211
212 set_pte(pte, pfn_pte(pfn, prot)); 212 set_pte(pte, pfn_pte(pfn, prot));
213 } 213 }
214 end_pfn_map = pfn; 214 max_pfn_mapped = pfn;
215 } 215 }
216 } 216 }
217} 217}
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 210243e94d84..ef9e9cfb1fc2 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -791,7 +791,7 @@ void __init reserve_bootmem_generic(unsigned long phys, unsigned len)
791 * This can happen with kdump kernels when accessing 791 * This can happen with kdump kernels when accessing
792 * firmware tables: 792 * firmware tables:
793 */ 793 */
794 if (pfn < end_pfn_map) 794 if (pfn < max_pfn_mapped)
795 return; 795 return;
796 796
797 printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %u\n", 797 printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %u\n",