Changeset 87b4baa in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2010-12-17T20:16:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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 @@
 
 /** Dispatch system call */
-unative_t syscall_handler(unative_t a1, unative_t a2, unative_t a3,
-    unative_t a4, unative_t a5, unative_t a6, unative_t id)
+sysarg_t syscall_handler(sysarg_t a1, sysarg_t a2, sysarg_t a3,
+    sysarg_t a4, sysarg_t a5, sysarg_t a6, sysarg_t id)
 {
         /* Do userpace accounting */
@@ -74 +74 @@
 #endif
         
-        unative_t rc;
+        sysarg_t rc;
         if (id < SYSCALL_END) {
                 rc = syscall_table[id](a1, a2, a3, a4, a5, a6);
@@ -147 +147 @@
         (syshandler_t) sys_ipc_register_irq,
         (syshandler_t) sys_ipc_unregister_irq,
+        (syshandler_t) sys_ipc_connect_kbox,
         
         /* Event notification syscalls. */
@@ -169 +170 @@
         /* Debug calls */
         (syshandler_t) sys_debug_enable_console,
-        (syshandler_t) sys_debug_disable_console,
-        
-        (syshandler_t) sys_ipc_connect_kbox
+        (syshandler_t) sys_debug_disable_console
 };