Index: source/Target/ThreadPlanStepOverBreakpoint.cpp
===================================================================
--- source/Target/ThreadPlanStepOverBreakpoint.cpp
+++ source/Target/ThreadPlanStepOverBreakpoint.cpp
@@ -76,6 +76,8 @@
         {
         case eStopReasonTrace:
         case eStopReasonNone:
+        // Some kernel reports the stop reason for a single step request as a hit of a hardware watchpoint
+        case eStopReasonWatchpoint:
             return true;
         case eStopReasonBreakpoint:
             // It's a little surprising that we stop here for a breakpoint hit.  However, when you single step ONTO a