Message ID | 77b4c0648f200cab7e1c2c5171c06763e09362aa.1629884459.git.geert+renesas@glider.be |
---|---|
State | Accepted |
Commit | 1d1f4bf845d36d73b27ed37790cae0da3112ca77 |
Headers | show |
Series | ia64: Miscellaneous fixes and cleanups | expand |
On Wed, Aug 25, 2021 at 01:48:27PM +0200, Geert Uytterhoeven wrote: > The definition of reserve_elfcorehdr() depends on CONFIG_CRASH_DUMP, not > CONFIG_PROC_VMCORE. > > 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 <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms@verge.net.au> > --- > arch/ia64/kernel/setup.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c > index dd595fbd800651fe..fbd931f1eb270d98 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) > -- > 2.25.1 >
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index dd595fbd800651fe..fbd931f1eb270d98 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)
The definition of reserve_elfcorehdr() depends on CONFIG_CRASH_DUMP, not CONFIG_PROC_VMCORE. 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 <geert+renesas@glider.be> --- arch/ia64/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)