]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP.
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 31 Mar 2011 07:27:20 +0000 (07:27 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 5 Apr 2011 06:22:10 +0000 (16:22 +1000)
commitb987812b3fcaf70fdf0037589e5d2f5f2453e6ce
treee6ca7dbcf476b02abba5c2abe98c2e976b25455f
parent83ebb3e3441d370409072139c4e264101e106417
powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP.

Commit b3df895aebe091b1657 "powerpc/kexec: Add support for FSL-BookE"
introduced the original PPC_STD_MMU_64 checks around the function
crash_kexec_wait_realmode().   Then commit c2be05481f61252
"powerpc: Fix default_machine_crash_shutdown #ifdef botch" changed
the ifdef around the calling site to add a check on SMP, but the
ifdef around the function itself was left unchanged, leaving an
unused function for PPC_STD_MMU_64=y and SMP=n

Rather than have two ifdefs that can get out of sync like this,
simply put the corrected conditional around the function and use
a stub to get rid of one set of ifdefs completely.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/kernel/crash.c