m68k/atari: Call paging_init() before nf_init()

nf_init() uses virt_to_phys(), which depends on m68k_memoffset being set and
module_fixup() having been called, but this is only done in paging_init().
Hence call paging_init() before nf_init().

This went unnoticed, as virt_to_phys() is a no-op on Atari, unless you start
fiddling with the memory blocks in the bootinfo manually.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 0191485d7b7d..28abca421974 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -346,12 +346,12 @@ void __init setup_arch(char **cmdline_p)
                 panic("No configuration setup");
         }
 
+        paging_init();
+
 #ifdef CONFIG_NATFEAT
         nf_init();
 #endif
 
-        paging_init();
-
 #ifndef CONFIG_SUN3
         for (i = 1; i < m68k_num_memory; i++)
                 free_bootmem_node(NODE_DATA(i), m68k_memory[i].addr,