From 32c0eaebf076ec3875551bb67c7cee4c3353f8e0 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 14 Nov 2009 01:12:47 +0100
Subject: [PATCH] --- yaml --- r: 169703 b: refs/heads/master c:
 688bcaff291cf2fe2734e43f2793d4d05b850518 h: refs/heads/master i:   169701:
 a0aba3983486592e9f912a64e9d1e9876feee9ad   169699:
 74a967ba090c06045c7fe0997916f2b3418fb424   169695:
 716a34d37d3d5a9e8980c9381603da3804f8d954 v: v3

---
 [refs]                              | 2 +-
 trunk/include/linux/hw_breakpoint.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b12c20fb15ac..7e5cbd573f2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 687b16fb617bd446439425a368ad7c7bbd202c73
+refs/heads/master: 688bcaff291cf2fe2734e43f2793d4d05b850518
diff --git a/trunk/include/linux/hw_breakpoint.h b/trunk/include/linux/hw_breakpoint.h
index 18710e0c84bd..0b98cbf76da7 100644
--- a/trunk/include/linux/hw_breakpoint.h
+++ b/trunk/include/linux/hw_breakpoint.h
@@ -16,6 +16,8 @@ enum {
 	HW_BREAKPOINT_X = 4,
 };
 
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+
 static inline unsigned long hw_breakpoint_addr(struct perf_event *bp)
 {
 	return bp->attr.bp_addr;
@@ -31,7 +33,6 @@ static inline int hw_breakpoint_len(struct perf_event *bp)
 	return bp->attr.bp_len;
 }
 
-#ifdef CONFIG_HAVE_HW_BREAKPOINT
 extern struct perf_event *
 register_user_hw_breakpoint(unsigned long addr,
 			    int len,