lkml.org 
[lkml]   [2010]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [GIT PULL] perf callchains updates
From
Date
On Thu, 2010-08-19 at 01:46 +0200, Frederic Weisbecker wrote:
> Ingo,
>
> Please pull the perf/core branch that can be found at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
> perf/core
>
> Thanks,
> Frederic
> ---
>
> Frederic Weisbecker (6):
> perf: Drop unappropriate tests on arch callchains
> perf: Generalize callchain_store()
> perf: Generalize some arch callchain code
> perf: Factorize callchain context handling
> perf: Fix race in callchains
> perf: Humanize the number of contexts
>
> Namhyung Kim (1):
> perf, tracing: add missing __percpu markups
>
>
> arch/arm/kernel/perf_event.c | 62 +--------
> arch/powerpc/kernel/perf_callchain.c | 86 ++++--------
> arch/sh/kernel/perf_callchain.c | 50 +------
> arch/sparc/kernel/perf_event.c | 69 +++------
> arch/x86/kernel/cpu/perf_event.c | 82 +++--------
> include/linux/ftrace_event.h | 4 +-
> include/linux/perf_event.h | 30 +++-
> kernel/perf_event.c | 259 ++++++++++++++++++++++++++++++----
> kernel/trace/trace_event_perf.c | 21 ++--
> kernel/trace/trace_functions_graph.c | 2 +-
> 10 files changed, 342 insertions(+), 323 deletions(-)

/usr/src/linux-2.6/arch/x86/kernel/cpu/perf_event.c: In function ‘perf_callchain_kernel’:
/usr/src/linux-2.6/arch/x86/kernel/cpu/perf_event.c:1645: warning: ‘return’ with a value, in function returning void
/usr/src/linux-2.6/arch/x86/kernel/cpu/perf_event.c: In function ‘perf_callchain_user’:
/usr/src/linux-2.6/arch/x86/kernel/cpu/perf_event.c:1698: warning: ‘return’ with a value, in function returning void


---
Index: linux-2.6/arch/x86/kernel/cpu/perf_event.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/cpu/perf_event.c
+++ linux-2.6/arch/x86/kernel/cpu/perf_event.c
@@ -1642,7 +1642,7 @@ perf_callchain_kernel(struct perf_callch
{
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
/* TODO: We don't support guest os callchain now */
- return NULL;
+ return;
}

perf_callchain_store(entry, regs->ip);
@@ -1695,7 +1695,7 @@ perf_callchain_user(struct perf_callchai

if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
/* TODO: We don't support guest os callchain now */
- return NULL;
+ return;
}

fp = (void __user *)regs->bp;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2010-08-19 14:13    [from the cache]
©2003-2011 Jasper Spaans