diff options
Diffstat (limited to 'include/linux/perf_counter.h')
-rw-r--r-- | include/linux/perf_counter.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h index 928a7fae0961..ef4dcbff75ab 100644 --- a/include/linux/perf_counter.h +++ b/include/linux/perf_counter.h | |||
@@ -155,8 +155,9 @@ struct perf_counter_hw_event { | |||
155 | /* | 155 | /* |
156 | * Ioctls that can be done on a perf counter fd: | 156 | * Ioctls that can be done on a perf counter fd: |
157 | */ | 157 | */ |
158 | #define PERF_COUNTER_IOC_ENABLE _IO('$', 0) | 158 | #define PERF_COUNTER_IOC_ENABLE _IO ('$', 0) |
159 | #define PERF_COUNTER_IOC_DISABLE _IO('$', 1) | 159 | #define PERF_COUNTER_IOC_DISABLE _IO ('$', 1) |
160 | #define PERF_COUNTER_IOC_REFRESH _IOW('$', 2, u32) | ||
160 | 161 | ||
161 | /* | 162 | /* |
162 | * Structure of the page that can be mapped via mmap | 163 | * Structure of the page that can be mapped via mmap |
@@ -403,9 +404,14 @@ struct perf_counter { | |||
403 | /* poll related */ | 404 | /* poll related */ |
404 | wait_queue_head_t waitq; | 405 | wait_queue_head_t waitq; |
405 | struct fasync_struct *fasync; | 406 | struct fasync_struct *fasync; |
406 | /* optional: for NMIs */ | 407 | |
408 | /* delayed work for NMIs and such */ | ||
409 | int pending_wakeup; | ||
410 | int pending_disable; | ||
407 | struct perf_pending_entry pending; | 411 | struct perf_pending_entry pending; |
408 | 412 | ||
413 | atomic_t event_limit; | ||
414 | |||
409 | void (*destroy)(struct perf_counter *); | 415 | void (*destroy)(struct perf_counter *); |
410 | struct rcu_head rcu_head; | 416 | struct rcu_head rcu_head; |
411 | #endif | 417 | #endif |