]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
percpu: Remove __per_cpu_load
authorBrian Gerst <brgerst@gmail.com>
Thu, 23 Jan 2025 19:07:46 +0000 (14:07 -0500)
committerIngo Molnar <mingo@kernel.org>
Tue, 18 Feb 2025 09:16:00 +0000 (10:16 +0100)
__per_cpu_load is now always equal to __per_cpu_start.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250123190747.745588-15-brgerst@gmail.com
include/asm-generic/sections.h
include/asm-generic/vmlinux.lds.h
mm/percpu.c

index c768de6f19a9a90d04eab66f522bad2f10ef1fd9..0755bc39b0d80794188e0877ce45d004a6fbd3fc 100644 (file)
@@ -39,7 +39,7 @@ extern char __init_begin[], __init_end[];
 extern char _sinittext[], _einittext[];
 extern char __start_ro_after_init[], __end_ro_after_init[];
 extern char _end[];
-extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[];
+extern char __per_cpu_start[], __per_cpu_end[];
 extern char __kprobes_text_start[], __kprobes_text_end[];
 extern char __entry_text_start[], __entry_text_end[];
 extern char __start_rodata[], __end_rodata[];
index e25a8aeee29c420ff9b47ac2fcc5e670e305a766..92fc06f7da74215fc2dd2f4991674b592c3bce7b 100644 (file)
@@ -1084,7 +1084,6 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG)
 #define PERCPU_SECTION(cacheline)                                      \
        . = ALIGN(PAGE_SIZE);                                           \
        .data..percpu   : AT(ADDR(.data..percpu) - LOAD_OFFSET) {       \
-               __per_cpu_load = .;                                     \
                PERCPU_INPUT(cacheline)                                 \
        }
 
index ac61e3fc5f151f98fac4f0448c2a90db235aaf4e..7b5835356d1e1b6461081d8a55a7cbdb0f2ecec9 100644 (file)
@@ -3071,7 +3071,7 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
                                continue;
                        }
                        /* copy and return the unused part */
-                       memcpy(ptr, __per_cpu_load, ai->static_size);
+                       memcpy(ptr, __per_cpu_start, ai->static_size);
                        pcpu_fc_free(ptr + size_sum, ai->unit_size - size_sum);
                }
        }
@@ -3240,7 +3240,7 @@ int __init pcpu_page_first_chunk(size_t reserved_size, pcpu_fc_cpu_to_node_fn_t
                flush_cache_vmap_early(unit_addr, unit_addr + ai->unit_size);
 
                /* copy static data */
-               memcpy((void *)unit_addr, __per_cpu_load, ai->static_size);
+               memcpy((void *)unit_addr, __per_cpu_start, ai->static_size);
        }
 
        /* we're ready, commit */