git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.32-rc6' into perf/core
[safe/jmp/linux-2.6]
/
include
/
linux
/
perf_event.h
diff --git
a/include/linux/perf_event.h
b/include/linux/perf_event.h
index
df9d964
..
45b56fa
100644
(file)
--- a/
include/linux/perf_event.h
+++ b/
include/linux/perf_event.h
@@
-472,8
+472,8
@@
struct hw_perf_event {
unsigned long event_base;
int idx;
};
-
union
{ /* software */
-
atomic64_t count
;
+
struct
{ /* software */
+
s64 remaining
;
struct hrtimer hrtimer;
};
};