summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBaoquan He <bhe@redhat.com>2023-12-08 08:30:36 +0100
committerAndrew Morton <akpm@linux-foundation.org>2023-12-13 02:20:18 +0100
commit69f8ca8d36b5e52360f45c3b63bcb3d075da36df (patch)
tree87c44c0cb5e3a59a54f21bcb01b2b29e13b2a2ca /arch
parentsh, kexec: fix the incorrect ifdeffery and dependency of CONFIG_KEXEC (diff)
downloadlinux-69f8ca8d36b5e52360f45c3b63bcb3d075da36df.tar.xz
linux-69f8ca8d36b5e52360f45c3b63bcb3d075da36df.zip
x86, kexec: fix the wrong ifdeffery CONFIG_KEXEC
With the current ifdeffery CONFIG_KEXEC, get_cmdline_acpi_rsdp() is only available when kexec_load interface is taken, while kexec_file_load interface can't make use of it. Now change it to CONFIG_KEXEC_CORE. Link: https://lkml.kernel.org/r/20231208073036.7884-6-bhe@redhat.com Signed-off-by: Baoquan He <bhe@redhat.com> Cc: Eric DeVolder <eric_devolder@yahoo.com> Cc: Ignat Korchagin <ignat@cloudflare.com> Cc: kernel test robot <lkp@intel.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/boot/compressed/acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c
index 55c98fdd67d2..18d15d1ce87d 100644
--- a/arch/x86/boot/compressed/acpi.c
+++ b/arch/x86/boot/compressed/acpi.c
@@ -178,7 +178,7 @@ static unsigned long get_cmdline_acpi_rsdp(void)
{
unsigned long addr = 0;
-#ifdef CONFIG_KEXEC
+#ifdef CONFIG_KEXEC_CORE
char val[MAX_ADDR_LEN] = { };
int ret;