Changeset 92574f4 in mainline for uspace/srv/ns/clonable.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/srv/ns/clonable.c (modified) (2 diffs)

uspace/srv/ns/clonable.c

@@ -92 +92 @@
         
         ipc_forward_fast(csr->callid, phone, IPC_GET_ARG2(csr->call),
-                IPC_GET_ARG3(csr->call), 0, IPC_FF_NONE);
+            IPC_GET_ARG3(csr->call), 0, IPC_FF_NONE);
         
         free(csr);
@@ -127 +127 @@
         }
         
+        link_initialize(&csr->link);
         csr->service = service;
         csr->call = *call;