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

Timestamp:

2011-07-05T21:21:36Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5e2aa83, eb66f236

Parents:

3714e79 (diff), f7a55f9 (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) (3 diffs)

kernel/generic/include/syscall/syscall.h

@@ -44 +44 @@
         SYS_THREAD_GET_ID,
         SYS_THREAD_USLEEP,
+        SYS_THREAD_UDELAY,
         
         SYS_TASK_GET_ID,
@@ -60 +61 @@
         SYS_AS_AREA_DESTROY,
         SYS_AS_GET_UNMAPPED_AREA,
+        
+        SYS_PAGE_FIND_MAPPING,
         
         SYS_IPC_CALL_SYNC_FAST,
@@ -91 +94 @@
         SYS_SYSINFO_GET_DATA,
         
-        SYS_DEBUG_ENABLE_CONSOLE,
-        SYS_DEBUG_DISABLE_CONSOLE,
+        SYS_DEBUG_ACTIVATE_CONSOLE,
         
         SYSCALL_END