diff options
Diffstat (limited to 'arch/i386/kernel/setup.c')
-rw-r--r-- | arch/i386/kernel/setup.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index e5bb87aa5a45..695d53fd14de 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c | |||
@@ -495,6 +495,12 @@ static void set_mca_bus(int x) | |||
495 | static void set_mca_bus(int x) { } | 495 | static void set_mca_bus(int x) { } |
496 | #endif | 496 | #endif |
497 | 497 | ||
498 | /* Overridden in paravirt.c if CONFIG_PARAVIRT */ | ||
499 | char * __attribute__((weak)) memory_setup(void) | ||
500 | { | ||
501 | return machine_specific_memory_setup(); | ||
502 | } | ||
503 | |||
498 | /* | 504 | /* |
499 | * Determine if we were loaded by an EFI loader. If so, then we have also been | 505 | * Determine if we were loaded by an EFI loader. If so, then we have also been |
500 | * passed the efi memmap, systab, etc., so we should use these data structures | 506 | * passed the efi memmap, systab, etc., so we should use these data structures |
@@ -547,7 +553,7 @@ void __init setup_arch(char **cmdline_p) | |||
547 | efi_init(); | 553 | efi_init(); |
548 | else { | 554 | else { |
549 | printk(KERN_INFO "BIOS-provided physical RAM map:\n"); | 555 | printk(KERN_INFO "BIOS-provided physical RAM map:\n"); |
550 | print_memory_map(machine_specific_memory_setup()); | 556 | print_memory_map(memory_setup()); |
551 | } | 557 | } |
552 | 558 | ||
553 | copy_edd(); | 559 | copy_edd(); |