Changeset 1affcdf3 in mainline for kernel/generic/src/main

Timestamp:

2011-06-10T19:33:41Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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

Location:

kernel/generic/src/main

Files:

• main.c (modified) (6 diffs)
• uinit.c (modified) (6 diffs)
• version.c (modified) (1 diff)

kernel/generic/src/main/main.c

@@ -71 +71 @@
 #include <mm/as.h>
 #include <mm/slab.h>
+#include <mm/reserve.h>
 #include <synch/waitq.h>
 #include <synch/futex.h>
@@ -117 +118 @@
 #endif
 
-#define CONFIG_STACK_SIZE  ((1 << STACK_FRAMES) * STACK_SIZE)
-
 /** Main kernel routine for bootstrap CPU.
  *
@@ -138 +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 */
@@ -164 +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 */
@@ -217 +216 @@
         ddi_init();
         arch_post_mm_init();
+        reserve_init();
         arch_pre_smp_init();
         smp_init();
@@ -321 +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 */

kernel/generic/src/main/uinit.c

@@ -33 +33 @@
 /**
  * @file
- * @brief       Userspace bootstrap thread.
+ * @brief Userspace bootstrap thread.
  *
  * This file contains uinit kernel thread wich is used to start every
@@ -40 +40 @@
  * @see SYS_THREAD_CREATE
  */
- 
+
 #include <main/uinit.h>
 #include <typedefs.h>
@@ -48 +48 @@
 #include <arch.h>
 #include <udebug/udebug.h>
-
 
 /** Thread used to bring up userspace thread.
@@ -58 +57 @@
 {
         uspace_arg_t uarg;
-
+        
         /*
          * So far, we don't have a use for joining userspace threads so we
@@ -68 +67 @@
          */
         thread_detach(THREAD);
-
+        
 #ifdef CONFIG_UDEBUG
         udebug_stoppable_end();
@@ -78 +77 @@
         uarg.uspace_thread_function = NULL;
         uarg.uspace_thread_arg = NULL;
-
+        
         free((uspace_arg_t *) arg);
         

kernel/generic/src/main/version.c

@@ -38 +38 @@
 
 static const char *project = "SPARTAN kernel";
-static const char *copyright = "Copyright (c) 2001-2010 HelenOS project";
+static const char *copyright = "Copyright (c) 2001-2011 HelenOS project";
 static const char *release = STRING(RELEASE);
 static const char *name = STRING(NAME);