summaryrefslogtreecommitdiff
path: root/include/linux/posix-timers.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-05-31 00:15:43 +0300
committerThomas Gleixner <tglx@linutronix.de>2017-06-04 16:40:24 +0300
commit80105cd0e62ba8a2caf8eebd52f42952c7c04046 (patch)
tree07a96085c4edea3adb431799fc82f1967a37f601 /include/linux/posix-timers.h
parentaf888d677a3f4473c198b4720319dd037f398b51 (diff)
downloadlinux-80105cd0e62ba8a2caf8eebd52f42952c7c04046.tar.xz
posix-timers: Move interval out of the union
Preparatory patch to unify the alarm timer and hrtimer based posix interval timer handling. The interval is used as a criteria for rearming decisions so moving it out of the clock specific data structures allows later unification. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: John Stultz <john.stultz@linaro.org> Link: http://lkml.kernel.org/r/20170530211656.563922908@linutronix.de
Diffstat (limited to 'include/linux/posix-timers.h')
-rw-r--r--include/linux/posix-timers.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index a372e7e3a396..908048f488ae 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -63,6 +63,7 @@ struct cpu_timer_list {
* @it_requeue_pending: Indicator that timer waits for being requeued on
* signal delivery
* @it_sigev_notify: The notify word of sigevent struct for signal delivery
+ * @it_interval: The interval for periodic timers
* @it_signal: Pointer to the creators signal struct
* @it_pid: The pid of the process/task targeted by the signal
* @it_process: The task to wakeup on clock_nanosleep (CPU timers)
@@ -80,6 +81,7 @@ struct k_itimer {
int it_overrun_last;
int it_requeue_pending;
int it_sigev_notify;
+ ktime_t it_interval;
struct signal_struct *it_signal;
union {
struct pid *it_pid;
@@ -89,12 +91,10 @@ struct k_itimer {
union {
struct {
struct hrtimer timer;
- ktime_t interval;
} real;
struct cpu_timer_list cpu;
struct {
struct alarm alarmtimer;
- ktime_t interval;
} alarm;
struct rcu_head rcu;
} it;