Changeset 46c20c8 in mainline for kernel/generic/include/syscall/syscall.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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

@@ -71 +71 @@
         SYS_IPC_REGISTER_IRQ,
         SYS_IPC_UNREGISTER_IRQ,
-
+        
         SYS_EVENT_SUBSCRIBE,
         
@@ -80 +80 @@
         SYS_PHYSMEM_MAP,
         SYS_IOSPACE_ENABLE,
-        SYS_PREEMPT_CONTROL,
+        SYS_INTERRUPT_ENABLE,
         
-        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,