diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-14 14:45:13 -0400 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-08-18 19:32:53 -0400 |
commit | 7ae07ea3a48d30689ee037cb136bc21f0b37d8ae (patch) | |
tree | 2cb895a0794bcb2e45a4f48ef7e93302c1f6332c /kernel/perf_event.c | |
parent | 927c7a9e92c4f69097a6e9e086d11fc2f8a5b40b (diff) |
perf: Humanize the number of contexts
Instead of hardcoding the number of contexts for the recursions
barriers, define a cpp constant to make the code more
self-explanatory.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Stephane Eranian <eranian@google.com>
Diffstat (limited to 'kernel/perf_event.c')
-rw-r--r-- | kernel/perf_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 75ab8a2df6b2..f416aef242c3 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
@@ -1772,7 +1772,7 @@ struct callchain_cpus_entries { | |||
1772 | struct perf_callchain_entry *cpu_entries[0]; | 1772 | struct perf_callchain_entry *cpu_entries[0]; |
1773 | }; | 1773 | }; |
1774 | 1774 | ||
1775 | static DEFINE_PER_CPU(int, callchain_recursion[4]); | 1775 | static DEFINE_PER_CPU(int, callchain_recursion[PERF_NR_CONTEXTS]); |
1776 | static atomic_t nr_callchain_events; | 1776 | static atomic_t nr_callchain_events; |
1777 | static DEFINE_MUTEX(callchain_mutex); | 1777 | static DEFINE_MUTEX(callchain_mutex); |
1778 | struct callchain_cpus_entries *callchain_cpus_entries; | 1778 | struct callchain_cpus_entries *callchain_cpus_entries; |
@@ -1828,7 +1828,7 @@ static int alloc_callchain_buffers(void) | |||
1828 | if (!entries) | 1828 | if (!entries) |
1829 | return -ENOMEM; | 1829 | return -ENOMEM; |
1830 | 1830 | ||
1831 | size = sizeof(struct perf_callchain_entry) * 4; | 1831 | size = sizeof(struct perf_callchain_entry) * PERF_NR_CONTEXTS; |
1832 | 1832 | ||
1833 | for_each_possible_cpu(cpu) { | 1833 | for_each_possible_cpu(cpu) { |
1834 | entries->cpu_entries[cpu] = kmalloc_node(size, GFP_KERNEL, | 1834 | entries->cpu_entries[cpu] = kmalloc_node(size, GFP_KERNEL, |