Changes in kernel/generic/src/synch/rcu.c [63e27ef:b7fd2a0] in mainline

File:

• kernel/generic/src/synch/rcu.c (modified) (6 diffs)

kernel/generic/src/synch/rcu.c

@@ -957 +957 @@
                         
                         /* Wait for the GP to complete. */
-                        int ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, &rcu.gp_lock, 
+                        errno_t ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, &rcu.gp_lock, 
                                 SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
                         
-                        if (ret == ESYNCH_INTERRUPTED) {
+                        if (ret == EINTR) {
                                 spinlock_unlock(&rcu.gp_lock);
                                 return false;                   
@@ -1013 +1013 @@
                 spinlock_lock(&rcu.gp_lock);
 
-                int ret = 0;
+                errno_t ret = 0;
                 ret = _condvar_wait_timeout_spinlock(&rcu.expedite_now, &rcu.gp_lock,
                         DETECT_SLEEP_MS * 1000, SYNCH_FLAGS_INTERRUPTIBLE);
 
                 /* rcu.expedite_now was signaled. */
-                if (ret == ESYNCH_OK_BLOCKED) {
+                if (ret == EOK) {
                         *expedite = true;
                 }
@@ -1024 +1024 @@
                 spinlock_unlock(&rcu.gp_lock);
 
-                return (ret != ESYNCH_INTERRUPTED);
+                return (ret != EINTR);
         }
 }
@@ -1271 +1271 @@
                 int ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, &rcu.gp_lock, 
                         SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
-                interrupted = (ret == ESYNCH_INTERRUPTED);
+                interrupted = (ret == EINTR);
         }
         
@@ -1332 +1332 @@
                         &rcu.gp_lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
                 
-                interrupted = (ret == ESYNCH_INTERRUPTED);
+                interrupted = (ret == EINTR);
         }
         
@@ -1406 +1406 @@
         spinlock_unlock(&rcu.gp_lock);
         
-        return (ret != ESYNCH_INTERRUPTED);
+        return (ret != EINTR);
 }