diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 09:46:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 09:46:06 -0800 |
| commit | bce8fc4cb796dc77ea71699ef88802879a177474 (patch) | |
| tree | 683ff9f2def12d390af0ae2dc2326b4d9f85a1cd /include/linux | |
| parent | Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | perf tools: Remove -Wcast-align (diff) | |
| download | linux-dev-bce8fc4cb796dc77ea71699ef88802879a177474.tar.xz linux-dev-bce8fc4cb796dc77ea71699ef88802879a177474.zip | |
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 tools: Remove -Wcast-align
perf tools: Fix compatibility with libelf 0.8 and autodetect
perf events: Don't generate events for the idle task when exclude_idle is set
perf events: Fix swevent hrtimer sampling by keeping track of remaining time when enabling/disabling swevent hrtimers
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/perf_event.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 2e6d95f97419..9e7012689a84 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -471,8 +471,8 @@ struct hw_perf_event { unsigned long event_base; int idx; }; - union { /* software */ - atomic64_t count; + struct { /* software */ + s64 remaining; struct hrtimer hrtimer; }; }; |