Changeset 8fb1bf82 in mainline for kernel/arch/mips32/src/debugger.c

Timestamp:

2010-11-25T13:42:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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/arch/mips32/src/debugger.c (modified) (3 diffs)

kernel/arch/mips32/src/debugger.c

@@ -247 +247 @@
         smc_coherence(((uint32_t *) cur->address)[1]);
         
-        cur->address = NULL;
+        cur->address = (uintptr_t) NULL;
         
         irq_spinlock_unlock(&bkpoint_lock, true);
@@ -289 +289 @@
         
         for (i = 0; i < BKPOINTS_MAX; i++)
-                breakpoints[i].address = NULL;
+                breakpoints[i].address = (uintptr_t) NULL;
         
 #ifdef CONFIG_KCONSOLE
@@ -417 +417 @@
                 /* Remove one-shot breakpoint */
                 if ((cur->flags & BKPOINT_ONESHOT))
-                        cur->address = NULL;
+                        cur->address = (uintptr_t) NULL;
                 
                 /* Remove in-progress flag */