From 36e7f4a7a0c93a481fabf95a7a5e0e73a63c00b6 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Tue, 26 Jun 2012 01:04:20 +0000 Subject: [PATCH] --- yaml --- r: 313672 b: refs/heads/master c: 6da7094810df5408e32528024cb783f920c87a2c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/perf/callchain.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 344455f25c8a..d1f89a55489e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c093efa6f2dd07d45835be870a20ed3b05b6ef5 +refs/heads/master: 6da7094810df5408e32528024cb783f920c87a2c diff --git a/trunk/arch/powerpc/perf/callchain.c b/trunk/arch/powerpc/perf/callchain.c index e8a18d1cc7c9..74d1e780748b 100644 --- a/trunk/arch/powerpc/perf/callchain.c +++ b/trunk/arch/powerpc/perf/callchain.c @@ -57,7 +57,7 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs) lr = regs->link; sp = regs->gpr[1]; - perf_callchain_store(entry, regs->nip); + perf_callchain_store(entry, perf_instruction_pointer(regs)); if (!validate_sp(sp, current, STACK_FRAME_OVERHEAD)) return; @@ -238,7 +238,7 @@ static void perf_callchain_user_64(struct perf_callchain_entry *entry, struct signal_frame_64 __user *sigframe; unsigned long __user *fp, *uregs; - next_ip = regs->nip; + next_ip = perf_instruction_pointer(regs); lr = regs->link; sp = regs->gpr[1]; perf_callchain_store(entry, next_ip); @@ -444,7 +444,7 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry, long level = 0; unsigned int __user *fp, *uregs; - next_ip = regs->nip; + next_ip = perf_instruction_pointer(regs); lr = regs->link; sp = regs->gpr[1]; perf_callchain_store(entry, next_ip);