From 8dd146aaa0d4d1574d695223c487635eb57a09dc Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Sun, 17 Mar 2013 15:49:10 -0700 Subject: [PATCH] --- yaml --- r: 361361 b: refs/heads/master c: 6c4d3bc99b3341067775efd4d9d13cc8e655fd7c h: refs/heads/master i: 361359: da7c81087829cdf5632a6e98240102cfb764f89f v: v3 --- [refs] | 2 +- trunk/include/linux/perf_event.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 27096940da4e..578aa3a4bc6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a6e06b2aed6995af401dcd4feb5e79a0c7ea554 +refs/heads/master: 6c4d3bc99b3341067775efd4d9d13cc8e655fd7c diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h index 71caed8626be..1d795df6f4cf 100644 --- a/trunk/include/linux/perf_event.h +++ b/trunk/include/linux/perf_event.h @@ -758,7 +758,6 @@ 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); -extern void perf_restore_debug_store(void); #else static inline void perf_event_task_sched_in(struct task_struct *prev, @@ -798,6 +797,11 @@ 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 + +#if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_INTEL) +extern void perf_restore_debug_store(void); +#else static inline void perf_restore_debug_store(void) { } #endif