summaryrefslogtreecommitdiff
path: root/include/linux/timer.h
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2025-04-06 16:16:32 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2025-04-13 21:10:24 -0400
commit844721635c1c8e7e43fb546052a659bfc92ed99d (patch)
tree5007b56b87df050e6b5a05a3049826680705b0ed /include/linux/timer.h
parentad3875d1d9907bab0430c45ffa3b2dd39107106b (diff)
Update bcachefs sources to 2f9361370129 bcachefs: Improve opts.degraded
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'include/linux/timer.h')
-rw-r--r--include/linux/timer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h
index 9667acf9..6454ce60 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -29,7 +29,7 @@ static inline int timer_pending(const struct timer_list *timer)
}
int del_timer(struct timer_list * timer);
-int del_timer_sync(struct timer_list *timer);
+int timer_delete_sync(struct timer_list *timer);
#define del_singleshot_timer_sync(timer) del_timer_sync(timer)