Changeset 87b4baa in mainline for kernel/generic/src/udebug/udebug.c

Timestamp:

2010-12-17T20:16:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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:

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

kernel/generic/src/udebug/udebug.c

@@ -219 +219 @@
  *
  */
-void udebug_syscall_event(unative_t a1, unative_t a2, unative_t a3,
-    unative_t a4, unative_t a5, unative_t a6, unative_t id, unative_t rc,
+void udebug_syscall_event(sysarg_t a1, sysarg_t a2, sysarg_t a3,
+    sysarg_t a4, sysarg_t a5, sysarg_t a6, sysarg_t id, sysarg_t rc,
     bool end_variant)
 {
@@ -314 +314 @@
         IPC_SET_RETVAL(call->data, 0);
         IPC_SET_ARG1(call->data, UDEBUG_EVENT_THREAD_B);
-        IPC_SET_ARG2(call->data, (unative_t) thread);
+        IPC_SET_ARG2(call->data, (sysarg_t) thread);
         
         /*