diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2024-09-10 13:49:53 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2024-09-10 13:49:53 +0200 |
commit | 2f7eedca6cecbfad52d5b52c1550066d9252c947 (patch) | |
tree | ffce8be3ceee2c845a951d11b99578ca468639a4 /arch/s390/tools/relocs.c | |
parent | treewide: Fix wrong singular form of jiffies in comments (diff) | |
parent | Linux 6.11-rc7 (diff) | |
download | linux-2f7eedca6cecbfad52d5b52c1550066d9252c947.tar.xz linux-2f7eedca6cecbfad52d5b52c1550066d9252c947.zip |
Merge branch 'linus' into timers/core
To update with the latest fixes.
Diffstat (limited to 'arch/s390/tools/relocs.c')
-rw-r--r-- | arch/s390/tools/relocs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/tools/relocs.c b/arch/s390/tools/relocs.c index a74dbd5c9896..30a732c808f3 100644 --- a/arch/s390/tools/relocs.c +++ b/arch/s390/tools/relocs.c @@ -280,7 +280,7 @@ static int do_reloc(struct section *sec, Elf_Rel *rel) case R_390_GOTOFF64: break; case R_390_64: - add_reloc(&relocs64, offset - ehdr.e_entry); + add_reloc(&relocs64, offset); break; default: die("Unsupported relocation type: %d\n", r_type); |