]> git.karo-electronics.de Git - karo-tx-linux.git/commit
powerpc: Fix default_machine_crash_shutdown #ifdef botch
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 15 Jun 2010 14:48:39 +0000 (14:48 +0000)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Sun, 26 Jun 2011 16:47:10 +0000 (12:47 -0400)
commit8698d180e53b81689d0cf2e57df6b592d4f111e0
treec814a367e7c0470a7da9c7e572d435b50c3c6bc5
parent2bdb21e7430c5274580079bbec76cd5a1e0c1711
powerpc: Fix default_machine_crash_shutdown #ifdef botch

commit c2be05481f6125254c45b78f334d4dd09c701c82 upstream.

crash_kexec_wait_realmode() is defined only if CONFIG_PPC_STD_MMU_64
and CONFIG_SMP, but is called if CONFIG_PPC_STD_MMU_64 even if !CONFIG_SMP.
Fix the conditional compilation around the invocation.

[PG: commit b3df895aebe091b1657 "powerpc/kexec: Add support for FSL-BookE"
 introduced the PPC_STD_MMU_64 check this refers to, but we don't want to
 cherry pick that whole addition to stable just for one #ifdef line.]

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
arch/powerpc/kernel/crash.c