Changeset cf2af94 in mainline for kernel/generic/src/ipc/ipcrsc.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• kernel/generic/src/ipc/ipcrsc.c (modified) (2 diffs)

kernel/generic/src/ipc/ipcrsc.c

@@ -144 +144 @@
  *
  */
-call_t *get_call(unative_t callid)
+call_t *get_call(sysarg_t callid)
 {
         link_t *lst;
@@ -153 +153 @@
             lst != &TASK->answerbox.dispatched_calls; lst = lst->next) {
                 call_t *call = list_get_instance(lst, call_t, link);
-                if ((unative_t) call == callid) {
+                if ((sysarg_t) call == callid) {
                         result = call;
                         break;