Changeset 5828554 in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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/syscall/syscall.c (modified) (4 diffs)

kernel/generic/src/syscall/syscall.c

@@ -56 +56 @@
 #include <console/console.h>
 #include <udebug/udebug.h>
+#include <log.h>
 
 /** Dispatch system call */
@@ -86 +87 @@
                 rc = syscall_table[id](a1, a2, a3, a4, a5, a6);
         } else {
-                printf("Task %" PRIu64": Unknown syscall %#" PRIxn, TASK->taskid, id);
+                log(LF_OTHER, LVL_ERROR,
+                    "Task %" PRIu64": Unknown syscall %#" PRIxn, TASK->taskid, id);
                 task_kill_self(true);
         }
@@ -120 +122 @@
 syshandler_t syscall_table[SYSCALL_END] = {
         /* System management syscalls. */
-        (syshandler_t) sys_klog,
+        (syshandler_t) sys_kio,
         (syshandler_t) sys_tls_set,
         
@@ -190 +192 @@
         
         /* Kernel console syscalls. */
-        (syshandler_t) sys_debug_activate_console
+        (syshandler_t) sys_debug_activate_console,
+        
+        (syshandler_t) sys_klog,
 };