aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-15 19:47:48 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-15 19:47:48 -0800
commit3d8b4bdef7e7c9d36ce90e563788c10051a91c34 (patch)
treef98e4fc7cce54ea0b4b4466342c3ee06f9a7a9f7 /include
parent724e6d3fe8003c3f60bf404bf22e4e331327c596 (diff)
parent1a72cfa6856e7d58e049c42c6e6a789669478479 (diff)
downloadlinux-linaro-android-3d8b4bdef7e7c9d36ce90e563788c10051a91c34.tar.gz
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf top: Fix help text alignment perf: Fix hypervisor sample reporting perf: Make bp_len type to u64 generic across the arch
Diffstat (limited to 'include')
-rw-r--r--include/linux/hw_breakpoint.h2
-rw-r--r--include/linux/perf_event.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h
index 070ba062173..5977b724f7c 100644
--- a/include/linux/hw_breakpoint.h
+++ b/include/linux/hw_breakpoint.h
@@ -44,7 +44,7 @@ static inline int hw_breakpoint_type(struct perf_event *bp)
return bp->attr.bp_type;
}
-static inline int hw_breakpoint_len(struct perf_event *bp)
+static inline unsigned long hw_breakpoint_len(struct perf_event *bp)
{
return bp->attr.bp_len;
}
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 8fa71874113..a177698d95e 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -211,11 +211,9 @@ struct perf_event_attr {
__u32 wakeup_watermark; /* bytes before wakeup */
};
- __u32 __reserved_2;
-
- __u64 bp_addr;
__u32 bp_type;
- __u32 bp_len;
+ __u64 bp_addr;
+ __u64 bp_len;
};
/*