Merge tag 'loongarch-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai...

[sfrench/cifs-2.6.git] / arch / loongarch / kernel / setup.c

diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c
index 7bf9afaeea006b2be3201e1903b97a5552e3f39e..60e0fe97f61a31604b095044395c40ba6fd5efc8 100644 (file)
--- a/arch/loongarch/kernel/setup.c
+++ b/arch/loongarch/kernel/setup.c
@@ -261,7 +261,7 @@ static void __init arch_reserve_crashkernel(void)
        char *cmdline = boot_command_line;
        bool high = false;
 
-       if (!IS_ENABLED(CONFIG_KEXEC_CORE))
+       if (!IS_ENABLED(CONFIG_CRASH_RESERVE))
                return;
 
        ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
@@ -491,7 +491,7 @@ static int __init add_legacy_isa_io(struct fwnode_handle *fwnode,
        }
 
        vaddr = (unsigned long)(PCI_IOBASE + range->io_start);
-       ioremap_page_range(vaddr, vaddr + size, hw_start, pgprot_device(PAGE_KERNEL));
+       vmap_page_range(vaddr, vaddr + size, hw_start, pgprot_device(PAGE_KERNEL));
 
        return 0;
 }