git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kmod: Release sub_info on cred allocation failure.
[safe/jmp/linux-2.6]
/
kernel
/
kgdb.c
diff --git
a/kernel/kgdb.c
b/kernel/kgdb.c
index
25d955d
..
9147a31
100644
(file)
--- a/
kernel/kgdb.c
+++ b/
kernel/kgdb.c
@@
-590,6
+590,7
@@
static void kgdb_wait(struct pt_regs *regs)
/* Signal the primary CPU that we are done: */
atomic_set(&cpu_in_kgdb[cpu], 0);
/* Signal the primary CPU that we are done: */
atomic_set(&cpu_in_kgdb[cpu], 0);
+ touch_softlockup_watchdog();
clocksource_touch_watchdog();
local_irq_restore(flags);
}
clocksource_touch_watchdog();
local_irq_restore(flags);
}
@@
-1432,6
+1433,7
@@
acquirelock:
atomic_read(&kgdb_cpu_doing_single_step) != cpu) {
atomic_set(&kgdb_active, -1);
atomic_read(&kgdb_cpu_doing_single_step) != cpu) {
atomic_set(&kgdb_active, -1);
+ touch_softlockup_watchdog();
clocksource_touch_watchdog();
local_irq_restore(flags);
clocksource_touch_watchdog();
local_irq_restore(flags);
@@
-1524,6
+1526,7
@@
acquirelock:
kgdb_restore:
/* Free kgdb_active */
atomic_set(&kgdb_active, -1);
kgdb_restore:
/* Free kgdb_active */
atomic_set(&kgdb_active, -1);
+ touch_softlockup_watchdog();
clocksource_touch_watchdog();
local_irq_restore(flags);
clocksource_touch_watchdog();
local_irq_restore(flags);
@@
-1580,8
+1583,8
@@
static void sysrq_handle_gdb(int key, struct tty_struct *tty)
static struct sysrq_key_op sysrq_gdb_op = {
.handler = sysrq_handle_gdb,
static struct sysrq_key_op sysrq_gdb_op = {
.handler = sysrq_handle_gdb,
- .help_msg = "
Gdb
",
- .action_msg = "
GDB
",
+ .help_msg = "
debug(G)
",
+ .action_msg = "
DEBUG
",
};
#endif
};
#endif