Skip to contentSkip to conversation

hw-breakpoints: Fix misordered ifdef

PATCH In review Frederic Weisbecker 1 participant 2 messages Nov 23, 2009 – Nov 24, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw-breakpoints: Fix misordered ifdef

Fix a misplaced ifdef. We need the perf event headers also in off-case to avoid the following build error:

include/linux/hw_breakpoint.h:94: error: expected declaration specifiers or '...' before 'perf_callback_t' include/linux/hw_breakpoint.h:102: error: expected declaration specifiers or '...' before 'perf_callback_t' include/linux/hw_breakpoint.h:109: error: expected declaration specifiers or '...' before 'perf_callback_t' include/linux/hw_breakpoint.h:116: error: expected declaration specifiers or '...' before 'perf_callback_t'

---
 include/linux/hw_breakpoint.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
include/linux/hw_breakpoint.h +2 -1
index 76a48ab..c9f7f7c 100644
@@ -15,10 +15,11 @@ enum {
 };
 
 #ifdef __KERNEL__
-#ifdef CONFIG_HAVE_HW_BREAKPOINT
 
 #include <linux/perf_event.h>
 
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+
 static inline unsigned long hw_breakpoint_addr(struct perf_event *bp)
 {
 	return bp->attr.bp_addr;
Signature · 1 line
1.6.2.3
#1 lore raw
Commit-ID:  fa7c27ee9394fc0d52404b2a89882e95868a60b9
Gitweb:     http://git.kernel.org/tip/fa7c27ee9394fc0d52404b2a89882e95868a60b9
Author:     Frederic Weisbecker <[email protected]>
AuthorDate: Mon, 23 Nov 2009 22:30:12 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 24 Nov 2009 00:09:53 +0100

hw-breakpoints: Fix misordered ifdef

Fix a misplaced ifdef. We need the perf event headers also in off-case to avoid the following build error:

include/linux/hw_breakpoint.h:94: error: expected declaration specifiers or '...' before 'perf_callback_t' include/linux/hw_breakpoint.h:102: error: expected declaration specifiers or '...' before 'perf_callback_t' include/linux/hw_breakpoint.h:109: error: expected declaration specifiers or '...' before 'perf_callback_t' include/linux/hw_breakpoint.h:116: error: expected declaration specifiers or '...' before 'perf_callback_t'

LKML-Reference: <[email protected]>

---
 include/linux/hw_breakpoint.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
include/linux/hw_breakpoint.h +2 -1
index 76a48ab..c9f7f7c 100644
@@ -15,10 +15,11 @@ enum {
 };
 
 #ifdef __KERNEL__
-#ifdef CONFIG_HAVE_HW_BREAKPOINT
 
 #include <linux/perf_event.h>
 
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+
 static inline unsigned long hw_breakpoint_addr(struct perf_event *bp)
 {
 	return bp->attr.bp_addr;