Changeset 371bd7d in mainline for kernel/generic/src/main

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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:

• kinit.c (modified) (5 diffs)
• uinit.c (modified) (1 diff)
• version.c (modified) (1 diff)

kernel/generic/src/main/kinit.c

@@ -66 +66 @@
 #include <ipc/ipc.h>
 #include <debug.h>
-#include <string.h>
+#include <str.h>
 
 #ifdef CONFIG_SMP
@@ -94 +94 @@
 void kinit(void *arg)
 {
-
 #if defined(CONFIG_SMP) || defined(CONFIG_KCONSOLE)
         thread_t *thread;
@@ -184 +183 @@
                 
                 char namebuf[TASK_NAME_BUFLEN];
-                char *name;
-                
-                name = init.tasks[i].name;
+                
+                const char *name = init.tasks[i].name;
                 if (name[0] == 0)
                         name = "<unknown>";
@@ -217 +215 @@
                 }
         }
-        
+
         /*
          * Run user tasks.
@@ -225 +223 @@
                         program_ready(&programs[i]);
         }
-        
+
 #ifdef CONFIG_KCONSOLE
         if (!stdin) {

kernel/generic/src/main/uinit.c

@@ -42 +42 @@
  
 #include <main/uinit.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <proc/thread.h>
 #include <userspace.h>

kernel/generic/src/main/version.c

@@ -37 +37 @@
 #include <macros.h>
 
-char *project = "SPARTAN kernel";
-char *copyright = "Copyright (c) 2001-2009 HelenOS project";
-char *release = STRING(RELEASE);
-char *name = STRING(NAME);
-char *arch = STRING(KARCH);
+static const char *project = "SPARTAN kernel";
+static const char *copyright = "Copyright (c) 2001-2010 HelenOS project";
+static const char *release = STRING(RELEASE);
+static const char *name = STRING(NAME);
+static const char *arch = STRING(KARCH);
 
 #ifdef REVISION
-        char *revision = ", revision " STRING(REVISION);
+        static const char *revision = ", revision " STRING(REVISION);
 #else
-        char *revision = "";
+        static const char *revision = "";
 #endif
 
 #ifdef TIMESTAMP
-        char *timestamp = " on " STRING(TIMESTAMP);
+        static const char *timestamp = " on " STRING(TIMESTAMP);
 #else
-        char *timestamp = "";
+        static const char *timestamp = "";
 #endif