Changeset 5828554 in mainline for abi/include/abi/ipc/event.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/ipc/event.h (modified) (1 diff)

abi/include/abi/ipc/event.h

@@ -38 +38 @@
 /** Global events */
 typedef enum event_type {
-        /** New data available in kernel log */
-        EVENT_KLOG = 0,
+        /** New data available in kernel character buffer */
+        EVENT_KIO = 0,
         /** Returning from kernel console to uspace */
         EVENT_KCONSOLE,
         /** A task/thread has faulted and will be terminated */
         EVENT_FAULT,
+        /** New data available in kernel log */
+        EVENT_KLOG,
         EVENT_END
 } event_type_t;