From 9894d71438f20772d8701eb00fd31820a778b4bf Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 29 Mar 2010 13:08:52 -0700 Subject: [PATCH] --- yaml --- r: 189149 b: refs/heads/master c: 9e8307ecaf9f8c8b5b3b22145021204c4e73114a h: refs/heads/master i: 189147: 89b52a444f93e90177555ac440faa38af5c4f31b v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/perf_event.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3504d453478d..aa0db47aad99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2566af8c4860a03ca685ef0910de406679c3e4e +refs/heads/master: 9e8307ecaf9f8c8b5b3b22145021204c4e73114a diff --git a/trunk/arch/sparc/kernel/perf_event.c b/trunk/arch/sparc/kernel/perf_event.c index 9f2b2bac8b2b..610112ec518a 100644 --- a/trunk/arch/sparc/kernel/perf_event.c +++ b/trunk/arch/sparc/kernel/perf_event.c @@ -1337,7 +1337,7 @@ static void perf_callchain_user_32(struct pt_regs *regs, callchain_store(entry, PERF_CONTEXT_USER); callchain_store(entry, regs->tpc); - ufp = regs->u_regs[UREG_I6]; + ufp = regs->u_regs[UREG_I6] & 0xffffffffUL; do { struct sparc_stackf32 *usf, sf; unsigned long pc;