x86/boot/e820: Rename e820_print_map() to e820__print_table()

All other table-level methods are already named 'table' in some way,
to change this one over to the (now consistent) nomenclature.

No change in functionality.

Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h
index 1c3615825115050d3c307c607d8e14ea83b8ace8..d4a944884219699eed42ab0f8eb63bbe6e5d126b 100644 (file)
--- a/arch/x86/include/asm/e820/api.h
+++ b/arch/x86/include/asm/e820/api.h
@@ -15,7 +15,7 @@ extern void e820__range_add   (u64 start, u64 size, int type);
 extern u64  e820__range_update(u64 start, u64 size, unsigned old_type, unsigned new_type);
 extern u64  e820__range_remove(u64 start, u64 size, unsigned old_type, int checktype);
 
-extern void e820_print_map(char *who);
+extern void e820__print_table(char *who);
 extern int  e820__update_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map);
 extern void e820__update_table_print(void);
 extern void e820__setup_pci_gap(void);

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index f91901ab9263b31aa54c825e1394e84ca7df8e32..cdf224992c27910730e4594905a3a7557218f3c9 100644 (file)
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -160,7 +160,7 @@ static void __init e820_print_type(u32 type)
        }
 }
 
-void __init e820_print_map(char *who)
+void __init e820__print_table(char *who)
 {
        int i;
 
@@ -552,7 +552,7 @@ void __init e820__update_table_print(void)
                return;
 
        pr_info("e820: modified physical RAM map:\n");
-       e820_print_map("modified");
+       e820__print_table("modified");
 }
 
 static void __init e820__update_table_firmware(void)
@@ -680,7 +680,7 @@ void __init e820__memory_setup_extended(u64 phys_addr, u32 data_len)
 
        early_memunmap(sdata, data_len);
        pr_info("e820: extended physical RAM map:\n");
-       e820_print_map("extended");
+       e820__print_table("extended");
 }
 
 /**
@@ -934,7 +934,7 @@ void __init e820_reserve_setup_data(void)
        e820__update_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);
        memcpy(e820_table_firmware, e820_table, sizeof(struct e820_table));
        printk(KERN_INFO "extended physical RAM map:\n");
-       e820_print_map("reserve setup_data");
+       e820__print_table("reserve setup_data");
 }
 
 /*
@@ -949,7 +949,7 @@ void __init e820__finish_early_params(void)
                        early_panic("Invalid user supplied memory map");
 
                pr_info("e820: user-defined physical RAM map:\n");
-               e820_print_map("user");
+               e820__print_table("user");
        }
 }
 
@@ -1167,7 +1167,7 @@ void __init e820__memory_setup(void)
        memcpy(e820_table_firmware, e820_table, sizeof(struct e820_table));
 
        pr_info("e820: BIOS-provided physical RAM map:\n");
-       e820_print_map(who);
+       e820__print_table(who);
 }
 
 void __init e820__memblock_setup(void)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 2449df3c0044fcbaf9a699fc95a7e83a3c5b9c2f..0e70a7bbeeefbe0aa27b31e5c9557d705c2d238d 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1035,7 +1035,7 @@ void __init setup_arch(char **cmdline_p)
                                  E820_RESERVED);
                e820__update_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries);
                printk(KERN_INFO "fixed physical RAM map:\n");
-               e820_print_map("bad_ppro");
+               e820__print_table("bad_ppro");
        }
 #else
        early_gart_iommu_check();