[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-688bcaff291cf2fe2734e43f2793d4d05b850518@git.kernel.org>
Date: Sat, 21 Nov 2009 13:39:09 GMT
From: tip-bot for Ingo Molnar <mingo@...e.hu>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
fweisbec@...il.com, tglx@...utronix.de, prasad@...ux.vnet.ibm.com,
mingo@...e.hu
Subject: [tip:perf/core] hw-breakpoints: Fix build on !perf architectures
Commit-ID: 688bcaff291cf2fe2734e43f2793d4d05b850518
Gitweb: http://git.kernel.org/tip/688bcaff291cf2fe2734e43f2793d4d05b850518
Author: Ingo Molnar <mingo@...e.hu>
AuthorDate: Sat, 14 Nov 2009 01:12:47 +0100
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Sat, 14 Nov 2009 01:29:17 +0100
hw-breakpoints: Fix build on !perf architectures
the arch/alpha build fails with:
In file included from tip/kernel/exit.c:52:
tip/include/linux/hw_breakpoint.h: In function 'hw_breakpoint_addr':
tip/include/linux/hw_breakpoint.h:21: error: 'struct perf_event' has no member named 'attr'
[...]
Move these helper inlines inside the CONFIG_HAVE_HW_BREAKPOINT ifdef.
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Prasad <prasad@...ux.vnet.ibm.com>
LKML-Reference: <1258114575-32655-1-git-send-email-fweisbec@...il.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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 18710e0..0b98cbf 100644
--- a/include/linux/hw_breakpoint.h
+++ b/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,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists