[Devel] [PATCH RHEL7 COMMIT] ms/x86/relocs: Make per_cpu_load_addr static

Konstantin Khorenko khorenko at virtuozzo.com
Thu Jun 13 20:28:25 MSK 2024


The commit is pushed to "branch-rh7-3.10.0-1160.114.2.vz7.222.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1160.114.2.vz7.222.1
------>
commit 4c342998e749c413db4325a27798b1d70e0b01b8
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Apr 24 20:32:50 2024 +0300

    ms/x86/relocs: Make per_cpu_load_addr static
    
    per_cpu_load_addr is only used for 64-bit relocations, but is
    declared in both configurations of relocs.c - with different
    types.  This has undefined behaviour in general.  GNU ld is
    documented to use the larger size in this case, but other tools
    may differ and some warn about this.
    
    References: https://bugs.debian.org/748577
    Reported-by: Michael Tautschnig <mt at debian.org>
    Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
    Cc: 748577 at bugs.debian.org
    Cc: Linus Torvalds <torvalds at linux-foundation.org>
    Link: http://lkml.kernel.org/r/1411561812.3659.23.camel@decadent.org.uk
    Signed-off-by: Ingo Molnar <mingo at kernel.org>
    
    (cherry picked from commit eeeda4cd06e828b331b15741a204ff9f5874d28d)
    https://virtuozzo.atlassian.net/browse/PSBM-156280
    Signed-off-by: Alexander Atanasov <alexander.atanasov at virtuozzo.com>
    Reviewed-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 arch/x86/tools/relocs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index 8ff49e6a88fe..952ad1a13a2b 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -698,7 +698,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
  *
  */
 static int per_cpu_shndx	= -1;
-Elf_Addr per_cpu_load_addr;
+static Elf_Addr per_cpu_load_addr;
 
 static void percpu_init(void)
 {


More information about the Devel mailing list