diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-06-18 17:25:08 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-06-18 17:25:08 -0700 |
| commit | 6ea24cf79e055f0a62a64baa8587e2254a493c7b (patch) | |
| tree | c5cd6113ed93854b1bc30cd471c366f080c4be2f /kernel/debug | |
| parent | 540c26087bfbad6ea72758b76b16ae6282a73fea (diff) | |
| parent | 488326947cd1f038da8d2c9068a0d07b913b7983 (diff) | |
| download | cachepc-linux-6ea24cf79e055f0a62a64baa8587e2254a493c7b.tar.gz cachepc-linux-6ea24cf79e055f0a62a64baa8587e2254a493c7b.zip | |
Merge branch 'cec-defines' into for-linus
Let's bring in HDMI CEC defines to ease merging CEC support in the next
merge window.
Diffstat (limited to 'kernel/debug')
| -rw-r--r-- | kernel/debug/kdb/kdb_bp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/debug/kdb/kdb_bp.c b/kernel/debug/kdb/kdb_bp.c index e1dbf4a2c69e..90ff129c88a2 100644 --- a/kernel/debug/kdb/kdb_bp.c +++ b/kernel/debug/kdb/kdb_bp.c @@ -153,13 +153,11 @@ static int _kdb_bp_install(struct pt_regs *regs, kdb_bp_t *bp) } else { kdb_printf("%s: failed to set breakpoint at 0x%lx\n", __func__, bp->bp_addr); -#ifdef CONFIG_DEBUG_RODATA if (!bp->bp_type) { kdb_printf("Software breakpoints are unavailable.\n" - " Change the kernel CONFIG_DEBUG_RODATA=n\n" + " Boot the kernel with rodata=off\n" " OR use hw breaks: help bph\n"); } -#endif return 1; } return 0; |