diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/perf_event.h | 4 | ||||
| -rw-r--r-- | include/linux/trace_seq.h | 2 |
2 files changed, 3 insertions, 3 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 | }; |
diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h index c134dd1fe6b6..09077f6ed128 100644 --- a/include/linux/trace_seq.h +++ b/include/linux/trace_seq.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | /* | 8 | /* |
| 9 | * Trace sequences are used to allow a function to call several other functions | 9 | * Trace sequences are used to allow a function to call several other functions |
| 10 | * to create a string of data to use (up to a max of PAGE_SIZE. | 10 | * to create a string of data to use (up to a max of PAGE_SIZE). |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | struct trace_seq { | 13 | struct trace_seq { |