diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /include/linux/perf_event.h | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'include/linux/perf_event.h')
| -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 | }; |