summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-10-18 09:05:22 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-11-26 11:09:23 +0100
commit7a15dd5c4b9d916cb1734dfd79dbdd5773772abb (patch)
tree02f1c1f19a1cf547bd004a09607b20d7d0352d31 /arch
parent371001e502e8cd3543f7b9907d398a112939dff7 (diff)
downloadlinux-stable-7a15dd5c4b9d916cb1734dfd79dbdd5773772abb.tar.gz
linux-stable-7a15dd5c4b9d916cb1734dfd79dbdd5773772abb.tar.bz2
linux-stable-7a15dd5c4b9d916cb1734dfd79dbdd5773772abb.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/kernel/setup_mm.c4
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,