All of lore.kernel.org
 help / color / mirror / Atom feed
From: Baoquan He <bhe@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-next@vger.kernel.org, loongarch@lists.linux.dev,
	linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org,
	linux-sh@vger.kernel.org, x86@kernel.org,
	akpm@linux-foundation.org, eric_devolder@yahoo.com,
	sfr@canb.auug.org.au, ignat@cloudflare.com,
	Baoquan He <bhe@redhat.com>
Subject: [PATCH 5/5] x86, kexec: fix the wrong ifdeffery CONFIG_KEXEC
Date: Fri,  8 Dec 2023 15:30:36 +0800	[thread overview]
Message-ID: <20231208073036.7884-6-bhe@redhat.com> (raw)
In-Reply-To: <20231208073036.7884-1-bhe@redhat.com>

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.

Signed-off-by: Baoquan He <bhe@redhat.com>
---
 arch/x86/boot/compressed/acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 
-- 
2.41.0


  parent reply	other threads:[~2023-12-08  7:31 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-08  7:30 [PATCH 0/5] kexec: fix the incorrect ifdeffery and dependency of CONFIG_KEXEC Baoquan He
2023-12-08  7:30 ` [PATCH 1/5] loongarch, kexec: change dependency of object files Baoquan He
2023-12-08  7:30 ` [PATCH 2/5] m68k, kexec: fix the incorrect ifdeffery and build dependency of CONFIG_KEXEC Baoquan He
2023-12-08  7:30 ` [PATCH 3/5] mips, kexec: fix the incorrect ifdeffery and " Baoquan He
2023-12-08  7:30 ` [PATCH 4/5] sh, " Baoquan He
2023-12-08  7:30 ` Baoquan He [this message]
2023-12-08  7:42 ` [PATCH 0/5] " Baoquan He
2023-12-08  7:42   ` Baoquan He
2023-12-11  8:25   ` Geert Uytterhoeven
2023-12-11  8:25     ` Geert Uytterhoeven
2023-12-11  9:10     ` Baoquan He
2023-12-11  9:10       ` Baoquan He

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231208073036.7884-6-bhe@redhat.com \
    --to=bhe@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=eric_devolder@yahoo.com \
    --cc=ignat@cloudflare.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@lists.linux-m68k.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=loongarch@lists.linux.dev \
    --cc=sfr@canb.auug.org.au \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.