aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/posix-timers.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/posix-timers.h')
-rw-r--r--include/linux/posix-timers.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index e685916551bf..3d10c84a97a9 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -74,11 +74,6 @@ struct cpu_timer {
int firing;
};
-static inline bool cpu_timer_requeue(struct cpu_timer *ctmr)
-{
- return timerqueue_add(ctmr->head, &ctmr->node);
-}
-
static inline bool cpu_timer_enqueue(struct timerqueue_head *head,
struct cpu_timer *ctmr)
{
@@ -88,8 +83,10 @@ static inline bool cpu_timer_enqueue(struct timerqueue_head *head,
static inline void cpu_timer_dequeue(struct cpu_timer *ctmr)
{
- if (!RB_EMPTY_NODE(&ctmr->node.node))
+ if (ctmr->head) {
timerqueue_del(ctmr->head, &ctmr->node);
+ ctmr->head = NULL;
+ }
}
static inline u64 cpu_timer_getexpires(struct cpu_timer *ctmr)