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

Timestamp:

2011-08-03T17:34:57Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 from mainline

File:

• kernel/generic/include/syscall/syscall.h (modified) (4 diffs)

kernel/generic/include/syscall/syscall.h

@@ -44 +44 @@
         SYS_THREAD_GET_ID,
         SYS_THREAD_USLEEP,
+        SYS_THREAD_UDELAY,
         
         SYS_TASK_GET_ID,
@@ -61 +62 @@
         SYS_AS_GET_UNMAPPED_AREA,
         
+        SYS_PAGE_FIND_MAPPING,
+        
         SYS_IPC_CALL_SYNC_FAST,
         SYS_IPC_CALL_SYNC_SLOW,
@@ -75 +78 @@
         
         SYS_EVENT_SUBSCRIBE,
+        SYS_EVENT_UNMASK,
         
         SYS_CAP_GRANT,
@@ -90 +94 @@
         SYS_SYSINFO_GET_DATA,
         
-        SYS_DEBUG_ENABLE_CONSOLE,
-        SYS_DEBUG_DISABLE_CONSOLE,
+        SYS_DEBUG_ACTIVATE_CONSOLE,
         
         SYSCALL_END