Skip to content

Commit 249155c

Browse files
committed
Merge branch 'parisc-5.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fix from Helge Deller: "Add missing PCREL64 relocation in module loader to fix module load errors when the static branch and JUMP_LABEL feature is enabled on a 64-bit kernel" * 'parisc-5.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Fix module loading error with JUMP_LABEL feature
2 parents c88e40e + d2ba3b1 commit 249155c

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/parisc/kernel/module.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,10 @@ int apply_relocate_add(Elf_Shdr *sechdrs,
786786
/* 32-bit PC relative address */
787787
*loc = val - dot - 8 + addend;
788788
break;
789+
case R_PARISC_PCREL64:
790+
/* 64-bit PC relative address */
791+
*loc64 = val - dot - 8 + addend;
792+
break;
789793
case R_PARISC_DIR64:
790794
/* 64-bit effective address */
791795
*loc64 = val + addend;

0 commit comments

Comments
 (0)