X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fx86-linux-nat.c;h=f7e9037d6058351132267cbe8c55f785a1bdd940;hb=2608dbf8a3ee666ac0a7d5d7c45611d489edcda5;hp=67300d8053d3aeda5407b66a8aec2a45457ee616;hpb=5ee44bfa6bdb8eaf7f30eccb4fbdc989cb9bb7ca;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c
index 67300d8053..f7e9037d60 100644
--- a/gdb/x86-linux-nat.c
+++ b/gdb/x86-linux-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for GNU/Linux x86 (i386 and x86-64).
 
-   Copyright (C) 1999-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -24,6 +24,7 @@
 #include <sys/ptrace.h>
 #include <sys/user.h>
 #include <sys/procfs.h>
+#include <sys/uio.h>
 
 #include "x86-nat.h"
 #include "linux-nat.h"
@@ -213,7 +214,7 @@ x86_linux_prepare_to_resume (struct lwp_info *lwp)
       lwp->arch_private->debug_registers_changed = 0;
     }
 
-  if (clear_status || lwp->stopped_by_watchpoint)
+  if (clear_status || lwp->stop_reason == LWP_STOPPED_BY_WATCHPOINT)
     x86_linux_dr_set (lwp->ptid, DR_STATUS, 0);
 }