diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 12:29:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 12:29:44 -0400 |
commit | a20ae85abaefb02cc0edf19c34f78d19437c1cf1 (patch) | |
tree | 13174b718a7f7b955b7d79f5427506ad62a3054e /kernel/debug/kdb/kdb_bp.c | |
parent | f0a5ec0e8da4521036799ced340172b2732845a8 (diff) | |
parent | 1ba0c1720eb0de2d0f3abf84c0b128d10af520d1 (diff) |
Merge tag 'for_linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb
Pull KGDB/KDB updates from Jason Wessel:
"Fixes:
- Fix KDB keyboard repeat scan codes and leaked keyboard events
- Fix kernel crash with kdb_printf() for users who compile new
kdb_printf()'s in early code
- Return all segment registers to gdb on x86_64
Features:
- KDB/KGDB hook the reboot notifier and end user can control if it
stops, detaches or does nothing (updated docs as well)
- Notify users who use CONFIG_DEBUG_RODATA to use hw breakpoints"
* tag 'for_linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
kdb: Add message about CONFIG_DEBUG_RODATA on failure to install breakpoint
kdb: Avoid using dbg_io_ops until it is initialized
kgdb,debug_core: add the ability to control the reboot notifier
KDB: Fix usability issues relating to the 'enter' key.
kgdb,debug-core,gdbstub: Hook the reboot notifier for debugger detach
kgdb: Respect that flush op is optional
kgdb: x86: Return all segment registers also in 64-bit mode
Diffstat (limited to 'kernel/debug/kdb/kdb_bp.c')
-rw-r--r-- | kernel/debug/kdb/kdb_bp.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/debug/kdb/kdb_bp.c b/kernel/debug/kdb/kdb_bp.c index 20059ef4459a..8418c2f8ec5d 100644 --- a/kernel/debug/kdb/kdb_bp.c +++ b/kernel/debug/kdb/kdb_bp.c | |||
@@ -153,6 +153,13 @@ static int _kdb_bp_install(struct pt_regs *regs, kdb_bp_t *bp) | |||
153 | } else { | 153 | } else { |
154 | kdb_printf("%s: failed to set breakpoint at 0x%lx\n", | 154 | kdb_printf("%s: failed to set breakpoint at 0x%lx\n", |
155 | __func__, bp->bp_addr); | 155 | __func__, bp->bp_addr); |
156 | #ifdef CONFIG_DEBUG_RODATA | ||
157 | if (!bp->bp_type) { | ||
158 | kdb_printf("Software breakpoints are unavailable.\n" | ||
159 | " Change the kernel CONFIG_DEBUG_RODATA=n\n" | ||
160 | " OR use hw breaks: help bph\n"); | ||
161 | } | ||
162 | #endif | ||
156 | return 1; | 163 | return 1; |
157 | } | 164 | } |
158 | return 0; | 165 | return 0; |