From: "tip-bot2 for Wei Yang" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Wei Yang <richard.weiyang@gmail.com>,
Ingo Molnar <mingo@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/build] x86/vmlinux.lds.S: Remove conditional definition of LOAD_OFFSET
Date: Wed, 13 Mar 2024 10:39:58 -0000 [thread overview]
Message-ID: <171032639869.398.16886435468084846590.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240313075839.8321-4-richard.weiyang@gmail.com>
The following commit has been merged into the x86/build branch of tip:
Commit-ID: a5cffd056ef52280c07a7f6a3b3faacf6b318e8e
Gitweb: https://git.kernel.org/tip/a5cffd056ef52280c07a7f6a3b3faacf6b318e8e
Author: Wei Yang <richard.weiyang@gmail.com>
AuthorDate: Wed, 13 Mar 2024 07:58:38
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 13 Mar 2024 11:29:10 +01:00
x86/vmlinux.lds.S: Remove conditional definition of LOAD_OFFSET
In vmlinux.lds.S, we define LOAD_OFFSET conditionally to __PAGE_OFFSET
or __START_KERNEL_map. While __START_KERNEL_map is already defined to
the same value with the same condition.
So it is fine to define LOAD_OFFSET to __START_KERNEL_map directly.
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240313075839.8321-4-richard.weiyang@gmail.com
---
arch/x86/kernel/vmlinux.lds.S | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 56451fd..88dcf93 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -15,11 +15,7 @@
* put it inside the section definition.
*/
-#ifdef CONFIG_X86_32
-#define LOAD_OFFSET __PAGE_OFFSET
-#else
#define LOAD_OFFSET __START_KERNEL_map
-#endif
#define RUNTIME_DISCARD_EXIT
#define EMITS_PT_NOTE
next prev parent reply other threads:[~2024-03-13 10:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-13 7:58 [PATCH 0/4] Cleanup vmlinux.lds.S Wei Yang
2024-03-13 7:58 ` [PATCH 1/4] vmlinux.lds.h: fix a typo in comment Wei Yang
2024-03-13 10:39 ` [tip: x86/build] vmlinux.lds.h: Fix " tip-bot2 for Wei Yang
2024-03-13 7:58 ` [PATCH 2/4] x86/boot: replace __PHYSICAL_START with LOAD_PHYSICAL_ADDR Wei Yang
2024-03-13 10:29 ` Ingo Molnar
2024-03-14 0:54 ` Wei Yang
2024-03-14 3:23 ` Wei Yang
2024-03-14 9:25 ` Ingo Molnar
2024-03-15 0:57 ` Wei Yang
2024-03-16 17:44 ` Wei Yang
2024-03-13 10:29 ` Nikolay Borisov
2024-03-14 0:54 ` Wei Yang
2024-03-22 10:59 ` [tip: x86/build] x86/boot: Replace " tip-bot2 for Wei Yang
2024-03-13 7:58 ` [PATCH 3/4] x86/vmlinux.lds.S: remove conditional definition of LOAD_OFFSET Wei Yang
2024-03-13 10:39 ` tip-bot2 for Wei Yang [this message]
2024-03-13 13:18 ` [tip: x86/build] x86/vmlinux.lds.S: Remove " Borislav Petkov
2024-03-14 0:59 ` Wei Yang
2024-03-13 7:58 ` [PATCH 4/4] x86/vmlinux.lds.S: take __START_KERNEL out conditional definition Wei Yang
2024-03-13 10:39 ` [tip: x86/build] x86/vmlinux.lds.S: Take " tip-bot2 for Wei Yang
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=171032639869.398.16886435468084846590.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=richard.weiyang@gmail.com \
--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®