--- v8
+++ v7
@@ -256,7 +256,7 @@
  __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
  {
 diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
-index 72a1a52..720e8fd 100644
+index d75a25f..5bd8399 100644
 --- a/arch/powerpc/kernel/module_64.c
 +++ b/arch/powerpc/kernel/module_64.c
 @@ -136,12 +136,25 @@ static u32 ppc64_stub_insns[] = {
@@ -296,7 +296,7 @@
  
  	return true;
  }
-@@ -636,6 +652,9 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
+@@ -630,6 +646,9 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
  					return -ENOENT;
  				if (!restore_r2((u32 *)location + 1, me))
  					return -ENOEXEC;
@@ -306,7 +306,7 @@
  			} else
  				value += local_entry_offset(sym);
  
-@@ -723,6 +742,10 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
+@@ -717,6 +736,10 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
  	me->arch.tramp = stub_for_addr(sechdrs,
  				       (unsigned long)ftrace_caller,
  				       me);