Changeset 5a6cc679 in mainline for kernel/generic/src/synch/rcu.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• kernel/generic/src/synch/rcu.c (modified) (2 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);
                         
@@ -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);