alarmtimers: Remove period from alarm structure

Now that periodic alarmtimers are managed by the handler function,
remove the period value from the alarm structure and let the handlers
manage the interval on their own.

CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>

2 files changed, 5 insertions, 3 deletions

diff --git a/include/linux/alarmtimer.h b/include/linux/alarmtimer.h
index 17535963b274..c854a8efa863 100644
--- a/include/linux/alarmtimer.h
+++ b/include/linux/alarmtimer.h
@@ -30,7 +30,6 @@ enum alarmtimer_restart {
  */
 struct alarm {
         struct timerqueue_node  node;
-        ktime_t                 period;
         enum alarmtimer_restart (*function)(struct alarm *, ktime_t now);
         enum alarmtimer_type    type;
         bool                    enabled;
@@ -39,7 +38,7 @@ struct alarm {
 
 void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
                 enum alarmtimer_restart (*function)(struct alarm *, ktime_t));
-void alarm_start(struct alarm *alarm, ktime_t start, ktime_t period);
+void alarm_start(struct alarm *alarm, ktime_t start);
 void alarm_cancel(struct alarm *alarm);
 
 u64 alarm_forward(struct alarm *alarm, ktime_t now, ktime_t interval);
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 959c14132f46..042058fdb0af 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -81,7 +81,10 @@ struct k_itimer {
                         unsigned long incr;
                         unsigned long expires;
                 } mmtimer;
-                struct alarm alarmtimer;
+                struct {
+                        struct alarm alarmtimer;
+                        ktime_t interval;
+                } alarm;
                 struct rcu_head rcu;
         } it;
 };