diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 12:46:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-02 12:46:06 -0500 |
| commit | bce8fc4cb796dc77ea71699ef88802879a177474 (patch) | |
| tree | 683ff9f2def12d390af0ae2dc2326b4d9f85a1cd /include/linux | |
| parent | a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a (diff) | |
| parent | ec29b8d2af01912bb79adda8aeab4293539f29ac (diff) | |
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 { | |||
| 471 | unsigned long event_base; | 471 | unsigned long event_base; |
| 472 | int idx; | 472 | int idx; |
| 473 | }; | 473 | }; |
| 474 | union { /* software */ | 474 | struct { /* software */ |
| 475 | atomic64_t count; | 475 | s64 remaining; |
| 476 | struct hrtimer hrtimer; | 476 | struct hrtimer hrtimer; |
| 477 | }; | 477 | }; |
| 478 | }; | 478 | }; |