Also do some minor cleanups. No change in functionality.
Cc: Alex Thorlton <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Dan Williams <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Huang, Ying <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Juergen Gross <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Paul Jackson <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Wei Yang <[email protected]> Cc: Yinghai Lu <[email protected]> Cc: [email protected] Signed-off-by: Ingo Molnar <[email protected]> --- arch/x86/include/asm/e820/api.h | 4 ++-- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/e820.c | 16 +++++++++------- arch/x86/kernel/setup.c | 2 +- arch/x86/pci/i386.c | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h index 78a0feb84c9f..7d033e9d93c4 100644 --- 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 5b7e43eff139..4cb43df5079f 100644 --- 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 aa80166a0ec6..552cb9f74dd3 100644 --- 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 4ac8ae8a7573..34b16fcef131 100644 --- 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 9a074431174f..6fa84d531f4f 100644 --- 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 -- 2.7.4
