diff options
Diffstat (limited to 'include/linux/hrtimer.h')
| -rw-r--r-- | include/linux/hrtimer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 7d2a1b974c5..fca93025ab5 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
| @@ -40,7 +40,6 @@ struct hrtimer_base; | |||
| 40 | 40 | ||
| 41 | /** | 41 | /** |
| 42 | * struct hrtimer - the basic hrtimer structure | 42 | * struct hrtimer - the basic hrtimer structure |
| 43 | * | ||
| 44 | * @node: red black tree node for time ordered insertion | 43 | * @node: red black tree node for time ordered insertion |
| 45 | * @expires: the absolute expiry time in the hrtimers internal | 44 | * @expires: the absolute expiry time in the hrtimers internal |
| 46 | * representation. The time is related to the clock on | 45 | * representation. The time is related to the clock on |
| @@ -59,7 +58,6 @@ struct hrtimer { | |||
| 59 | 58 | ||
| 60 | /** | 59 | /** |
| 61 | * struct hrtimer_sleeper - simple sleeper structure | 60 | * struct hrtimer_sleeper - simple sleeper structure |
| 62 | * | ||
| 63 | * @timer: embedded timer structure | 61 | * @timer: embedded timer structure |
| 64 | * @task: task to wake up | 62 | * @task: task to wake up |
| 65 | * | 63 | * |
| @@ -72,7 +70,6 @@ struct hrtimer_sleeper { | |||
| 72 | 70 | ||
| 73 | /** | 71 | /** |
| 74 | * struct hrtimer_base - the timer base for a specific clock | 72 | * struct hrtimer_base - the timer base for a specific clock |
| 75 | * | ||
| 76 | * @index: clock type index for per_cpu support when moving a timer | 73 | * @index: clock type index for per_cpu support when moving a timer |
| 77 | * to a base on another cpu. | 74 | * to a base on another cpu. |
| 78 | * @lock: lock protecting the base and associated timers | 75 | * @lock: lock protecting the base and associated timers |
| @@ -83,6 +80,7 @@ struct hrtimer_sleeper { | |||
| 83 | * @get_softirq_time: function to retrieve the current time from the softirq | 80 | * @get_softirq_time: function to retrieve the current time from the softirq |
| 84 | * @curr_timer: the timer which is executing a callback right now | 81 | * @curr_timer: the timer which is executing a callback right now |
| 85 | * @softirq_time: the time when running the hrtimer queue in the softirq | 82 | * @softirq_time: the time when running the hrtimer queue in the softirq |
| 83 | * @lock_key: the lock_class_key for use with lockdep | ||
| 86 | */ | 84 | */ |
| 87 | struct hrtimer_base { | 85 | struct hrtimer_base { |
| 88 | clockid_t index; | 86 | clockid_t index; |
| @@ -94,6 +92,7 @@ struct hrtimer_base { | |||
| 94 | ktime_t (*get_softirq_time)(void); | 92 | ktime_t (*get_softirq_time)(void); |
| 95 | struct hrtimer *curr_timer; | 93 | struct hrtimer *curr_timer; |
| 96 | ktime_t softirq_time; | 94 | ktime_t softirq_time; |
| 95 | struct lock_class_key lock_key; | ||
| 97 | }; | 96 | }; |
| 98 | 97 | ||
| 99 | /* | 98 | /* |
| @@ -139,6 +138,7 @@ extern long hrtimer_nanosleep(struct timespec *rqtp, | |||
| 139 | struct timespec __user *rmtp, | 138 | struct timespec __user *rmtp, |
| 140 | const enum hrtimer_mode mode, | 139 | const enum hrtimer_mode mode, |
| 141 | const clockid_t clockid); | 140 | const clockid_t clockid); |
| 141 | extern long hrtimer_nanosleep_restart(struct restart_block *restart_block); | ||
| 142 | 142 | ||
| 143 | extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, | 143 | extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, |
| 144 | struct task_struct *tsk); | 144 | struct task_struct *tsk); |