aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/e820.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/e820.c')
-rw-r--r--arch/x86/kernel/e820.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 6c60aeaac15f..9af89078f7bb 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1299,11 +1299,6 @@ void __init e820_reserve_resources(void)
1299 } 1299 }
1300} 1300}
1301 1301
1302/*
1303 * Non-standard memory setup can be specified via this quirk:
1304 */
1305char * (*arch_memory_setup_quirk)(void);
1306
1307char *__init default_machine_specific_memory_setup(void) 1302char *__init default_machine_specific_memory_setup(void)
1308{ 1303{
1309 char *who = "BIOS-e820"; 1304 char *who = "BIOS-e820";
@@ -1344,8 +1339,8 @@ char *__init default_machine_specific_memory_setup(void)
1344 1339
1345char *__init __attribute__((weak)) machine_specific_memory_setup(void) 1340char *__init __attribute__((weak)) machine_specific_memory_setup(void)
1346{ 1341{
1347 if (arch_memory_setup_quirk) { 1342 if (x86_quirks->arch_memory_setup) {
1348 char *who = arch_memory_setup_quirk(); 1343 char *who = x86_quirks->arch_memory_setup();
1349 1344
1350 if (who) 1345 if (who)
1351 return who; 1346 return who;