diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2c2aa9ee7f..688aef7270 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2015-09-30  Pedro Alves  <palves@redhat.com>
+
+	* linux-nat.c (linux_nat_always_non_stop_p): Always return 1.
+	* x86-linux-nat.c (x86_linux_always_non_stop_p): Delete.
+	(x86_linux_create_target): Don't install
+	x86_linux_always_non_stop_p.
+
 2015-09-30  Don Breazeal  <donb@codesourcery.com>
 
 	* remote.c (remote_parse_stop_reply): Call strprefix instead
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 6423ecc998..eb9f5bb91f 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -4582,8 +4582,6 @@ linux_nat_supports_non_stop (struct target_ops *self)
 static int
 linux_nat_always_non_stop_p (struct target_ops *self)
 {
-  if (linux_ops->to_always_non_stop_p != NULL)
-    return linux_ops->to_always_non_stop_p (linux_ops);
   return 1;
 }
 
diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c
index fa5ef30048..d8a188fb22 100644
--- a/gdb/x86-linux-nat.c
+++ b/gdb/x86-linux-nat.c
@@ -351,15 +351,6 @@ x86_linux_get_thread_area (pid_t pid, void *addr, unsigned int *base_addr)
 }
 
 
-/* to_always_non_stop_p implementation.  */
-
-static int
-x86_linux_always_non_stop_p (struct target_ops *self)
-{
-  /* Enabling this breaks the btrace target.  */
-  return 0;
-}
-
 /* Create an x86 GNU/Linux target.  */
 
 struct target_ops *
@@ -392,8 +383,6 @@ x86_linux_create_target (void)
   t->to_read_btrace = x86_linux_read_btrace;
   t->to_btrace_conf = x86_linux_btrace_conf;
 
-  t->to_always_non_stop_p = x86_linux_always_non_stop_p;
-
   return t;
 }