---

yaml --- r: 361361 b: refs/heads/master c: 6c4d3bc h: refs/heads/master i: 361359: da7c810 v: v3
git-mirror · Mar 17, 2013 · 8dd146a · 8dd146a
1 parent 8aabf2f
commit 8dd146a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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