aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/xmon
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2018-03-27 23:55:49 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2018-03-27 23:55:49 +1100
commitc0b346729b5dd3c7d0232f043f5b15947ffc7978 (patch)
treea790a37bfc5815b46c8f9a4faf9a2d38c74d2cdb /arch/powerpc/xmon
parentpowerpc/eeh: Add eeh_state_active() helper (diff)
parentpowerpc: Disable DAWR in the base POWER9 CPU features (diff)
downloadlinux-dev-c0b346729b5dd3c7d0232f043f5b15947ffc7978.tar.xz
linux-dev-c0b346729b5dd3c7d0232f043f5b15947ffc7978.zip
Merge branch 'topic/ppc-kvm' into next
Merge the DAWR series, which touches arch code and KVM code and may need to be merged into the kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/xmon')
-rw-r--r--arch/powerpc/xmon/xmon.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index a06cf6e38978..53918023622e 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1302,6 +1302,10 @@ bpt_cmds(void)
static const char badaddr[] = "Only kernel addresses are permitted for breakpoints\n";
int mode;
case 'd': /* bd - hardware data breakpoint */
+ if (!ppc_breakpoint_available()) {
+ printf("Hardware data breakpoint not supported on this cpu\n");
+ break;
+ }
mode = 7;
cmd = inchar();
if (cmd == 'r')