change sys_wait_for_ts_release to ret release time

1 files changed, 18 insertions, 7 deletions

diff --git a/litmus/sync.c b/litmus/sync.c
index 908bf21dc210..01ea5d52f84b 100644
--- a/litmus/sync.c
+++ b/litmus/sync.c
@@ -33,7 +33,7 @@ struct ts_release_wait {
 static LIST_HEAD(task_release_list);
 static DEFINE_MUTEX(task_release_lock);
 
-static long do_wait_for_ts_release(void)
+static long do_wait_for_ts_release(struct timespec *wake)
 {
         DECLARE_TS_RELEASE_WAIT(wait);
 
@@ -51,13 +51,18 @@ static long do_wait_for_ts_release(void)
 
         if (!ret) {
                 if (is_realtime(current)) {
+                        lt_t phasedRelease = wait.ts_release_time
+                                        + current->rt_param.task_params.phase;
+                        *wake = ns_to_timespec(phasedRelease);
+
                         /* Completion succeeded, setup release. */
-                        litmus->release_at(current, wait.ts_release_time
-                                           + current->rt_param.task_params.phase
-                                           - current->rt_param.task_params.period);
+                        litmus->release_at(current, phasedRelease
+                                                        - current->rt_param.task_params.period);
                         /* trigger advance to next job release at the programmed time */
                         ret = complete_job();
                 }
+                else
+                        *wake = ns_to_timespec(wait.ts_release_time);
         } else {
                 /* We were interrupted, must cleanup list. */
                 mutex_lock(&task_release_lock);
@@ -125,11 +130,16 @@ out:
 }
 
 
-asmlinkage long sys_wait_for_ts_release(void)
+asmlinkage long sys_wait_for_ts_release(struct timespec __user *__wake)
 {
+        struct timespec wake;
         long ret = -EPERM;
 
-        ret = do_wait_for_ts_release();
+        ret = do_wait_for_ts_release(&wake);
+
+        if (__wake && access_ok(VERIFY_WRITE, __wake, sizeof(struct timespec))) {
+                __copy_to_user(__wake, &wake, sizeof(wake));
+        }
 
         return ret;
 }
@@ -149,7 +159,8 @@ asmlinkage long sys_release_ts(lt_t __user *__delay)
 
         if (ret == 0) {
                 /* round up to next larger integral millisecond */
-                start_time = ((litmus_clock() / ONE_MS) + 1) * ONE_MS;
+//              start_time = ((litmus_clock() / ONE_MS) + 1) * ONE_MS;
+                start_time = litmus_clock();
 
                 /* Note: Non-rt tasks that participate in a sync release cannot be
                    delayed.  They will be released immediately. */