Changeset 6a44ee4 in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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) (6 diffs)

kernel/generic/src/syscall/syscall.c

@@ -41 +41 @@
 #include <proc/program.h>
 #include <mm/as.h>
+#include <mm/page.h>
 #include <print.h>
 #include <arch.h>
@@ -118 +119 @@
 
 syshandler_t syscall_table[SYSCALL_END] = {
+        /* System management syscalls. */
         (syshandler_t) sys_klog,
         (syshandler_t) sys_tls_set,
@@ -126 +128 @@
         (syshandler_t) sys_thread_get_id,
         (syshandler_t) sys_thread_usleep,
+        (syshandler_t) sys_thread_udelay,
         
         (syshandler_t) sys_task_get_id,
@@ -144 +147 @@
         (syshandler_t) sys_as_area_destroy,
         (syshandler_t) sys_as_get_unmapped_area,
+        
+        /* Page mapping related syscalls. */
+        (syshandler_t) sys_page_find_mapping,
         
         /* IPC related syscalls. */
@@ -174 +180 @@
         (syshandler_t) sys_unregister_irq,
         
-        /* Sysinfo syscalls */
+        /* Sysinfo syscalls. */
         (syshandler_t) sys_sysinfo_get_tag,
         (syshandler_t) sys_sysinfo_get_value,
@@ -180 +186 @@
         (syshandler_t) sys_sysinfo_get_data,
         
-        /* Debug calls */
-        (syshandler_t) sys_debug_enable_console,
-        (syshandler_t) sys_debug_disable_console
+        /* Kernel console syscalls. */
+        (syshandler_t) sys_debug_activate_console
 };