diff --git a/arch/powerpc/kernel/optprobes_head.S b/arch/powerpc/kernel/optprobes_head.S
index ff8ba4d3824d52a2a23e556a076662f4208e52db..9d803cc2392f82c178801cf53e5562a5b3291db1 100644
--- a/arch/powerpc/kernel/optprobes_head.S
+++ b/arch/powerpc/kernel/optprobes_head.S
@@ -36,8 +36,9 @@ optprobe_template_entry:
 	addi	r0,r1,INT_FRAME_SIZE
 	std	r0,GPR1(r1)
 	SAVE_10GPRS(2,r1)
-	SAVE_10GPRS(12,r1)
-	SAVE_10GPRS(22,r1)
+	SAVE_GPR(12,r1)
+	SAVE_10GPRS(14,r1)
+	SAVE_8GPRS(24,r1)
 	/* Save SPRS */
 	mfmsr	r5
 	std	r5,_MSR(r1)
@@ -119,8 +120,9 @@ optprobe_template_call_emulate:
 	mtcr	r5
 	REST_GPR(0,r1)
 	REST_10GPRS(2,r1)
-	REST_10GPRS(12,r1)
-	REST_10GPRS(22,r1)
+	REST_GPR(12,r1)
+	REST_10GPRS(14,r1)
+	REST_8GPRS(24,r1)
 	/* Restore the previous SP */
 	addi	r1,r1,INT_FRAME_SIZE
 
diff --git a/arch/powerpc/kernel/trace/ftrace_64_mprofile.S b/arch/powerpc/kernel/trace/ftrace_64_mprofile.S
index 0bc39ff532331f392f13baeea3067865913c0c16..32e354d9ee9baae77c5a759da3dfe47a8288d967 100644
--- a/arch/powerpc/kernel/trace/ftrace_64_mprofile.S
+++ b/arch/powerpc/kernel/trace/ftrace_64_mprofile.S
@@ -51,8 +51,9 @@ _GLOBAL(ftrace_regs_caller)
 	cmpdi	r3, 0
 	beq	ftrace_no_trace
 
-	SAVE_10GPRS(12, r1)
-	SAVE_10GPRS(22, r1)
+	SAVE_GPR(12,r1)
+	SAVE_10GPRS(14,r1)
+	SAVE_8GPRS(24,r1)
 
 	/* Save previous stack pointer (r1) */
 	addi	r8, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
@@ -115,8 +116,9 @@ ftrace_regs_call:
 	/* Restore gprs */
 	REST_GPR(0,r1)
 	REST_10GPRS(2,r1)
-	REST_10GPRS(12,r1)
-	REST_10GPRS(22,r1)
+	REST_GPR(12,r1)
+	REST_10GPRS(14,r1)
+	REST_8GPRS(24,r1)
 
 	/* Restore possibly modified LR */
 	ld	r0, _LINK(r1)
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 5d64d97975ba7c8d492d0184f098bb5ea79a030c..9df872b3818a0e421a52a49b31cb913754bcf138 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1995,7 +1995,11 @@ unsigned long kretprobe_find_ret_addr(struct task_struct *tsk, void *fp)
 	unsigned long flags;
 	kprobe_opcode_t *correct_ret_addr = NULL;
 
-	kretprobe_hash_lock(tsk, &head, &flags);
+	if (tsk != current)
+		kretprobe_hash_lock(tsk, &head, &flags);
+	else
+		head = &kretprobe_inst_table[hash_ptr(tsk, KPROBE_HASH_BITS)];
+
 	hlist_for_each_entry(ri, head, hlist) {
 		if (ri->task != tsk)
 			continue;
@@ -2006,7 +2010,8 @@ unsigned long kretprobe_find_ret_addr(struct task_struct *tsk, void *fp)
 			break;
 		}
 	}
-	kretprobe_hash_unlock(tsk, &flags);
+	if (tsk != current)
+		kretprobe_hash_unlock(tsk, &flags);
 	return (unsigned long)correct_ret_addr;
 }
 NOKPROBE_SYMBOL(kretprobe_find_ret_addr);