diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-10-18 03:05:22 -0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-26 05:09:23 -0500 |
| commit | 7a15dd5c4b9d916cb1734dfd79dbdd5773772abb (patch) | |
| tree | 02f1c1f19a1cf547bd004a09607b20d7d0352d31 /arch/m68k/kernel/setup_mm.c | |
| parent | 371001e502e8cd3543f7b9907d398a112939dff7 (diff) | |
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/m68k/kernel/setup_mm.c')
| -rw-r--r-- | arch/m68k/kernel/setup_mm.c | 4 |
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) | |||
| 346 | panic("No configuration setup"); | 346 | panic("No configuration setup"); |
| 347 | } | 347 | } |
| 348 | 348 | ||
| 349 | paging_init(); | ||
| 350 | |||
| 349 | #ifdef CONFIG_NATFEAT | 351 | #ifdef CONFIG_NATFEAT |
| 350 | nf_init(); | 352 | nf_init(); |
| 351 | #endif | 353 | #endif |
| 352 | 354 | ||
| 353 | paging_init(); | ||
| 354 | |||
| 355 | #ifndef CONFIG_SUN3 | 355 | #ifndef CONFIG_SUN3 |
| 356 | for (i = 1; i < m68k_num_memory; i++) | 356 | for (i = 1; i < m68k_num_memory; i++) |
| 357 | free_bootmem_node(NODE_DATA(i), m68k_memory[i].addr, | 357 | free_bootmem_node(NODE_DATA(i), m68k_memory[i].addr, |