aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Uytterhoeven <[email protected]>2021-09-02 14:50:01 -0700
committerLinus Torvalds <[email protected]>2021-09-03 09:58:09 -0700
commit1d1f4bf845d36d73b27ed37790cae0da3112ca77 (patch)
tree9457cf3b2f6baa0d5b4d8aa87a0c0ea1186ea8a7
parent577706de69c1e53bc23893953770d829a2242c38 (diff)
ia64: fix #endif comment for reserve_elfcorehdr()
Patch series "ia64: Miscellaneous fixes and cleanups". This patch series contains some miscellaneous fixes and cleanups for ia64. The second patch fixes a naming conflict triggered by a patch for the FDT code. This patch (of 3): The definition of reserve_elfcorehdr() depends on CONFIG_CRASH_DUMP, not CONFIG_PROC_VMCORE. Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/77b4c0648f200cab7e1c2c5171c06763e09362aa.1629884459.git.geert+renesas@glider.be Fixes: d9a9855d0b06ca6d ("always reserve elfcore header memory in crash kernel") Fixes: 17c1f07ed70afa4f ("[IA64] Reserve elfcorehdr memory in CONFIG_CRASH_DUMP") Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: Simon Horman <[email protected]> Cc: Tony Luck <[email protected]> Cc: Jay Lan <[email protected]> Cc: Magnus Damm <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Rob Herring <[email protected]> Cc: Frank Rowand <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--arch/ia64/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index dd595fbd8006..fbd931f1eb27 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -546,7 +546,7 @@ int __init reserve_elfcorehdr(u64 *start, u64 *end)
return 0;
}
-#endif /* CONFIG_PROC_VMCORE */
+#endif /* CONFIG_CRASH_DUMP */
void __init
setup_arch (char **cmdline_p)