diff options
| author | Ingo Molnar | 2011-12-06 06:42:35 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2011-12-06 06:43:49 +0100 |
| commit | d6c1c49de577fa292af2449817364b7d89b574d8 (patch) | |
| tree | e97cf88a318f50eb23c18d790e8b0bcf7bb47169 /kernel/events/ring_buffer.c | |
| parent | x86/tools: Add decoded instruction dump mode (diff) | |
| parent | ftrace: Fix hash record accounting bug (diff) | |
| download | kernel-qcow2-linux-d6c1c49de577fa292af2449817364b7d89b574d8.tar.gz kernel-qcow2-linux-d6c1c49de577fa292af2449817364b7d89b574d8.tar.xz kernel-qcow2-linux-d6c1c49de577fa292af2449817364b7d89b574d8.zip | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Add these cherry-picked commits so that future changes
on perf/core don't conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/events/ring_buffer.c')
| -rw-r--r-- | kernel/events/ring_buffer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c index a2a29205cc0f..7f3011c6b57f 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -209,6 +209,9 @@ ring_buffer_init(struct ring_buffer *rb, long watermark, int flags) rb->writable = 1; atomic_set(&rb->refcount, 1); + + INIT_LIST_HEAD(&rb->event_list); + spin_lock_init(&rb->event_lock); } #ifndef CONFIG_PERF_USE_VMALLOC |