diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cb690760e3..78c29232ce 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-22  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* remote-sim.c (_initialize_remote_sim): Pass NULL argument to
+	`register_inferior_data_with_cleanup', fixing regression on PowerPC64.
+
 2012-08-22  Khoo Yit Phang <khooyp@cs.umd.edu>
 
 	Enable readline in Python in a GDB-specific way and block the
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 87910d9cb5..d87f66842b 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -1322,5 +1322,5 @@ _initialize_remote_sim (void)
   set_cmd_completer (c, sim_command_completer);
 
   sim_inferior_data_key
-    = register_inferior_data_with_cleanup (sim_inferior_data_cleanup);
+    = register_inferior_data_with_cleanup (NULL, sim_inferior_data_cleanup);
 }