From: "tip-bot2 for Ard Biesheuvel" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Srikanth Aithal <Srikanth.Aithal@amd.com>,
Ard Biesheuvel <ardb@kernel.org>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/apic] x86/boot: Drop erroneous __init annotation from early_set_pages_state()
Date: Wed, 24 Sep 2025 16:16:00 -0000 [thread overview]
Message-ID: <175873056047.709179.8745227045157093968.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250924155310.3341370-2-ardb+git@google.com>
The following commit has been merged into the x86/apic branch of tip:
Commit-ID: 1f6113ae5ac4927fe80256154ebb0461e670fa85
Gitweb: https://git.kernel.org/tip/1f6113ae5ac4927fe80256154ebb0461e670fa85
Author: Ard Biesheuvel <ardb@kernel.org>
AuthorDate: Wed, 24 Sep 2025 17:53:11 +02:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Wed, 24 Sep 2025 18:08:34 +02:00
x86/boot: Drop erroneous __init annotation from early_set_pages_state()
The kexec code will call set_pages_state() after tearing down all the GHCBs,
which will therefore result in a call to early_set_pages_state().
This means the __init annotation is wrong, and must be dropped.
Fixes: c5c30a373693 ("x86/boot: Move startup code out of __head section")
Reported-by: Srikanth Aithal <Srikanth.Aithal@amd.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Tested-by: Srikanth Aithal <Srikanth.Aithal@amd.com>
---
arch/x86/boot/startup/sev-startup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/boot/startup/sev-startup.c b/arch/x86/boot/startup/sev-startup.c
index a9b0a9c..0972542 100644
--- a/arch/x86/boot/startup/sev-startup.c
+++ b/arch/x86/boot/startup/sev-startup.c
@@ -44,7 +44,7 @@
/* Include code shared with pre-decompression boot stage */
#include "sev-shared.c"
-void __init
+void
early_set_pages_state(unsigned long vaddr, unsigned long paddr,
unsigned long npages, const struct psc_desc *desc)
{
prev parent reply other threads:[~2025-09-24 16:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-24 15:53 [PATCH] " Ard Biesheuvel
2025-09-24 15:54 ` Ard Biesheuvel
2025-09-24 16:16 ` tip-bot2 for Ard Biesheuvel [this message]
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=175873056047.709179.8745227045157093968.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=Srikanth.Aithal@amd.com \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®