Changeset 8b863a62 in mainline for contrib/arch/HelenOS.adl

Timestamp:

2014-04-16T17:14:06Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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:

• contrib/arch/HelenOS.adl (modified) (3 diffs)

contrib/arch/HelenOS.adl

@@ -22 +22 @@
         
         /* Kernel log */
-        inst klog klog;
+        inst kio kio;
         
         [/uspace/lib/libc/bind%ns]
@@ -30 +30 @@
         [/uspace/lib/libc/bind%vfs]
         [/uspace/lib/libc/bind%console]
-        [/uspace/lib/libc/bind%klog]
+        [/uspace/lib/libc/bind%kio]
         
         bind ns:kbd to console:kbd;
@@ -58 +58 @@
         bind console:sys_console to kernel:sys_console;
         
-        bind klog:ns to ns:ns;
+        bind kio:ns to ns:ns;
 };