Changeset 5828554 in mainline for abi/include/abi/syscall.h

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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:

• abi/include/abi/syscall.h (modified) (2 diffs)

abi/include/abi/syscall.h

@@ -37 +37 @@
 
 typedef enum {
-        SYS_KLOG = 0,
+        SYS_KIO = 0,
         SYS_TLS_SET = 1,  /* Hardcoded for AMD64, IA-32 (fibril.S in uspace) */
         
@@ -99 +99 @@
         SYS_DEBUG_ACTIVATE_CONSOLE,
         
+        SYS_KLOG,
+        
         SYSCALL_END
 } syscall_t;