diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f29d399a7d..d0536af53d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-07-18  Tom Tromey  <tromey@redhat.com>
+
+	* spu-multiarch.c (spu_region_ok_for_hw_watchpoint): Pass "self"
+	to find_target_beneath.
+	* ravenscar-thread.c (ravenscar_prepare_to_store): Pass "ops" to
+	find_target_beneath.
+	(ravenscar_mourn_inferior): Pass "self" to find_target_beneath.
+
 2014-07-18  Tom Tromey  <tromey@redhat.com>
 
 	PR gdb/17130:
diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c
index 060d5ce4cc..c4a01a55ab 100644
--- a/gdb/ravenscar-thread.c
+++ b/gdb/ravenscar-thread.c
@@ -308,7 +308,7 @@ static void
 ravenscar_prepare_to_store (struct target_ops *self,
 			    struct regcache *regcache)
 {
-  struct target_ops *beneath = find_target_beneath (&ravenscar_ops);
+  struct target_ops *beneath = find_target_beneath (self);
 
   if (!ravenscar_runtime_initialized ()
       || ptid_equal (inferior_ptid, base_magic_null_ptid)
@@ -327,7 +327,7 @@ ravenscar_prepare_to_store (struct target_ops *self,
 static void
 ravenscar_mourn_inferior (struct target_ops *ops)
 {
-  struct target_ops *beneath = find_target_beneath (&ravenscar_ops);
+  struct target_ops *beneath = find_target_beneath (ops);
 
   base_ptid = null_ptid;
   beneath->to_mourn_inferior (beneath);
diff --git a/gdb/spu-multiarch.c b/gdb/spu-multiarch.c
index a22cc1b44a..e3285d0235 100644
--- a/gdb/spu-multiarch.c
+++ b/gdb/spu-multiarch.c
@@ -121,7 +121,7 @@ static int
 spu_region_ok_for_hw_watchpoint (struct target_ops *self,
 				 CORE_ADDR addr, int len)
 {
-  struct target_ops *ops_beneath = find_target_beneath (&spu_ops);
+  struct target_ops *ops_beneath = find_target_beneath (self);
 
   /* We cannot watch SPU local store.  */
   if (SPUADDR_SPU (addr) != -1)