diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h index 3ba95d462bbc1ad9600a427d4a80206b234633e1..d4374ba26472692bb5f8593cd1fc2a38cdb02c00 100644 --- a/arch/x86/include/asm/e820/api.h +++ b/arch/x86/include/asm/e820/api.h @@ -16,7 +16,7 @@ extern int e820__update_table(struct e820_entry *biosmap, int max_nr_map, u32 * 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 e820__update_table_print(void); -extern void e820_setup_gap(void); +extern void e820__setup_pci_gap(void); extern void e820__memory_setup_extended(u64 phys_addr, u32 data_len); extern unsigned long e820_end_of_ram_pfn(void); extern unsigned long e820_end_of_low_ram_pfn(void); diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 804acee76acaae9cff4f2694b4c4a06223cd5e39..cb25c7248656fb433cf3f60bf3c987b3bfe6e29d 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -602,7 +602,7 @@ static int __init e820_search_gap(unsigned long *gapstart, unsigned long *gapsiz * * Hopefully the BIOS let enough space left. */ -__init void e820_setup_gap(void) +__init void e820__setup_pci_gap(void) { unsigned long gapstart, gapsize; int found; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 5ea90a2b37093176f380e25c36f24ebf8745ad32..0fd7c0ef27160ebcab900739c7140532faac4425 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1241,7 +1241,7 @@ void __init setup_arch(char **cmdline_p) x86_init.resources.reserve_resources(); - e820_setup_gap(); + e820__setup_pci_gap(); #ifdef CONFIG_VT #if defined(CONFIG_VGA_CONSOLE)