diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-25 05:52:31 +0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-25 05:52:31 +0800 |
| commit | 249155c20f9b0754bc1b932a33344cfb4e0c2101 (patch) | |
| tree | c7e8d287e9c6c3cd1daeeb5b6bf17ef4c7dfb994 | |
| parent | c88e40e07cd967dcdf37321a63ab6e8b0d881100 (diff) | |
| parent | d2ba3b1714d754f190ac0527713f9b44513b5857 (diff) | |
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
| -rw-r--r-- | arch/parisc/kernel/module.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c index f241ded9239b..1f0f29a289d3 100644 --- a/arch/parisc/kernel/module.c +++ b/arch/parisc/kernel/module.c @@ -786,6 +786,10 @@ int apply_relocate_add(Elf_Shdr *sechdrs, /* 32-bit PC relative address */ *loc = val - dot - 8 + addend; break; + case R_PARISC_PCREL64: + /* 64-bit PC relative address */ + *loc64 = val - dot - 8 + addend; + break; case R_PARISC_DIR64: /* 64-bit effective address */ *loc64 = val + addend; |