Changeset e27cf669 in mainline for kernel/generic/include/interrupt.h

Timestamp:

2010-02-09T20:19:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fb150d78

Parents:

975e7e9 (diff), eb73a50 (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/include/interrupt.h (modified) (1 diff)

kernel/generic/include/interrupt.h

@@ -46 +46 @@
 typedef void (* iroutine)(int n, istate_t *istate);
 
-#define fault_if_from_uspace(istate, fmt, ...) \
-{ \
-        if (istate_from_uspace(istate)) { \
-                task_t *task = TASK; \
-                printf("Task %s (%" PRIu64 ") killed due to an exception at " \
-                    "program counter %p.\n", task->name, task->taskid, istate_get_pc(istate)); \
-                stack_trace_istate(istate); \
-                printf("Kill message: " fmt "\n", ##__VA_ARGS__); \
-                task_kill(task->taskid); \
-                thread_exit(); \
-        } \
-}
-
+extern void fault_if_from_uspace(istate_t *istate, char *fmt, ...);
 extern iroutine exc_register(int n, const char *name, iroutine f);
 extern void exc_dispatch(int n, istate_t *t);
 void exc_init(void);
+
+extern void irq_initialize_arch(irq_t *irq);
 
 #endif