Changeset c6588ce in mainline for kernel/generic/include/context.h

Timestamp:

2012-05-05T08:12:17Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (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/generic/include/context.h (modified) (1 diff)

kernel/generic/include/context.h

@@ -41 +41 @@
 
 #define context_set_generic(ctx, _pc, stack, size) \
-        (ctx)->pc = (uintptr_t) (_pc); \
-        (ctx)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA;
+        do { \
+                (ctx)->pc = (uintptr_t) (_pc); \
+                (ctx)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \
+        } while (0)
 
 extern int context_save_arch(context_t *ctx) __attribute__((returns_twice));