From: "tip-bot2 for Hou Wenlong" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Hou Wenlong <houwenlong.hwl@antgroup.com>,
Ingo Molnar <mingo@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/boot] x86/head/64: Move the __head definition to <asm/init.h>
Date: Tue, 17 Oct 2023 13:03:51 -0000 [thread overview]
Message-ID: <169754783149.3135.16164318910465112906.tip-bot2@tip-bot2> (raw)
In-Reply-To: =?utf-8?q?=3C0583f57977be184689c373fe540cbd7d85ca2047=2E16975?= =?utf-8?q?25407=2Egit=2Ehouwenlong=2Ehwl=40antgroup=2Ecom=3E?=
The following commit has been merged into the x86/boot branch of tip:
Commit-ID: d2a285d65bfde3218fd0c3b88794d0135ced680b
Gitweb: https://git.kernel.org/tip/d2a285d65bfde3218fd0c3b88794d0135ced680b
Author: Hou Wenlong <houwenlong.hwl@antgroup.com>
AuthorDate: Tue, 17 Oct 2023 15:08:06 +08:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 17 Oct 2023 14:51:14 +02:00
x86/head/64: Move the __head definition to <asm/init.h>
Move the __head section definition to a header to widen its use.
An upcoming patch will mark the code as __head in mem_encrypt_identity.c too.
Signed-off-by: Hou Wenlong <houwenlong.hwl@antgroup.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/0583f57977be184689c373fe540cbd7d85ca2047.1697525407.git.houwenlong.hwl@antgroup.com
---
arch/x86/include/asm/init.h | 2 ++
arch/x86/kernel/head64.c | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/init.h b/arch/x86/include/asm/init.h
index 5f1d3c4..cc9ccf6 100644
--- a/arch/x86/include/asm/init.h
+++ b/arch/x86/include/asm/init.h
@@ -2,6 +2,8 @@
#ifndef _ASM_X86_INIT_H
#define _ASM_X86_INIT_H
+#define __head __section(".head.text")
+
struct x86_mapping_info {
void *(*alloc_pgt_page)(void *); /* allocate buf for page table */
void *context; /* context for alloc_pgt_page */
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index f0efc22..05a110c 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -41,6 +41,7 @@
#include <asm/trapnr.h>
#include <asm/sev.h>
#include <asm/tdx.h>
+#include <asm/init.h>
/*
* Manage page tables very early on.
@@ -84,8 +85,6 @@ static struct desc_ptr startup_gdt_descr __initdata = {
.address = 0,
};
-#define __head __section(".head.text")
-
static void __head *fixup_pointer(void *ptr, unsigned long physaddr)
{
return ptr - (void *)_text + (void *)physaddr;
reply other threads:[~2023-10-17 13:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=169754783149.3135.16164318910465112906.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=houwenlong.hwl@antgroup.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@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®