diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-17 18:54:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-17 18:54:33 +0000 |
| commit | dfabba9c3737ce7a2574dcf58940f038e536e233 (patch) | |
| tree | bdf20ffc848fe13fa6d0d25d0307494c1bb241b2 /kernel | |
| parent | 34f6d2c9d12a97271d55c7b204443b2da9e6c29e (diff) | |
| parent | a1bd41f7801f12ef0cb0c54e6d8450d639bb7724 (diff) | |
Merge remote-tracking branch 'lsk/v4.4/topic/ro-vdso' into linux-linaro-lsk-v4.4
Diffstat (limited to 'kernel')
| -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; |