diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-31 07:27:20 +0000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-04-05 16:22:10 +1000 |
commit | b987812b3fcaf70fdf0037589e5d2f5f2453e6ce (patch) | |
tree | e6ca7dbcf476b02abba5c2abe98c2e976b25455f /fs/ncpfs/ncp_fs.h | |
parent | 83ebb3e3441d370409072139c4e264101e106417 (diff) | |
download | op-kernel-dev-b987812b3fcaf70fdf0037589e5d2f5f2453e6ce.zip op-kernel-dev-b987812b3fcaf70fdf0037589e5d2f5f2453e6ce.tar.gz |
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>
Diffstat (limited to 'fs/ncpfs/ncp_fs.h')
0 files changed, 0 insertions, 0 deletions