summaryrefslogtreecommitdiff
path: root/include/linux/timerqueue_types.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2026-05-31 19:43:25 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2026-05-31 19:43:25 -0700
commitfff88709f9a9153af85b5224b4594caa5387ca60 (patch)
tree48e118e6e618318fd935aa3ee29cda6c67c0be2c /include/linux/timerqueue_types.h
parent332fbc03e1a8cb4c0ce6891cae2c286ddf031aca (diff)
parente43ffb69e0438cddd72aaa30898b4dc446f664f8 (diff)
Merge tag 'v7.1-rc6' into next
Sync up with mainline to pull in a fix to IMS PCU driver and other enhancements.
Diffstat (limited to 'include/linux/timerqueue_types.h')
-rw-r--r--include/linux/timerqueue_types.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/include/linux/timerqueue_types.h b/include/linux/timerqueue_types.h
index dc298d0923e3..be2218b147c4 100644
--- a/include/linux/timerqueue_types.h
+++ b/include/linux/timerqueue_types.h
@@ -6,12 +6,21 @@
#include <linux/types.h>
struct timerqueue_node {
- struct rb_node node;
- ktime_t expires;
+ struct rb_node node;
+ ktime_t expires;
};
struct timerqueue_head {
- struct rb_root_cached rb_root;
+ struct rb_root_cached rb_root;
+};
+
+struct timerqueue_linked_node {
+ struct rb_node_linked node;
+ ktime_t expires;
+};
+
+struct timerqueue_linked_head {
+ struct rb_root_linked rb_root;
};
#endif /* _LINUX_TIMERQUEUE_TYPES_H */