Changeset 2f23341 in mainline for kernel/arch/ia64/include/context.h

Timestamp:

2011-05-19T20:04:09Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

326bf65

Parents:

2a922c8

Message:

Fix ia64 regression introduced in mainline,966.
The ia64 stack is actually two stacks in one:

• the regular memory stack, which is now STACK_SIZE / 2 bytes long
• and the equally sized RSE stack

Note that ia64 is now the only architecture which effectively uses
only one memory frame for its memory stack.

File:

• kernel/arch/ia64/include/context.h (modified) (1 diff)

kernel/arch/ia64/include/context.h

@@ -49 +49 @@
 #define SP_DELTA        (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
-/* RSE stack starts at the bottom of memory stack. */
+/* RSE stack starts at the bottom of memory stack, hence the division by 2. */
 #define context_set(c, _pc, stack, size)                                                                \
         do {                                                                                            \
                 (c)->pc = (uintptr_t) _pc;                                                              \
-                (c)->bsp = ((uintptr_t) stack) + ALIGN_UP((size), REGISTER_STACK_ALIGNMENT);            \
+                (c)->bsp = ((uintptr_t) stack) + ALIGN_UP((size / 2), REGISTER_STACK_ALIGNMENT);        \
                 (c)->ar_pfs &= PFM_MASK;                                                                \
-                (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - SP_DELTA;           \
+                (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size / 2), STACK_ALIGNMENT) - SP_DELTA;       \
         } while (0);