Changeset ff381a7 in mainline for uspace/app/trace/ipcp.c

Timestamp:

2015-11-02T20:54:19Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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:

• uspace/app/trace/ipcp.c (modified) (1 diff)

uspace/app/trace/ipcp.c

@@ -303 +303 @@
             (retval == 0)) {
                 /* Connected to a service (through NS) */
-                service = IPC_GET_ARG1(pcall->question);
+                service = IPC_GET_ARG2(pcall->question);
                 proto = proto_get_by_srv(service);
                 if (proto == NULL)