Commit-ID: fa7c27ee9394fc0d52404b2a89882e95868a60b9
Gitweb: http://git.kernel.org/tip/fa7c27ee9394fc0d52404b2a89882e95868a60b9
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
AuthorDate: Mon, 23 Nov 2009 22:30:12 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
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'
Reported-by: Kisskb-bot by Michael Ellerman <michael@xxxxxxxxxxxxxx>
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Prasad <prasad@xxxxxxxxxxxxxxxxxx>
LKML-Reference: <1259011812-8093-1-git-send-email-fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
include/linux/hw_breakpoint.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h
index 76a48ab..c9f7f7c 100644
--- a/include/linux/hw_breakpoint.h
+++ b/include/linux/hw_breakpoint.h
@@ -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;
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|