aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/setup_32.c')
-rw-r--r--arch/x86/kernel/setup_32.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 32fc87adc4a3..2e805da337a2 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -644,12 +644,12 @@ void __init setup_arch(char **cmdline_p)
644 rd_doload = ((boot_params.hdr.ram_size & RAMDISK_LOAD_FLAG) != 0); 644 rd_doload = ((boot_params.hdr.ram_size & RAMDISK_LOAD_FLAG) != 0);
645#endif 645#endif
646 ARCH_SETUP 646 ARCH_SETUP
647
648 printk(KERN_INFO "BIOS-provided physical RAM map:\n");
649 print_memory_map(memory_setup());
650
647 if (efi_enabled) 651 if (efi_enabled)
648 efi_init(); 652 efi_init();
649 else {
650 printk(KERN_INFO "BIOS-provided physical RAM map:\n");
651 print_memory_map(memory_setup());
652 }
653 653
654 copy_edd(); 654 copy_edd();
655 655
@@ -769,14 +769,8 @@ static int __init request_standard_resources(void)
769 int i; 769 int i;
770 770
771 printk(KERN_INFO "Setting up standard PCI resources\n"); 771 printk(KERN_INFO "Setting up standard PCI resources\n");
772 if (efi_enabled) 772 init_iomem_resources(&code_resource, &data_resource, &bss_resource);
773 efi_initialize_iomem_resources(&code_resource,
774 &data_resource, &bss_resource);
775 else
776 legacy_init_iomem_resources(&code_resource,
777 &data_resource, &bss_resource);
778 773
779 /* EFI systems may still have VGA */
780 request_resource(&iomem_resource, &video_ram_resource); 774 request_resource(&iomem_resource, &video_ram_resource);
781 775
782 /* request I/O space for devices used on all i[345]86 PCs */ 776 /* request I/O space for devices used on all i[345]86 PCs */