LITMUS^RT core: use absolute synchronous release times

To allow userspace to determine when exactly a synchronous release
should occur.

2 files changed, 10 insertions, 10 deletions

diff --git a/litmus/ctrldev.c b/litmus/ctrldev.c
index 3fc769c573a5..cc74c5afa5c6 100644
--- a/litmus/ctrldev.c
+++ b/litmus/ctrldev.c
@@ -133,7 +133,7 @@ asmlinkage long sys_litmus_lock(int lock_od);
 asmlinkage long sys_litmus_unlock(int lock_od);
 asmlinkage long sys_wait_for_job_release(unsigned int job);
 asmlinkage long sys_wait_for_ts_release(void);
-asmlinkage long sys_release_ts(lt_t __user *__delay);
+asmlinkage long sys_release_ts(lt_t __user *__when);
 
 static long litmus_ctrl_ioctl(struct file *filp,
         unsigned int cmd, unsigned long arg)
diff --git a/litmus/sync.c b/litmus/sync.c
index 941545a05383..123cefd68a36 100644
--- a/litmus/sync.c
+++ b/litmus/sync.c
@@ -130,23 +130,23 @@ asmlinkage long sys_wait_for_ts_release(void)
         return ret;
 }
 
-#define ONE_MS 1000000
+#define ONE_MS 1000000ULL
+#define ONE_SECOND (ONE_MS * 1000)
 
-asmlinkage long sys_release_ts(lt_t __user *__delay)
+asmlinkage long sys_release_ts(lt_t __user *__when)
 {
         long ret;
-        lt_t delay;
         lt_t start_time;
+        lt_t now;
 
         /* FIXME: check capabilities... */
 
-        ret = copy_from_user(&delay, __delay, sizeof(delay));
+        ret = copy_from_user(&start_time, __when, sizeof(start_time));
         if (ret == 0) {
-                /* round up to next larger integral millisecond */
-                start_time = litmus_clock();
-                do_div(start_time, ONE_MS);
-                start_time *= ONE_MS;
-                ret = do_release_ts(start_time + delay);
+                now = litmus_clock();
+                if (lt_before(start_time, now))
+                        start_time = now + ONE_SECOND;
+                ret = do_release_ts(start_time);
         }
 
         return ret;