diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2026-08-31 14:43:36 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2026-08-31 14:43:36 +0200 |
| commit | be150d35864ccd8d1005a12953da145013219d35 (patch) | |
| tree | 3af39f4f7a7e3d24eb4537eff7f2c7867767991d /include/linux | |
| parent | c8329cb590df4a8b3a4e878d289d4b17824db8d1 (diff) | |
| parent | 8d3ae59288f1e7d58d76558a6ee96d533bc5019f (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
Updating drm-misc-fixes to the state of v7.2.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/rseq_entry.h | 1 | ||||
| -rw-r--r-- | include/linux/tick.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/rseq_entry.h b/include/linux/rseq_entry.h index ed9da6e41a2a..31ce349ed42c 100644 --- a/include/linux/rseq_entry.h +++ b/include/linux/rseq_entry.h @@ -233,6 +233,7 @@ efault: static __always_inline bool rseq_grant_slice_extension(unsigned long ti_work, unsigned long mask) { if (unlikely(__rseq_grant_slice_extension(ti_work & mask))) { + guard(irq)(); hrtimer_rearm_deferred_tif(ti_work); return true; } diff --git a/include/linux/tick.h b/include/linux/tick.h index 1cf4651f09ad..47750ccd1314 100644 --- a/include/linux/tick.h +++ b/include/linux/tick.h @@ -7,6 +7,8 @@ #include <linux/clockchips.h> #include <linux/irqflags.h> +#include <linux/jiffies.h> +#include <linux/ktime.h> #include <linux/percpu.h> #include <linux/context_tracking_state.h> #include <linux/cpumask.h> |