diff options
Diffstat (limited to 'include/linux/perf_event.h')
| -rw-r--r-- | include/linux/perf_event.h | 6 | 
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 7602ccb3f40..bdb41612bfe 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -274,6 +274,8 @@ struct perf_event_attr {  	__u64	branch_sample_type; /* enum branch_sample_type */  }; +#define perf_flags(attr)	(*(&(attr)->read_format + 1)) +  /*   * Ioctls that can be done on a perf event fd:   */ @@ -926,7 +928,7 @@ struct perf_event {  	struct hw_perf_event		hw;  	struct perf_event_context	*ctx; -	struct file			*filp; +	atomic_long_t			refcount;  	/*  	 * These accumulate total time (in nanoseconds) that children @@ -1296,6 +1298,7 @@ extern int perf_swevent_get_recursion_context(void);  extern void perf_swevent_put_recursion_context(int rctx);  extern void perf_event_enable(struct perf_event *event);  extern void perf_event_disable(struct perf_event *event); +extern int __perf_event_disable(void *info);  extern void perf_event_task_tick(void);  #else  static inline void @@ -1334,6 +1337,7 @@ static inline int  perf_swevent_get_recursion_context(void)		{ return -1; }  static inline void perf_swevent_put_recursion_context(int rctx)		{ }  static inline void perf_event_enable(struct perf_event *event)		{ }  static inline void perf_event_disable(struct perf_event *event)		{ } +static inline int __perf_event_disable(void *info)			{ return -1; }  static inline void perf_event_task_tick(void)				{ }  #endif  |