OSDN Git Service

powerpc/32: Fix boot failure on non 6xx platforms
authorChristophe Leroy <christophe.leroy@c-s.fr>
Tue, 8 Aug 2017 06:37:24 +0000 (08:37 +0200)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 8 Aug 2017 09:35:34 +0000 (19:35 +1000)
commit64d0a506fbdd64906f168539bee32ac7dcabb521
tree6882765cb191318e525a7e478dba03c06a61a45f
parent2552910084a5e12e280caf082ab01468e187a064
powerpc/32: Fix boot failure on non 6xx platforms

Commit d300627c6a536 ("powerpc/6xx: Handle DABR match before calling
do_page_fault") breaks non 6xx platforms.

  Failed to execute /init (error -14)
  Starting init: /bin/sh exists but couldn't execute it (error -14)
  Kernel panic - not syncing: No working init found.  Try passing init= ...
  CPU: 0 PID: 1 Comm: init Not tainted 4.13.0-rc3-s3k-dev-00143-g7aa62e972a56 #56
  Call Trace:
    panic+0x108/0x250 (unreliable)
    rootfs_mount+0x0/0x58
    ret_from_kernel_thread+0x5c/0x64
  Rebooting in 180 seconds..

This is because in handle_page_fault(), the call to do_page_fault() has been
mistakenly enclosed inside an #ifdef CONFIG_6xx

Fixes: d300627c6a536 ("powerpc/6xx: Handle DABR match before calling do_page_fault")
Brown-paper-bag-to-be-worn-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/entry_32.S