[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <171032639869.398.16886435468084846590.tip-bot2@tip-bot2>
Date: Wed, 13 Mar 2024 10:39:58 -0000
From: "tip-bot2 for Wei Yang" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Wei Yang <richard.weiyang@...il.com>, Ingo Molnar <mingo@...nel.org>,
x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: x86/build] x86/vmlinux.lds.S: Remove conditional definition of
LOAD_OFFSET
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@...il.com>
AuthorDate: Wed, 13 Mar 2024 07:58:38
Committer: Ingo Molnar <mingo@...nel.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@...il.com>
Signed-off-by: Ingo Molnar <mingo@...nel.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
Powered by blists - more mailing lists