diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 4397ff9603..70d832fa71 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-29  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* proc-service.c (ps_pdread): Add/adjust casts.
+	(ps_pdwrite): Add/adjust casts.
+
 2015-10-29  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* server.c (handle_search_memory_1): Cast return value of
diff --git a/gdb/gdbserver/proc-service.c b/gdb/gdbserver/proc-service.c
index 128939dc2f..ae000862a4 100644
--- a/gdb/gdbserver/proc-service.c
+++ b/gdb/gdbserver/proc-service.c
@@ -80,7 +80,7 @@ ps_err_e
 ps_pdread (gdb_ps_prochandle_t ph, psaddr_t addr,
 	   gdb_ps_read_buf_t buf, gdb_ps_size_t size)
 {
-  read_inferior_memory ((unsigned long) addr, buf, size);
+  read_inferior_memory ((CORE_ADDR) addr, (gdb_byte *) buf, size);
   return PS_OK;
 }
 
@@ -90,7 +90,8 @@ ps_err_e
 ps_pdwrite (gdb_ps_prochandle_t ph, psaddr_t addr,
 	    gdb_ps_write_buf_t buf, gdb_ps_size_t size)
 {
-  if (write_inferior_memory ((unsigned long) addr, buf, size) != 0)
+  if (write_inferior_memory ((CORE_ADDR) addr, (const gdb_byte *) buf, size)
+      != 0)
     return PS_ERR;
   return PS_OK;
 }