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

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

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

kernel/generic/include/syscall/syscall.h

@@ -71 +71 @@
         SYS_IPC_REGISTER_IRQ,
         SYS_IPC_UNREGISTER_IRQ,
-
+        
         SYS_EVENT_SUBSCRIBE,
         
@@ -82 +82 @@
         SYS_PREEMPT_CONTROL,
         
-        SYS_SYSINFO_VALID,
-        SYS_SYSINFO_VALUE,
+        SYS_SYSINFO_GET_TAG,
+        SYS_SYSINFO_GET_VALUE,
+        SYS_SYSINFO_GET_DATA_SIZE,
+        SYS_SYSINFO_GET_DATA,
         
         SYS_DEBUG_ENABLE_CONSOLE,
         SYS_DEBUG_DISABLE_CONSOLE,
+        
         SYS_IPC_CONNECT_KBOX,
         SYSCALL_END
@@ -93 +96 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef unative_t (*syshandler_t)(unative_t, unative_t, unative_t, unative_t,