summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2013-03-17 15:49:10 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-20 13:05:00 -0700
commit6bf083ffc825244992274a23017655caee8e4c58 (patch)
treee74f39428f6ed033b83b5e1e227d9883669fee7c /include
parentd7805638b85ce978f7c0cf1ac49204d4288084f6 (diff)
downloadlinux-3.10-6bf083ffc825244992274a23017655caee8e4c58.tar.gz
linux-3.10-6bf083ffc825244992274a23017655caee8e4c58.tar.bz2
linux-3.10-6bf083ffc825244992274a23017655caee8e4c58.zip
perf,x86: fix link failure for non-Intel configs
commit 6c4d3bc99b3341067775efd4d9d13cc8e655fd7c upstream. Commit 1d9d8639c063 ("perf,x86: fix kernel crash with PEBS/BTS after suspend/resume") introduces a link failure since perf_restore_debug_store() is only defined for CONFIG_CPU_SUP_INTEL: arch/x86/power/built-in.o: In function `restore_processor_state': (.text+0x45c): undefined reference to `perf_restore_debug_store' Fix it by defining the dummy function appropriately. Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/perf_event.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 3e52a77f505..8e9a069c921 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -1290,7 +1290,6 @@ 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 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,
@@ -1329,6 +1328,11 @@ 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 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