diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6bcde929b63..8102cff2a34 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-09  Pedro Alves  <pedro@codesourcery.com>
+
+	* linux-nat.c (lin_lwp_attach_lwp): Return 1 (ignore) instead of
+	-1 (error), if the lwp exits right after attaching.
+
 2011-09-08  Doug Evans  <dje@google.com>
 
 	* py-cmd.c: Some minor formatting fixes.
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 30d6857056d..eadbbc0f2e4 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -1479,7 +1479,7 @@ lin_lwp_attach_lwp (ptid_t ptid)
       if (!WIFSTOPPED (status))
 	{
 	  restore_child_signals_mask (&prev_mask);
-	  return -1;
+	  return 1;
 	}
 
       lp = add_lwp (ptid);