diff options
Diffstat (limited to 'arch/x86/kernel/setup_32.c')
-rw-r--r-- | arch/x86/kernel/setup_32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 35db426de300..c038b09b1723 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -577,9 +577,9 @@ static void __init relocate_initrd(void) | |||
577 | if (clen > MAX_MAP_CHUNK-slop) | 577 | if (clen > MAX_MAP_CHUNK-slop) |
578 | clen = MAX_MAP_CHUNK-slop; | 578 | clen = MAX_MAP_CHUNK-slop; |
579 | mapaddr = ramdisk_image & PAGE_MASK; | 579 | mapaddr = ramdisk_image & PAGE_MASK; |
580 | p = bt_ioremap(mapaddr, clen+slop); | 580 | p = early_ioremap(mapaddr, clen+slop); |
581 | memcpy(q, p+slop, clen); | 581 | memcpy(q, p+slop, clen); |
582 | bt_iounmap(p, clen+slop); | 582 | early_iounmap(p, clen+slop); |
583 | q += clen; | 583 | q += clen; |
584 | ramdisk_image += clen; | 584 | ramdisk_image += clen; |
585 | ramdisk_size -= clen; | 585 | ramdisk_size -= clen; |
@@ -697,7 +697,7 @@ void __init setup_arch(char **cmdline_p) | |||
697 | memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data)); | 697 | memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data)); |
698 | pre_setup_arch_hook(); | 698 | pre_setup_arch_hook(); |
699 | early_cpu_init(); | 699 | early_cpu_init(); |
700 | bt_ioremap_init(); | 700 | early_ioremap_init(); |
701 | 701 | ||
702 | #ifdef CONFIG_EFI | 702 | #ifdef CONFIG_EFI |
703 | if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, | 703 | if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, |