Changeset 8b36bf2 in mainline for uspace/lib/c/arch/ia64/include/fibril.h

Timestamp:

2012-06-20T23:03:29Z (11 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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:

• uspace/lib/c/arch/ia64/include/fibril.h (modified) (2 diffs)

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

@@ -49 +49 @@
 #define PFM_MASK  (~0x3fffffffff)
 
-#define PSTHREAD_INITIAL_STACK_PAGES_NO  2
-
 /* Stack is divided into two equal parts (for memory stack and register stack). */
-#define PSTHREAD_INITIAL_STACK_DIVISION  2
+#define FIBRIL_INITIAL_STACK_DIVISION  2
 
 #define context_set(c, _pc, stack, size, tls) \
@@ -58 +56 @@
                 (c)->pc = (uint64_t) _pc; \
                 (c)->bsp = ((uint64_t) stack) + \
-                    size / PSTHREAD_INITIAL_STACK_DIVISION; \
+                    size / FIBRIL_INITIAL_STACK_DIVISION; \
                 (c)->ar_pfs &= PFM_MASK; \
                 (c)->sp = ((uint64_t) stack) + \
-                    ALIGN_UP((size / PSTHREAD_INITIAL_STACK_DIVISION), STACK_ALIGNMENT) - \
+                    ALIGN_UP((size / FIBRIL_INITIAL_STACK_DIVISION), STACK_ALIGNMENT) - \
                     SP_DELTA; \
                 (c)->tp = (uint64_t) tls; \