diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-04-05 06:56:47 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-04-05 06:56:47 -0400 |
| commit | 6ea7e3873e52902af9ee8c0837450fdb69d54140 (patch) | |
| tree | b291dad174446387a166763cfbf3dd351148ecbe /kernel/debug | |
| parent | 5ddfe0858ea7848c5d4efe3f4319e7543522e0ee (diff) | |
| parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) | |
| download | cachepc-linux-6ea7e3873e52902af9ee8c0837450fdb69d54140.tar.gz cachepc-linux-6ea7e3873e52902af9ee8c0837450fdb69d54140.zip | |
Merge branch 'fixes-base' into fixes
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; |