Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth

[firefly-linux-kernel-4.4.55.git] / include / linux / posix-timers.h

diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 959c14132f465f8f3d0f5f61cd6d2701c252ae30..042058fdb0af3c4adcf7a0e3c5ee317fb73e2a8b 100644 (file)
--- 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;
 };