x86/boot/e820: Rename e820_reserve_resources*() to e820__reserve_resources*()

Also do some minor cleanups.

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 78a0feb84c9f7aa1ab12e16ede9d578eb4cbfd10..7d033e9d93c442b1920b5c5aa0f50544d9c6b92d 100644 (file)
--- a/arch/x86/include/asm/e820/api.h
+++ b/arch/x86/include/asm/e820/api.h
@@ -27,8 +27,8 @@ extern void e820__memblock_setup(void);
 
 extern void e820__reserve_setup_data(void);
 extern void e820__finish_early_params(void);
-extern void e820_reserve_resources(void);
-extern void e820_reserve_resources_late(void);
+extern void e820__reserve_resources(void);
+extern void e820__reserve_resources_late(void);
 
 extern void e820__memory_setup(void);
 extern void e820__memory_setup_extended(u64 phys_addr, u32 data_len);

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 5b7e43eff139b888bb757c5c7ce3172017c5158b..4cb43df5079f925bd031ab2b2395086c0d1e2ab8 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2647,7 +2647,7 @@ static int __init lapic_insert_resource(void)
 }
 
 /*
- * need call insert after e820_reserve_resources()
+ * need call insert after e820__reserve_resources()
  * that is using request_resource
  */
 late_initcall(lapic_insert_resource);

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index aa80166a0ec63d91b3a9539134a675d2132af2e9..552cb9f74dd3c4c2f01e042a060de7c12419e8f6 100644 (file)
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -629,7 +629,7 @@ __init void e820__setup_pci_gap(void)
        }
 
        /*
-        * e820_reserve_resources_late protect stolen RAM already
+        * e820__reserve_resources_late() protects stolen RAM already:
         */
        pci_mem_start = gapstart;
 
@@ -1035,7 +1035,7 @@ static bool __init do_mark_busy(u32 type, struct resource *res)
 
 static struct resource __initdata *e820_res;
 
-void __init e820_reserve_resources(void)
+void __init e820__reserve_resources(void)
 {
        int i;
        struct resource *res;
@@ -1059,9 +1059,9 @@ void __init e820_reserve_resources(void)
                res->desc  = e820_type_to_iores_desc(entry);
 
                /*
-                * don't register the region that could be conflicted with
-                * pci device BAR resource and insert them later in
-                * pcibios_resource_survey()
+                * Don't register the region that could be conflicted with
+                * PCI device BAR resources and insert them later in
+                * pcibios_resource_survey():
                 */
                if (do_mark_busy(entry->type, res)) {
                        res->flags |= IORESOURCE_BUSY;
@@ -1077,7 +1077,9 @@ void __init e820_reserve_resources(void)
        }
 }
 
-/* How much should we pad RAM ending depending on where it is? */
+/*
+ * How much should we pad the end of RAM, depending on where it is?
+ */
 static unsigned long __init ram_alignment(resource_size_t pos)
 {
        unsigned long mb = pos >> 20;
@@ -1096,7 +1098,7 @@ static unsigned long __init ram_alignment(resource_size_t pos)
 
 #define MAX_RESOURCE_SIZE ((resource_size_t)-1)
 
-void __init e820_reserve_resources_late(void)
+void __init e820__reserve_resources_late(void)
 {
        int i;
        struct resource *res;

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 4ac8ae8a7573ea40435a7cf4e4dc6a2d2693443e..34b16fcef13150265bb3be1e73b73d1aaca7374f 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1235,7 +1235,7 @@ void __init setup_arch(char **cmdline_p)
 
        kvm_guest_init();
 
-       e820_reserve_resources();
+       e820__reserve_resources();
        e820_mark_nosave_regions(max_low_pfn);
 
        x86_init.resources.reserve_resources();

diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 9a074431174f84ad93516a3bf8909c0b8148ccd2..6fa84d531f4feabb5d695dae191b61d1f79cd6b3 100644 (file)
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -398,7 +398,7 @@ void __init pcibios_resource_survey(void)
        list_for_each_entry(bus, &pci_root_buses, node)
                pcibios_allocate_resources(bus, 1);
 
-       e820_reserve_resources_late();
+       e820__reserve_resources_late();
        /*
         * Insert the IO APIC resources after PCI initialization has
         * occurred to handle IO APICS that are mapped in on a BAR in