diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 183f8a9b57f..86e1b64c958 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-19  Yao Qi  <yao.qi@linaro.org>
+
+	* linux-aarch64-low.c (emit_data_processing_reg): Change opcode
+	type to uint32_t.
+
 2015-11-19  Yao Qi  <yao.qi@linaro.org>
 
 	* linux-aarch64-low.c (enum aarch64_operand_type): New.
diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
index 7cd9b77e1a3..cb786664627 100644
--- a/gdb/gdbserver/linux-aarch64-low.c
+++ b/gdb/gdbserver/linux-aarch64-low.c
@@ -1029,7 +1029,7 @@ emit_stlr (uint32_t *buf, struct aarch64_register rt,
 /* Helper function for data processing instructions with register sources.  */
 
 static int
-emit_data_processing_reg (uint32_t *buf, enum aarch64_opcodes opcode,
+emit_data_processing_reg (uint32_t *buf, uint32_t opcode,
 			  struct aarch64_register rd,
 			  struct aarch64_register rn,
 			  struct aarch64_register rm)