Skip to content

Commit

Permalink
m68k: Fix boot regression on machines with RAM at non-zero
Browse files Browse the repository at this point in the history
My enhancement to store the initial mapping size for later reuse in commit
486df8b ("m68k: Increase initial mapping
to 8 or 16 MiB if possible") broke booting on machines where RAM doesn't
start at address zero.

Use pc-relative addressing to fix this.

Reported-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Andreas Schwab <schwab@linux-m68k.org>
  • Loading branch information
Geert Uytterhoeven committed Jul 10, 2014
1 parent cd3de83 commit f1a1b63
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/m68k/kernel/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,8 @@ L(nocon):
jls 1f
lsrl #1,%d1
1:
movel %d1,m68k_init_mapped_size
lea %pc@(m68k_init_mapped_size),%a0
movel %d1,%a0@
mmu_map #PAGE_OFFSET,%pc@(L(phys_kernel_start)),%d1,\
%pc@(m68k_supervisor_cachemode)

Expand Down

0 comments on commit f1a1b63

Please sign in to comment.