Changeset c739102 in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2012-11-21T23:26:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0f2c80a

Parents:

bebf97d (diff), 1f7753a (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:

Mainline changes.

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (1 diff)

kernel/generic/src/interrupt/interrupt.c

@@ -168 +168 @@
 static NO_TRACE void fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
 {
-        printf("Task %s (%" PRIu64 ") killed due to an exception at "
-            "program counter %p.\n", TASK->name, TASK->taskid,
-            (void *) istate_get_pc(istate));
-        
-        istate_decode(istate);
-        stack_trace_istate(istate);
-        
-        printf("Kill message: ");
-        vprintf(fmt, args);
-        printf("\n");
+        if (!TASK->silent_kill) {
+                printf("Task %s (%" PRIu64 ") killed due to an exception at "
+                    "program counter %p.\n", TASK->name, TASK->taskid,
+                    (void *) istate_get_pc(istate));
+        
+                istate_decode(istate);
+                stack_trace_istate(istate);
+        
+                printf("Kill message: ");
+                vprintf(fmt, args);
+                printf("\n");
+        }
         
         task_kill_self(true);