Merge commit 'v2.6.31-rc9' into tracing/core

[pandora-kernel.git] / include / linux / perf_counter.h

diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index b53f700..9ba1822 100644 (file)
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -761,6 +761,8 @@ extern int sysctl_perf_counter_mlock;
 extern int sysctl_perf_counter_sample_rate;
 
 extern void perf_counter_init(void);
+extern void perf_tpcounter_event(int event_id, u64 addr, u64 count,
+                                void *record, int entry_size);
 
 #ifndef perf_misc_flags
 #define perf_misc_flags(regs)  (user_mode(regs) ? PERF_EVENT_MISC_USER : \