Changeset 132ab5d1 in mainline for kernel/generic/src/synch/rcu.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

kernel/generic/src/synch/rcu.c

@@ -960 +960 @@
                                 SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
                         
-                        if (ret == ESYNCH_INTERRUPTED) {
+                        if (ret == EINTR) {
                                 spinlock_unlock(&rcu.gp_lock);
                                 return false;                   
@@ -1018 +1018 @@
 
                 /* 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);
 }