From: Andrei Vagin <avagin@xxxxxxxxx> Wire timer_settime() syscall into time namespace virtualization. Signed-off-by: Andrei Vagin <avagin@xxxxxxxxxx> Signed-off-by: Dmitry Safonov <dima@xxxxxxxxxx> --- kernel/time/alarmtimer.c | 3 +++ kernel/time/posix-timers.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 31f99361342e..23f5c39c8d23 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -26,6 +26,7 @@ #include <linux/freezer.h> #include <linux/compat.h> #include <linux/module.h> +#include <linux/time_namespace.h> #include "posix-timers.h" @@ -621,6 +622,8 @@ static void alarm_timer_arm(struct k_itimer *timr, ktime_t expires, if (!absolute) expires = ktime_add_safe(expires, base->gettime()); + else + expires = timens_ktime_to_host(base->base_clockid, expires); if (sigev_none) alarm->node.expires = expires; else diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index a723e63d55fd..7922731f98cd 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -803,6 +803,8 @@ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires, if (!absolute) expires = ktime_add_safe(expires, timer->base->get_time()); + else + expires = timens_ktime_to_host(timer->base->clockid, expires); hrtimer_set_expires(timer, expires); if (!sigev_none) -- 2.21.0 _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/containers
