--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
-@@ -774,7 +774,6 @@ static void __init arch_mem_init(char **
+@@ -846,7 +846,6 @@ static void __init arch_mem_init(char **
crashk_res.end - crashk_res.start + 1,
BOOTMEM_DEFAULT);
#endif
sparse_init();
plat_swiotlb_setup();
-@@ -890,6 +889,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -962,6 +961,7 @@ void __init setup_arch(char **cmdline_p)
cpu_cache_init();
paging_init();