diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
| commit | ea4d65f14f6aaa53e379b93c5544245ef081b3e7 (patch) | |
| tree | a15485f4f1cf547a52b31fa8e16e14b9579b7200 /include/linux/posix-timers.h | |
| parent | ce32d59ee2cd036f6e8a6ed17a06a0b0bec5c67c (diff) | |
| parent | 496f3347d834aec91c38b45d6249ed00f58ad233 (diff) | |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
Diffstat (limited to 'include/linux/posix-timers.h')
| -rw-r--r-- | include/linux/posix-timers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index c85704fcdbd2..ee7e987ea1b4 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h | |||
| @@ -95,8 +95,8 @@ struct k_itimer { | |||
| 95 | clockid_t it_clock; | 95 | clockid_t it_clock; |
| 96 | timer_t it_id; | 96 | timer_t it_id; |
| 97 | int it_active; | 97 | int it_active; |
| 98 | int it_overrun; | 98 | s64 it_overrun; |
| 99 | int it_overrun_last; | 99 | s64 it_overrun_last; |
| 100 | int it_requeue_pending; | 100 | int it_requeue_pending; |
| 101 | int it_sigev_notify; | 101 | int it_sigev_notify; |
| 102 | ktime_t it_interval; | 102 | ktime_t it_interval; |