diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-21 14:02:44 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-21 14:03:15 +0700 |
| commit | 99fed99a60000dcf75842a88103bfb513511cdd8 (patch) | |
| tree | 3daa2950331a080c0292916a63e6b6e0056a365e /include | |
| parent | cdf733ed16cf85e9d89ed45f0eceb060f77955fd (diff) | |
| parent | ef4fb40e21750ad9c3d1b017c61a9a69701039ff (diff) | |
| download | kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.zip kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.tar.gz kernel_samsung_aries-99fed99a60000dcf75842a88103bfb513511cdd8.tar.bz2 | |
Merge 3.0.70
Change-Id: I4316261b071ad622fcf62dcae7874c2ea6d9604d
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index effadd6..67b9fbc 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1189,6 +1189,12 @@ static inline void perf_event_disable(struct perf_event *event) { } 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 + #define perf_output_put(handle, x) perf_output_copy((handle), &(x), sizeof(x)) /* |