Changeset ad7a6c9 in mainline for kernel/generic/include/syscall/syscall.h

Timestamp:

2011-03-30T13:10:24Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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/include/syscall/syscall.h (modified) (4 diffs)

kernel/generic/include/syscall/syscall.h

@@ -47 +47 @@
         SYS_TASK_GET_ID,
         SYS_TASK_SET_NAME,
+        SYS_TASK_KILL,
+        SYS_TASK_EXIT,
         SYS_PROGRAM_SPAWN_LOADER,
         
@@ -57 +59 @@
         SYS_AS_AREA_CHANGE_FLAGS,
         SYS_AS_AREA_DESTROY,
+        SYS_AS_GET_UNMAPPED_AREA,
         
         SYS_IPC_CALL_SYNC_FAST,
@@ -69 +72 @@
         SYS_IPC_POKE,
         SYS_IPC_HANGUP,
-        SYS_IPC_REGISTER_IRQ,
-        SYS_IPC_UNREGISTER_IRQ,
         SYS_IPC_CONNECT_KBOX,
         
@@ -81 +82 @@
         SYS_PHYSMEM_MAP,
         SYS_IOSPACE_ENABLE,
-        SYS_INTERRUPT_ENABLE,
+        SYS_REGISTER_IRQ,
+        SYS_UNREGISTER_IRQ,
         
         SYS_SYSINFO_GET_TAG,