diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1a44029027..5085c832fb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-09  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* arm-linux-tdep.c (arm_canonicalize_syscall): Add
+	enum gdb_syscall casts.
+
 2015-10-09  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* aarch64-tdep.c (stack_item_t): Change type of data to gdb_byte*.
diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index b7c5b99f62..dc0a8a9dbc 100644
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -1265,11 +1265,11 @@ arm_canonicalize_syscall (int syscall)
   enum { sys_process_vm_writev = 377 };
 
   if (syscall <= gdb_sys_sched_getaffinity)
-    return syscall;
+    return (enum gdb_syscall) syscall;
   else if (syscall >= 243 && syscall <= 247)
-    return syscall + 2;
+    return (enum gdb_syscall) (syscall + 2);
   else if (syscall >= 248 && syscall <= 253)
-    return syscall + 4;
+    return (enum gdb_syscall) (syscall + 4);
 
   return gdb_sys_no_syscall;
 }