Changeset b5e68c8 in mainline for kernel/arch/mips32/include/atomic.h

Timestamp:

2011-05-12T16:49:44Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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.

File:

• kernel/arch/mips32/include/atomic.h (modified) (1 diff)

kernel/arch/mips32/include/atomic.h

@@ -91 +91 @@
                 "       sc %0, %1\n"
                 "       beqz %0, 1b\n"
+                "       nop\n"
                 "2:\n"
                 : "=&r" (tmp),