Changeset 6843a9c in mainline for uspace/lib/c/arch/sparc64/include/fibril.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/sparc64/include/fibril.h (modified) (2 diffs)

uspace/lib/c/arch/sparc64/include/fibril.h

@@ -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, ptls) \
@@ -50 +50 @@
                 (c)->tp = (uint64_t) ptls; \
         } while (0)
-        
+
 /*
  * Save only registers that must be preserved across