From a0c60396b64e74f11a293a887cd9f72732eef945 Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Wed, 21 Sep 2011 13:07:47 -0700
Subject: [PATCH] --- yaml --- r: 294668 b: refs/heads/master c:
 1ba0c1720eb0de2d0f3abf84c0b128d10af520d1 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/kernel/debug/kdb/kdb_bp.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a2d88b70180f..d229678e5e4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8adde8ddec9ff62a21564fa8020b5463e70d4de
+refs/heads/master: 1ba0c1720eb0de2d0f3abf84c0b128d10af520d1
diff --git a/trunk/kernel/debug/kdb/kdb_bp.c b/trunk/kernel/debug/kdb/kdb_bp.c
index 20059ef4459a..8418c2f8ec5d 100644
--- a/trunk/kernel/debug/kdb/kdb_bp.c
+++ b/trunk/kernel/debug/kdb/kdb_bp.c
@@ -153,6 +153,13 @@ 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"
+				   "  OR use hw breaks: help bph\n");
+		}
+#endif
 		return 1;
 	}
 	return 0;