diff options
Diffstat (limited to 'include/linux/perf_event.h')
| -rw-r--r-- | include/linux/perf_event.h | 8 | 
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index b1f89122bf6..08855613ceb 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -54,6 +54,7 @@ enum perf_hw_id {  	PERF_COUNT_HW_BUS_CYCLES		= 6,  	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND	= 7,  	PERF_COUNT_HW_STALLED_CYCLES_BACKEND	= 8, +	PERF_COUNT_HW_REF_CPU_CYCLES		= 9,  	PERF_COUNT_HW_MAX,			/* non-ABI */  }; @@ -890,6 +891,7 @@ struct perf_event_context {  	int				nr_active;  	int				is_active;  	int				nr_stat; +	int				nr_freq;  	int				rotate_disable;  	atomic_t			refcount;  	struct task_struct		*task; @@ -1063,12 +1065,12 @@ perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr)  	}  } -extern struct jump_label_key perf_sched_events; +extern struct jump_label_key_deferred perf_sched_events;  static inline void perf_event_task_sched_in(struct task_struct *prev,  					    struct task_struct *task)  { -	if (static_branch(&perf_sched_events)) +	if (static_branch(&perf_sched_events.key))  		__perf_event_task_sched_in(prev, task);  } @@ -1077,7 +1079,7 @@ static inline void perf_event_task_sched_out(struct task_struct *prev,  {  	perf_sw_event(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, NULL, 0); -	if (static_branch(&perf_sched_events)) +	if (static_branch(&perf_sched_events.key))  		__perf_event_task_sched_out(prev, next);  }  |