diff options
-rw-r--r-- | include/linux/hrtimer.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 9900e998ea8f..485a634fd6e2 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
@@ -111,7 +111,7 @@ enum hrtimer_cb_mode { | |||
111 | */ | 111 | */ |
112 | struct hrtimer { | 112 | struct hrtimer { |
113 | struct rb_node node; | 113 | struct rb_node node; |
114 | ktime_t expires; | 114 | ktime_t _expires; |
115 | enum hrtimer_restart (*function)(struct hrtimer *); | 115 | enum hrtimer_restart (*function)(struct hrtimer *); |
116 | struct hrtimer_clock_base *base; | 116 | struct hrtimer_clock_base *base; |
117 | unsigned long state; | 117 | unsigned long state; |
@@ -219,41 +219,41 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer) | |||
219 | 219 | ||
220 | static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time) | 220 | static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time) |
221 | { | 221 | { |
222 | timer->expires = time; | 222 | timer->_expires = time; |
223 | } | 223 | } |
224 | static inline void hrtimer_set_expires_tv64(struct hrtimer *timer, s64 tv64) | 224 | static inline void hrtimer_set_expires_tv64(struct hrtimer *timer, s64 tv64) |
225 | { | 225 | { |
226 | timer->expires.tv64 = tv64; | 226 | timer->_expires.tv64 = tv64; |
227 | } | 227 | } |
228 | 228 | ||
229 | static inline void hrtimer_add_expires(struct hrtimer *timer, ktime_t time) | 229 | static inline void hrtimer_add_expires(struct hrtimer *timer, ktime_t time) |
230 | { | 230 | { |
231 | timer->expires = ktime_add_safe(timer->expires, time); | 231 | timer->_expires = ktime_add_safe(timer->_expires, time); |
232 | } | 232 | } |
233 | 233 | ||
234 | static inline void hrtimer_add_expires_ns(struct hrtimer *timer, unsigned long ns) | 234 | static inline void hrtimer_add_expires_ns(struct hrtimer *timer, unsigned long ns) |
235 | { | 235 | { |
236 | timer->expires = ktime_add_ns(timer->expires, ns); | 236 | timer->_expires = ktime_add_ns(timer->_expires, ns); |
237 | } | 237 | } |
238 | 238 | ||
239 | static inline ktime_t hrtimer_get_expires(const struct hrtimer *timer) | 239 | static inline ktime_t hrtimer_get_expires(const struct hrtimer *timer) |
240 | { | 240 | { |
241 | return timer->expires; | 241 | return timer->_expires; |
242 | } | 242 | } |
243 | 243 | ||
244 | static inline s64 hrtimer_get_expires_tv64(const struct hrtimer *timer) | 244 | static inline s64 hrtimer_get_expires_tv64(const struct hrtimer *timer) |
245 | { | 245 | { |
246 | return timer->expires.tv64; | 246 | return timer->_expires.tv64; |
247 | } | 247 | } |
248 | 248 | ||
249 | static inline s64 hrtimer_get_expires_ns(const struct hrtimer *timer) | 249 | static inline s64 hrtimer_get_expires_ns(const struct hrtimer *timer) |
250 | { | 250 | { |
251 | return ktime_to_ns(timer->expires); | 251 | return ktime_to_ns(timer->_expires); |
252 | } | 252 | } |
253 | 253 | ||
254 | static inline ktime_t hrtimer_expires_remaining(const struct hrtimer *timer) | 254 | static inline ktime_t hrtimer_expires_remaining(const struct hrtimer *timer) |
255 | { | 255 | { |
256 | return ktime_sub(timer->expires, timer->base->get_time()); | 256 | return ktime_sub(timer->_expires, timer->base->get_time()); |
257 | } | 257 | } |
258 | 258 | ||
259 | /* | 259 | /* |
@@ -334,7 +334,7 @@ static inline int hrtimer_start_expires(struct hrtimer *timer, | |||
334 | 334 | ||
335 | static inline int hrtimer_restart(struct hrtimer *timer) | 335 | static inline int hrtimer_restart(struct hrtimer *timer) |
336 | { | 336 | { |
337 | return hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS); | 337 | return hrtimer_start(timer, timer->_expires, HRTIMER_MODE_ABS); |
338 | } | 338 | } |
339 | 339 | ||
340 | /* Query timers: */ | 340 | /* Query timers: */ |