From e79fdb856e24c025b1fc796531003ef464fef0f1 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Fri, 20 Apr 2012 15:41:33 -0700 Subject: [PATCH] --- yaml --- r: 310605 b: refs/heads/master c: 302fa4b58ac754a6da13f4f5546f710fecc3b945 h: refs/heads/master i: 310603: d690fc39f9d50473232a6a929b32893dee0d984c v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_event.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9400d9d10c62..4f6c22407225 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8440ccb43fc0ecffcf1acee0273d766e6a8cd51d +refs/heads/master: 302fa4b58ac754a6da13f4f5546f710fecc3b945 diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c index cb608383e4f6..e78bc256aea8 100644 --- a/trunk/arch/x86/kernel/cpu/perf_event.c +++ b/trunk/arch/x86/kernel/cpu/perf_event.c @@ -1781,9 +1781,6 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry *entry) if (bytes != sizeof(frame)) break; - if (fp < compat_ptr(regs->sp)) - break; - perf_callchain_store(entry, frame.return_address); fp = compat_ptr(frame.next_frame); } @@ -1827,9 +1824,6 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) if (bytes != sizeof(frame)) break; - if ((unsigned long)fp < regs->sp) - break; - perf_callchain_store(entry, frame.return_address); fp = frame.next_frame; }