aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/acpi/boot.c2
-rw-r--r--arch/x86/kernel/e820_64.c28
-rw-r--r--arch/x86/kernel/setup_64.c2
-rw-r--r--arch/x86/mm/init_32.c6
-rw-r--r--arch/x86/mm/init_64.c2
-rw-r--r--include/asm-x86/page.h4
6 files changed, 21 insertions, 23 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 956b60f3ebd5..e277c370246d 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -115,7 +115,7 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
115 if (!phys_addr || !size) 115 if (!phys_addr || !size)
116 return NULL; 116 return NULL;
117 117
118 if (phys_addr+size <= (end_pfn_map << PAGE_SHIFT) + PAGE_SIZE) 118 if (phys_addr+size <= (max_pfn_mapped << PAGE_SHIFT) + PAGE_SIZE)
119 return __va(phys_addr); 119 return __va(phys_addr);
120 120
121 return NULL; 121 return NULL;
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
index d6ada0833876..a720f3d5ed9d 100644
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
@@ -36,11 +36,11 @@ struct e820map e820;
36unsigned long end_pfn; 36unsigned long end_pfn;
37 37
38/* 38/*
39 * end_pfn only includes RAM, while end_pfn_map includes all e820 entries. 39 * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
40 * The direct mapping extends to end_pfn_map, so that we can directly access 40 * The direct mapping extends to max_pfn_mapped, so that we can directly access
41 * apertures, ACPI and other tables without having to play with fixmaps. 41 * apertures, ACPI and other tables without having to play with fixmaps.
42 */ 42 */
43unsigned long end_pfn_map; 43unsigned long max_pfn_mapped;
44 44
45/* 45/*
46 * Last pfn which the user wants to use. 46 * Last pfn which the user wants to use.
@@ -281,16 +281,16 @@ unsigned long __init e820_end_of_ram(void)
281 281
282 end_pfn = find_max_pfn_with_active_regions(); 282 end_pfn = find_max_pfn_with_active_regions();
283 283
284 if (end_pfn > end_pfn_map) 284 if (end_pfn > max_pfn_mapped)
285 end_pfn_map = end_pfn; 285 max_pfn_mapped = end_pfn;
286 if (end_pfn_map > MAXMEM>>PAGE_SHIFT) 286 if (max_pfn_mapped > MAXMEM>>PAGE_SHIFT)
287 end_pfn_map = MAXMEM>>PAGE_SHIFT; 287 max_pfn_mapped = MAXMEM>>PAGE_SHIFT;
288 if (end_pfn > end_user_pfn) 288 if (end_pfn > end_user_pfn)
289 end_pfn = end_user_pfn; 289 end_pfn = end_user_pfn;
290 if (end_pfn > end_pfn_map) 290 if (end_pfn > max_pfn_mapped)
291 end_pfn = end_pfn_map; 291 end_pfn = max_pfn_mapped;
292 292
293 printk(KERN_INFO "end_pfn_map = %lu\n", end_pfn_map); 293 printk(KERN_INFO "max_pfn_mapped = %lu\n", max_pfn_mapped);
294 return end_pfn; 294 return end_pfn;
295} 295}
296 296
@@ -366,9 +366,9 @@ static int __init e820_find_active_region(const struct e820entry *ei,
366 if (*ei_startpfn >= *ei_endpfn) 366 if (*ei_startpfn >= *ei_endpfn)
367 return 0; 367 return 0;
368 368
369 /* Check if end_pfn_map should be updated */ 369 /* Check if max_pfn_mapped should be updated */
370 if (ei->type != E820_RAM && *ei_endpfn > end_pfn_map) 370 if (ei->type != E820_RAM && *ei_endpfn > max_pfn_mapped)
371 end_pfn_map = *ei_endpfn; 371 max_pfn_mapped = *ei_endpfn;
372 372
373 /* Skip if map is outside the node */ 373 /* Skip if map is outside the node */
374 if (ei->type != E820_RAM || *ei_endpfn <= start_pfn || 374 if (ei->type != E820_RAM || *ei_endpfn <= start_pfn ||
@@ -759,7 +759,7 @@ static int __init parse_memmap_opt(char *p)
759 saved_max_pfn = e820_end_of_ram(); 759 saved_max_pfn = e820_end_of_ram();
760 remove_all_active_ranges(); 760 remove_all_active_ranges();
761#endif 761#endif
762 end_pfn_map = 0; 762 max_pfn_mapped = 0;
763 e820.nr_map = 0; 763 e820.nr_map = 0;
764 userdef = 1; 764 userdef = 1;
765 return 0; 765 return 0;
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index c6fe1e4bc7c2..413b8fc31545 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -347,7 +347,7 @@ void __init setup_arch(char **cmdline_p)
347 347
348 check_efer(); 348 check_efer();
349 349
350 init_memory_mapping(0, (end_pfn_map << PAGE_SHIFT)); 350 init_memory_mapping(0, (max_pfn_mapped << PAGE_SHIFT));
351 if (efi_enabled) 351 if (efi_enabled)
352 efi_init(); 352 efi_init();
353 353
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",
diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h
index b734939916c4..6724a4bc6b7a 100644
--- a/include/asm-x86/page.h
+++ b/include/asm-x86/page.h
@@ -33,10 +33,8 @@
33 33
34#ifdef CONFIG_X86_64 34#ifdef CONFIG_X86_64
35#include <asm/page_64.h> 35#include <asm/page_64.h>
36#define max_pfn_mapped end_pfn_map
37#else 36#else
38#include <asm/page_32.h> 37#include <asm/page_32.h>
39#define max_pfn_mapped end_pfn_map
40#endif /* CONFIG_X86_64 */ 38#endif /* CONFIG_X86_64 */
41 39
42#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) 40#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)
@@ -50,7 +48,7 @@
50 48
51extern int page_is_ram(unsigned long pagenr); 49extern int page_is_ram(unsigned long pagenr);
52 50
53extern unsigned long end_pfn_map; 51extern unsigned long max_pfn_mapped;
54 52
55struct page; 53struct page;
56 54