Changeset 6843a9c in mainline for uspace/lib/c/arch/mips32/include/atomic.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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 mainline changes

Trivial conflicts.

File:

• uspace/lib/c/arch/mips32/include/atomic.h (modified) (1 diff)

uspace/lib/c/arch/mips32/include/atomic.h

@@ -67 +67 @@
                 "       ll %0, %1\n"
                 "       addu %0, %0, %3\n"      /* same as add, but never traps on overflow */
-                "       move %2, %0\n"
+                "       move %2, %0\n"
                 "       sc %0, %1\n"
                 "       beq %0, %4, 1b\n"       /* if the atomic operation failed, try again */