diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-02 13:47:48 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-02 13:47:48 +1100 |
| commit | 47cf5f4e60b5d732dcbf0b9cfc99e772f7c136d6 (patch) | |
| tree | 574089c30edd4a2ec888dc8cd20d73f657fdca19 /kernel/perf_event.c | |
| parent | a0eeb409249d2c6e943f739c14be60d93f980ea9 (diff) | |
| parent | 4e70e1a1b8bf2425aaf3d25f6e65ce795d347723 (diff) | |
Merge remote branch 'tip/auto-latest'
Diffstat (limited to 'kernel/perf_event.c')
| -rw-r--r-- | kernel/perf_event.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 126a302c481c..852ae8c66502 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -1999,8 +1999,7 @@ static int alloc_callchain_buffers(void) * accessed from NMI. Use a temporary manual per cpu allocation * until that gets sorted out. */ - size = sizeof(*entries) + sizeof(struct perf_callchain_entry *) * - num_possible_cpus(); + size = offsetof(struct callchain_cpus_entries, cpu_entries[nr_cpu_ids]); entries = kzalloc(size, GFP_KERNEL); if (!entries) |