p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Ingo Molnar 2017-01-28 22:41:14 +01:00
parent 81b3e090fa
commit 1506c8dc94
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/include/asm/e820/api.h
View File

@ -27,8 +27,8 @@ extern void e820__memblock_setup(void);
extern void e820__reserve_setup_data(void); extern void e820__reserve_setup_data(void);
extern void e820__finish_early_params(void); extern void e820__finish_early_params(void);
extern void e820_reserve_resources(void); extern void e820__reserve_resources(void);
extern void e820_reserve_resources_late(void); extern void e820__reserve_resources_late(void);
extern void e820__memory_setup(void); extern void e820__memory_setup(void);
extern void e820__memory_setup_extended(u64 phys_addr, u32 data_len); extern void e820__memory_setup_extended(u64 phys_addr, u32 data_len);

2
arch/x86/kernel/apic/apic.c
View File

@ -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 * that is using request_resource
*/ */
late_initcall(lapic_insert_resource); late_initcall(lapic_insert_resource);

16
arch/x86/kernel/e820.c
View File

@ -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; 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; static struct resource __initdata *e820_res;
void __init e820_reserve_resources(void) void __init e820__reserve_resources(void)
{ {
int i; int i;
struct resource *res; struct resource *res;
@ -1059,9 +1059,9 @@ void __init e820_reserve_resources(void)
res->desc = e820_type_to_iores_desc(entry); res->desc = e820_type_to_iores_desc(entry);
/* /*
* don't register the region that could be conflicted with * Don't register the region that could be conflicted with
* pci device BAR resource and insert them later in * PCI device BAR resources and insert them later in
* pcibios_resource_survey() * pcibios_resource_survey():
*/ */
if (do_mark_busy(entry->type, res)) { if (do_mark_busy(entry->type, res)) {
res->flags |= IORESOURCE_BUSY; 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) static unsigned long __init ram_alignment(resource_size_t pos)
{ {
unsigned long mb = pos >> 20; 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) #define MAX_RESOURCE_SIZE ((resource_size_t)-1)
void __init e820_reserve_resources_late(void) void __init e820__reserve_resources_late(void)
{ {
int i; int i;
struct resource *res; struct resource *res;

2
arch/x86/kernel/setup.c
View File

@ -1235,7 +1235,7 @@ void __init setup_arch(char **cmdline_p)
kvm_guest_init(); kvm_guest_init();
e820_reserve_resources(); e820__reserve_resources();
e820_mark_nosave_regions(max_low_pfn); e820_mark_nosave_regions(max_low_pfn);
x86_init.resources.reserve_resources(); x86_init.resources.reserve_resources();

2
arch/x86/pci/i386.c
View File

@ -398,7 +398,7 @@ void __init pcibios_resource_survey(void)
list_for_each_entry(bus, &pci_root_buses, node) list_for_each_entry(bus, &pci_root_buses, node)
pcibios_allocate_resources(bus, 1); pcibios_allocate_resources(bus, 1);
e820_reserve_resources_late(); e820__reserve_resources_late();
/* /*
* Insert the IO APIC resources after PCI initialization has * Insert the IO APIC resources after PCI initialization has
* occurred to handle IO APICS that are mapped in on a BAR in * occurred to handle IO APICS that are mapped in on a BAR in