[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <175873056047.709179.8745227045157093968.tip-bot2@tip-bot2>
Date: Wed, 24 Sep 2025 16:16:00 -0000
From: "tip-bot2 for Ard Biesheuvel" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Srikanth Aithal <Srikanth.Aithal@....com>,
Ard Biesheuvel <ardb@...nel.org>, "Borislav Petkov (AMD)" <bp@...en8.de>,
x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: x86/apic] x86/boot: Drop erroneous __init annotation from
early_set_pages_state()
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@...nel.org>
AuthorDate: Wed, 24 Sep 2025 17:53:11 +02:00
Committer: Borislav Petkov (AMD) <bp@...en8.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@....com>
Signed-off-by: Ard Biesheuvel <ardb@...nel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
Tested-by: Srikanth Aithal <Srikanth.Aithal@....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)
{
Powered by blists - more mailing lists