Changeset 82122f3 in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2010-12-17T14:51:41Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1f383dde

Parents:

692f13e4 (diff), 11658b64 (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 into lelian/hidd

File:

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

kernel/generic/src/interrupt/interrupt.c

@@ -197 +197 @@
                 /* Notify the subscriber that a fault occurred. */
                 event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
-                    UPPER32(TASK->taskid), (unative_t) THREAD);
+                    UPPER32(TASK->taskid), (sysarg_t) THREAD);
                 
 #ifdef CONFIG_UDEBUG
@@ -263 +263 @@
                 
                 const char *symbol =
-                    symtab_fmt_name_lookup((unative_t) exc_table[i].handler);
+                    symtab_fmt_name_lookup((sysarg_t) exc_table[i].handler);
                 
 #ifdef __32_BITS__