diff options
| -rw-r--r-- | arch/x86/include/asm/e820/api.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/aperture_64.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/cleanup.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/e820.c | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h index 3fdc061..6dc8570b 100644 --- a/arch/x86/include/asm/e820/api.h +++ b/arch/x86/include/asm/e820/api.h @@ -15,7 +15,7 @@ extern void e820_print_map(char *who); extern int sanitize_e820_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map); extern u64 e820_update_range(u64 start, u64 size, unsigned old_type, unsigned new_type); extern u64 e820_remove_range(u64 start, u64 size, unsigned old_type, int checktype); -extern void update_e820(void); +extern void e820__update_table_print(void); extern void e820_setup_gap(void); extern void e820__memory_setup_extended(u64 phys_addr, u32 data_len); extern unsigned long e820_end_of_ram_pfn(void); diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 8048c76..8590f48 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1716,5 +1716,5 @@ int __acpi_release_global_lock(unsigned int *lock) void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size) { e820_add_region(addr, size, E820_ACPI); - update_e820(); + e820__update_table_print(); } diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c index d8185a3..e21d012 100644 --- a/arch/x86/kernel/aperture_64.c +++ b/arch/x86/kernel/aperture_64.c @@ -312,7 +312,7 @@ void __init early_gart_iommu_check(void) pr_info("e820: reserve [mem %#010Lx-%#010Lx] for GART\n", aper_base, aper_base + aper_size - 1); e820_add_region(aper_base, aper_size, E820_RESERVED); - update_e820(); + e820__update_table_print(); } } diff --git a/arch/x86/kernel/cpu/mtrr/cleanup.c b/arch/x86/kernel/cpu/mtrr/cleanup.c index f1a7365..e201401 100644 --- a/arch/x86/kernel/cpu/mtrr/cleanup.c +++ b/arch/x86/kernel/cpu/mtrr/cleanup.c @@ -978,7 +978,7 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn) WARN_ON(1); pr_info("update e820 for mtrr\n"); - update_e820(); + e820__update_table_print(); return 1; } diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 93b5e3e..03af13c 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -546,7 +546,7 @@ u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type, int checkty return real_removed_size; } -void __init update_e820(void) +void __init e820__update_table_print(void) { if (sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries)) return; @@ -555,7 +555,7 @@ void __init update_e820(void) e820_print_map("modified"); } -static void __init update_e820_table_firmware(void) +static void __init e820__update_table_firmware(void) { sanitize_e820_table(e820_table_firmware->entries, ARRAY_SIZE(e820_table_firmware->entries), &e820_table_firmware->nr_entries); } @@ -749,7 +749,7 @@ u64 __init e820__memblock_alloc_reserved(u64 size, u64 align) if (addr) { e820_update_range_firmware(addr, size, E820_RAM, E820_RESERVED); pr_info("e820: update e820_table_firmware for e820__memblock_alloc_reserved()\n"); - update_e820_table_firmware(); + e820__update_table_firmware(); } return addr; |
