diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d21436c8d65..880af5b8c93 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-05  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* common/ptid.c (ptid_lwp_p, ptid_tid_p): Remove comparison with
+	minus_one_ptid and null_ptid.
+
 2017-04-05  Pedro Alves  <palves@redhat.com>
 
 	* warning.m4 (build_warnings): Remove -Wno-write-strings.
diff --git a/gdb/common/ptid.c b/gdb/common/ptid.c
index 05c0db17ddf..b56971b9af2 100644
--- a/gdb/common/ptid.c
+++ b/gdb/common/ptid.c
@@ -97,10 +97,6 @@ ptid_is_pid (ptid_t ptid)
 int
 ptid_lwp_p (ptid_t ptid)
 {
-  if (ptid_equal (minus_one_ptid, ptid)
-      || ptid_equal (null_ptid, ptid))
-    return 0;
-
   return (ptid_get_lwp (ptid) != 0);
 }
 
@@ -109,10 +105,6 @@ ptid_lwp_p (ptid_t ptid)
 int
 ptid_tid_p (ptid_t ptid)
 {
-  if (ptid_equal (minus_one_ptid, ptid)
-      || ptid_equal (null_ptid, ptid))
-    return 0;
-
   return (ptid_get_tid (ptid) != 0);
 }