From eb37694ea9e2edca6de0f939a78991b43173af99 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 6 Apr 2009 11:45:00 +0200 Subject: [PATCH] --- yaml --- r: 147324 b: refs/heads/master c: 9c03d88e328d5f28f13191622c2ea1349c36b799 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/perf_counter.h | 4 ++-- trunk/kernel/perf_counter.c | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c796cab4aa44..19effc47d7c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2e87d06ddbe6e6fdb8d6d2e5e985efe4efb07dd +refs/heads/master: 9c03d88e328d5f28f13191622c2ea1349c36b799 diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h index e22ab47a2f41..f9d5cf0bfbdd 100644 --- a/trunk/include/linux/perf_counter.h +++ b/trunk/include/linux/perf_counter.h @@ -507,10 +507,10 @@ extern void perf_counter_mmap(unsigned long addr, unsigned long len, extern void perf_counter_munmap(unsigned long addr, unsigned long len, unsigned long pgoff, struct file *file); -#define MAX_STACK_DEPTH 254 +#define MAX_STACK_DEPTH 255 struct perf_callchain_entry { - u32 nr, hv, kernel, user; + u16 nr, hv, kernel, user; u64 ip[MAX_STACK_DEPTH]; }; diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index 2a5d4f525567..727624db5078 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -1657,9 +1657,7 @@ void perf_counter_do_pending(void) * Callchain support -- arch specific */ -struct perf_callchain_entry * -__attribute__((weak)) -perf_callchain(struct pt_regs *regs) +__weak struct perf_callchain_entry *perf_callchain(struct pt_regs *regs) { return NULL; } @@ -1819,7 +1817,7 @@ void perf_counter_output(struct perf_counter *counter, callchain = perf_callchain(regs); if (callchain) { - callchain_size = (2 + callchain->nr) * sizeof(u64); + callchain_size = (1 + callchain->nr) * sizeof(u64); header.type |= __PERF_EVENT_CALLCHAIN; header.size += callchain_size;