Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-10-03 20:00:39 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-10-03 20:01:05 +0200
commitcde2566e427359f57fe2953b267d2ea8413bb69a (patch)
tree20dafd937099065cf408ddb34fc5275cdf69d963
parente7fd1fe058f18a4d9dbf3896fedbbf40c3c849cb (diff)
powerpc/module64: Fix comment in R_PPC64_ENTRY handling
(bsc#1065729).
-rw-r--r--patches.suse/powerpc-module64-Fix-comment-in-R_PPC64_ENTRY-handli.patch35
-rw-r--r--series.conf1
2 files changed, 36 insertions, 0 deletions
diff --git a/patches.suse/powerpc-module64-Fix-comment-in-R_PPC64_ENTRY-handli.patch b/patches.suse/powerpc-module64-Fix-comment-in-R_PPC64_ENTRY-handli.patch
new file mode 100644
index 0000000000..28fb519b43
--- /dev/null
+++ b/patches.suse/powerpc-module64-Fix-comment-in-R_PPC64_ENTRY-handli.patch
@@ -0,0 +1,35 @@
+From 2fb0a2c989837c976b68233496bbaefb47cd3d6f Mon Sep 17 00:00:00 2001
+From: Michael Ellerman <mpe@ellerman.id.au>
+Date: Sat, 6 Jul 2019 00:18:53 +1000
+Subject: [PATCH] powerpc/module64: Fix comment in R_PPC64_ENTRY handling
+
+References: bsc#1065729
+Patch-mainline: v5.3-rc1
+Git-commit: 2fb0a2c989837c976b68233496bbaefb47cd3d6f
+
+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>
+Acked-by: Michal Suchanek <msuchanek@suse.de>
+---
+ arch/powerpc/kernel/module_64.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
+index 8661eea78503..4bf81a111179 100644
+--- 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, r12, (.TOC.-func)@l
++ * addi r2, r2, (.TOC.-func)@l
+ */
+ ((uint32_t *)location)[0] = 0x3c4c0000 + PPC_HA(value);
+ ((uint32_t *)location)[1] = 0x38420000 + PPC_LO(value);
+--
+2.23.0
+
diff --git a/series.conf b/series.conf
index 0e3bdbde4d..d4f4dbe38d 100644
--- a/series.conf
+++ b/series.conf
@@ -24103,6 +24103,7 @@
patches.suse/powerpc-mm-Fix-node-look-up-with-numa-off-boot.patch
patches.suse/powerpc-mm-Consolidate-numa_enable-check-and-min_com.patch
patches.suse/powerpc-mm-Handle-page-table-allocation-failures.patch
+ patches.suse/powerpc-module64-Fix-comment-in-R_PPC64_ENTRY-handli.patch
patches.suse/mailbox-handle-failed-named-mailbox-channel-request.patch
patches.suse/platform-x86-asus-wmi-Only-Tell-EC-the-OS-will-handl.patch
patches.suse/platform-x86-pmc_atom-Add-CB4063-Beckhoff-Automation.patch