]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
x86/vmlinux.lds.S: Take __START_KERNEL out conditional definition
authorWei Yang <richard.weiyang@gmail.com>
Wed, 13 Mar 2024 07:58:39 +0000 (07:58 +0000)
committerIngo Molnar <mingo@kernel.org>
Wed, 13 Mar 2024 10:29:11 +0000 (11:29 +0100)
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@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240313075839.8321-5-richard.weiyang@gmail.com
arch/x86/kernel/vmlinux.lds.S

index 88dcf9366949f8c20cf8954e1406bece3268b919..a20409b0a3f2155c9f903b228263cfac05fa5c14 100644 (file)
@@ -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