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

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/interrupt/interrupt.c (modified) (3 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -114 +114 @@
 
 /** Terminate thread and task if exception came from userspace. */
-void fault_if_from_uspace(istate_t *istate, char *fmt, ...)
+void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
 {
         task_t *task = TASK;
@@ -162 +162 @@
 #if (IVT_ITEMS > 0)
         unsigned int i;
-        char *symbol;
 
         spinlock_lock(&exctbl_lock);
@@ -177 +176 @@
         
         for (i = 0; i < IVT_ITEMS; i++) {
-                symbol = symtab_fmt_name_lookup((unative_t) exc_table[i].f);
+                const char *symbol = symtab_fmt_name_lookup((unative_t) exc_table[i].f);
 
 #ifdef __32_BITS__