Changeset 96598b8 in mainline for kernel/arch/sparc64/include/context.h

Timestamp:

2012-03-16T20:32:13Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

b191acae

Parents:

53d5278 (diff), 145d16f8 (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 with mainline

File:

• kernel/arch/sparc64/include/context.h (modified) (2 diffs)

kernel/arch/sparc64/include/context.h

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64 
+/** @addtogroup sparc64
  * @{
  */
@@ -40 +40 @@
 #include <align.h>
 
-#define SP_DELTA        (STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE)
+#define SP_DELTA  (STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE)
 
-#define context_set(c, _pc, stack, size)                        \
-        (c)->pc = ((uintptr_t) _pc) - 8;                        \
-        (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size),        \
-                STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);     \
-        (c)->fp = -STACK_BIAS
-        
+#define context_set(c, _pc, stack, size) \
+        do { \
+                (c)->pc = ((uintptr_t) _pc) - 8; \
+                (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), \
+                    STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA); \
+                (c)->fp = -STACK_BIAS; \
+        } while (0)
 
 /*