Changeset 9d47440 in mainline for kernel/generic/src/main/main.c

Timestamp:

2011-05-21T16:23:17Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ff03f3

Parents:

8d308b9 (diff), 13f2461 (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/src/main/main.c (modified) (4 diffs)

kernel/generic/src/main/main.c

@@ -118 +118 @@
 #endif
 
-#define CONFIG_STACK_SIZE  ((1 << STACK_FRAMES) * STACK_SIZE)
-
 /** Main kernel routine for bootstrap CPU.
  *
@@ -139 +137 @@
         config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
             hardcoded_kdata_size, PAGE_SIZE);
-        config.stack_size = CONFIG_STACK_SIZE;
+        config.stack_size = STACK_SIZE;
         
         /* Initialy the stack is placed just after the kernel */
@@ -165 +163 @@
         
         context_save(&ctx);
-        context_set(&ctx, FADDR(main_bsp_separated_stack), config.stack_base,
-            THREAD_STACK_SIZE);
+        context_set(&ctx, FADDR(main_bsp_separated_stack),
+            config.stack_base, STACK_SIZE);
         context_restore(&ctx);
         /* not reached */
@@ -323 +321 @@
         context_save(&CPU->saved_context);
         context_set(&CPU->saved_context, FADDR(main_ap_separated_stack),
-            (uintptr_t) CPU->stack, CPU_STACK_SIZE);
+            (uintptr_t) CPU->stack, STACK_SIZE);
         context_restore(&CPU->saved_context);
         /* not reached */