projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
264bffa
)
powerpc/module64: Fix comment in R_PPC64_ENTRY handling
author
Michael Ellerman
<mpe@ellerman.id.au>
Fri, 5 Jul 2019 14:18:53 +0000
(
00:18
+1000)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Fri, 5 Jul 2019 14:29:50 +0000
(
00:29
+1000)
The comment here is wrong, the addi reads from r2 not r12. The code is
correct, 0x38420000 = addi r2,r2,0.
Fixes:
a61674bdfc7c
("powerpc/module: Handle R_PPC64_ENTRY relocations")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/module_64.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/powerpc/kernel/module_64.c
b/arch/powerpc/kernel/module_64.c
index 8661eea78503f5351c590417a61bf81b159b7be8..4bf81a111179ffe7e1ff79357d92dfbf5caabd65 100644
(file)
--- a/
arch/powerpc/kernel/module_64.c
+++ b/
arch/powerpc/kernel/module_64.c
@@
-719,7
+719,7
@@
int apply_relocate_add(Elf64_Shdr *sechdrs,
/*
* If found, replace it with:
* addis r2, r12, (.TOC.-func)@ha
- * addi
r2, r1
2, (.TOC.-func)@l
+ * addi
r2, r
2, (.TOC.-func)@l
*/
((uint32_t *)location)[0] = 0x3c4c0000 + PPC_HA(value);
((uint32_t *)location)[1] = 0x38420000 + PPC_LO(value);