[tip: x86/build] x86/vmlinux.lds.S: Take __START_KERNEL out conditional definition

[tip-bot2 for Wei Yang]

The following commit has been merged into the x86/build branch of tip:

Commit-ID:     9b67ce2c121fbf11c0c7b6216c08200fda23c9af
Gitweb:        https://git.kernel.org/tip/9b67ce2c121fbf11c0c7b6216c08200fda23c9af
Author:        Wei Yang <richard.weiyang@xxxxxxxxx>
AuthorDate:    Wed, 13 Mar 2024 07:58:39 
Committer:     Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Wed, 13 Mar 2024 11:29:11 +01:00

x86/vmlinux.lds.S: Take __START_KERNEL out conditional definition

If CONFIG_X86_32=y, the section start address is defined to be
"LOAD_OFFSET + LOAD_PHYSICAL_ADDR", which is the same as
__START_KERNEL_map.

Unify it with the 64-bit definition to simplify the code.

Signed-off-by: Wei Yang <richard.weiyang@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240313075839.8321-5-richard.weiyang@xxxxxxxxx
---
 arch/x86/kernel/vmlinux.lds.S | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 88dcf93..a20409b 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -110,11 +110,10 @@ PHDRS {
 
 SECTIONS
 {
+	. = __START_KERNEL;
 #ifdef CONFIG_X86_32
-	. = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
 	phys_startup_32 = ABSOLUTE(startup_32 - LOAD_OFFSET);
 #else
-	. = __START_KERNEL;
 	phys_startup_64 = ABSOLUTE(startup_64 - LOAD_OFFSET);
 #endif