Changeset 25a76ab8 in mainline for kernel/arch/mips32/src/debugger.c

Timestamp:

2010-05-08T07:53:23Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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) (2 diffs)

kernel/arch/mips32/src/debugger.c

@@ -164 +164 @@
                         printf("Duplicate breakpoint %d.\n", i);
                         spinlock_unlock(&bkpoint_lock);
+                        interrupts_restore(ipl);
                         return 0;
                 } else if (breakpoints[i].address == (uintptr_t)argv->intval +
@@ -171 +172 @@
                             "with %d.\n", i);
                         spinlock_unlock(&bkpoint_lock);
+                        interrupts_restore(ipl);
                         return 0;
                 }