summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-11-18 10:37:51 +0100
committerIngo Molnar <mingo@elte.hu>2010-11-18 10:37:51 +0100
commitfcf48a725a176ba12aa7be64c50190deaa2f86df (patch)
tree5d611ba5b1eb4dd821c93ca2f9d08078b563305a /include
parent0e2af2a9abf94b408ff70679b692a8644fed4aab (diff)
parent3c502e7a0255d82621ff25d60cc816624830497e (diff)
downloadlinux-3.10-fcf48a725a176ba12aa7be64c50190deaa2f86df.tar.gz
linux-3.10-fcf48a725a176ba12aa7be64c50190deaa2f86df.tar.bz2
linux-3.10-fcf48a725a176ba12aa7be64c50190deaa2f86df.zip
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
Diffstat (limited to 'include')
-rw-r--r--include/linux/hw_breakpoint.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h
index a2d6ea49ec5..d1e55fed2c7 100644
--- a/include/linux/hw_breakpoint.h
+++ b/include/linux/hw_breakpoint.h
@@ -33,6 +33,8 @@ enum bp_type_idx {
#ifdef CONFIG_HAVE_HW_BREAKPOINT
+extern int __init init_hw_breakpoint(void);
+
static inline void hw_breakpoint_init(struct perf_event_attr *attr)
{
memset(attr, 0, sizeof(*attr));
@@ -108,6 +110,8 @@ static inline struct arch_hw_breakpoint *counter_arch_bp(struct perf_event *bp)
#else /* !CONFIG_HAVE_HW_BREAKPOINT */
+static inline int __init init_hw_breakpoint(void) { return 0; }
+
static inline struct perf_event *
register_user_hw_breakpoint(struct perf_event_attr *attr,
perf_overflow_handler_t triggered,