diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-06 06:42:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-06 06:43:49 +0100 |
| commit | d6c1c49de577fa292af2449817364b7d89b574d8 (patch) | |
| tree | e97cf88a318f50eb23c18d790e8b0bcf7bb47169 /kernel/events/internal.h | |
| parent | 9dde9dc0a81c7aeb863b35121d09011f09b4897c (diff) | |
| parent | ddf6e0e50723b62ac76ed18eb53e9417c6eefba7 (diff) | |
| download | op-kernel-dev-d6c1c49de577fa292af2449817364b7d89b574d8.zip op-kernel-dev-d6c1c49de577fa292af2449817364b7d89b574d8.tar.gz | |
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/internal.h')
| -rw-r--r-- | kernel/events/internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/events/internal.h b/kernel/events/internal.h index be4a43f..b0b107f 100644 --- a/kernel/events/internal.h +++ b/kernel/events/internal.h @@ -26,6 +26,9 @@ struct ring_buffer { local_t lost; /* nr records lost */ long watermark; /* wakeup watermark */ + /* poll crap */ + spinlock_t event_lock; + struct list_head event_list; struct perf_event_mmap_page *user_page; void *data_pages[0]; |
