diff options
| author | Paul Mundt | 2010-12-20 16:40:51 +0100 |
|---|---|---|
| committer | Paul Mundt | 2010-12-20 16:40:51 +0100 |
| commit | 8bcee1832d23869c2cdb6886ae5210b0143256f0 (patch) | |
| tree | 9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd /include/linux/hw_breakpoint.h | |
| parent | ARM: mach-shmobile: Bump up NR_IRQS to 1024 (diff) | |
| parent | ARM: mach-shmobile: INTC interrupt priority level demux fix (diff) | |
| download | kernel-qcow2-linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.tar.gz kernel-qcow2-linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.tar.xz kernel-qcow2-linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.zip | |
Merge branch 'rmobile/urgent' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/linux/hw_breakpoint.h')
| -rw-r--r-- | include/linux/hw_breakpoint.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h index a2d6ea49ec56..d1e55fed2c7d 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, |