Merge tag 'mips_5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

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

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index c3d4212b5f1d4d5732dc9a45fbbc71ede2bdf274..1ac2752fb7919ea26fb1caf5470ea3887887beb0 100644 (file)
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -515,8 +515,7 @@ static void __init request_crashkernel(struct resource *res)
        ret = request_resource(res, &crashk_res);
        if (!ret)
                pr_info("Reserving %ldMB of memory at %ldMB for crashkernel\n",
-                       (unsigned long)((crashk_res.end -
-                                        crashk_res.start + 1) >> 20),
+                       (unsigned long)(resource_size(&crashk_res) >> 20),
                        (unsigned long)(crashk_res.start  >> 20));
 }
 #else /* !defined(CONFIG_KEXEC)                */
@@ -698,8 +697,7 @@ static void __init arch_mem_init(char **cmdline_p)
        mips_parse_crashkernel();
 #ifdef CONFIG_KEXEC
        if (crashk_res.start != crashk_res.end)
-               memblock_reserve(crashk_res.start,
-                                crashk_res.end - crashk_res.start + 1);
+               memblock_reserve(crashk_res.start, resource_size(&crashk_res));
 #endif
        device_tree_init();
        sparse_init();
@@ -796,8 +794,6 @@ void __init setup_arch(char **cmdline_p)
 #if defined(CONFIG_VT)
 #if defined(CONFIG_VGA_CONSOLE)
        conswitchp = &vga_con;
-#elif defined(CONFIG_DUMMY_CONSOLE)
-       conswitchp = &dummy_con;
 #endif
 #endif