linux-user: correct timerfd_create syscall numbers

x86, m68k, ppc, sh4 and sparc failed to enable timerfd, because they
didn't have timerfd_create system call defined. Instead QEMU
defined timerfd syscall. Checking with kernel sources, it appears
kernel developers reused timerfd syscall number with timerfd_create,
presumably since no userspace called the old syscall number.

Reported-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>

diff --git a/linux-user/i386/syscall_nr.h b/linux-user/i386/syscall_nr.h
index fa3f0b4a08ac72271d36014c862432e47db7caea..bc1bc233ed42d6287191727d20f911cda0db4588 100644 (file)
--- a/linux-user/i386/syscall_nr.h
+++ b/linux-user/i386/syscall_nr.h
@@ -324,7 +324,7 @@
 #define TARGET_NR_epoll_pwait  319
 #define TARGET_NR_utimensat            320
 #define TARGET_NR_signalfd             321
-#define TARGET_NR_timerfd              322
+#define TARGET_NR_timerfd_create       322
 #define TARGET_NR_eventfd              323
 #define TARGET_NR_fallocate            324
 #define TARGET_NR_timerfd_settime      325

diff --git a/linux-user/m68k/syscall_nr.h b/linux-user/m68k/syscall_nr.h
index a2daba034a4b5abaa86ba25c742d244e1c8c402a..4b50fb29b6944c8d8c1c53b7751dff5db8694c06 100644 (file)
--- a/linux-user/m68k/syscall_nr.h
+++ b/linux-user/m68k/syscall_nr.h
@@ -317,7 +317,7 @@
 #define TARGET_NR_epoll_pwait  315
 #define TARGET_NR_utimensat            316
 #define TARGET_NR_signalfd             317
-#define TARGET_NR_timerfd              318
+#define TARGET_NR_timerfd_create       318
 #define TARGET_NR_eventfd              319
 #define TARGET_NR_fallocate            320
 #define TARGET_NR_timerfd_settime      321

diff --git a/linux-user/ppc/syscall_nr.h b/linux-user/ppc/syscall_nr.h
index 0a5fd543e7e1db3f1ef791715db43dd74384d842..46ed8a68ce1dde251e67b87e848ab3249ee9e247 100644 (file)
--- a/linux-user/ppc/syscall_nr.h
+++ b/linux-user/ppc/syscall_nr.h
@@ -319,7 +319,7 @@
 #define TARGET_NR_epoll_pwait  303
 #define TARGET_NR_utimensat            304
 #define TARGET_NR_signalfd             305
-#define TARGET_NR_timerfd              306
+#define TARGET_NR_timerfd_create       306
 #define TARGET_NR_eventfd              307
 #define TARGET_NR_sync_file_range2     308
 #define TARGET_NR_fallocate            309

diff --git a/linux-user/sh4/syscall_nr.h b/linux-user/sh4/syscall_nr.h
index bdf8742c6956a5d240a911a7e8b1f87aa6d1ed87..50099846d222599101a2845ced84d3ba5d0ce4d4 100644 (file)
--- a/linux-user/sh4/syscall_nr.h
+++ b/linux-user/sh4/syscall_nr.h
@@ -323,7 +323,7 @@
 #define TARGET_NR_epoll_pwait  319
 #define TARGET_NR_utimensat            320
 #define TARGET_NR_signalfd             321
-#define TARGET_NR_timerfd              322
+#define TARGET_NR_timerfd_create       322
 #define TARGET_NR_eventfd              323
 #define TARGET_NR_fallocate            324
 #define TARGET_NR_timerfd_settime      325

diff --git a/linux-user/sparc/syscall_nr.h b/linux-user/sparc/syscall_nr.h
index 5b582a5a90163eee7766bd42daff7590b4e81b32..732b1052a48b672b08aff59d773fb8773cf1d773 100644 (file)
--- a/linux-user/sparc/syscall_nr.h
+++ b/linux-user/sparc/syscall_nr.h
@@ -278,7 +278,7 @@
 #define TARGET_NR_epoll_pwait  309
 #define TARGET_NR_utimensat            310
 #define TARGET_NR_signalfd             311
-#define TARGET_NR_timerfd              312
+#define TARGET_NR_timerfd_create       312
 #define TARGET_NR_eventfd              313
 #define TARGET_NR_fallocate            314
 #define TARGET_NR_timerfd_settime      315

diff --git a/linux-user/x86_64/syscall_nr.h b/linux-user/x86_64/syscall_nr.h
index f00fa2b7837cfca78c9bfed2700400c34dbb638e..16397b3e8f25f33c69cd0e6a7c9ae03ba2315dc5 100644 (file)
--- a/linux-user/x86_64/syscall_nr.h
+++ b/linux-user/x86_64/syscall_nr.h
@@ -281,7 +281,7 @@
 #define TARGET_NR_utimensat            280
 #define TARGET_NR_epoll_pwait  281
 #define TARGET_NR_signalfd             282
-#define TARGET_NR_timerfd              283
+#define TARGET_NR_timerfd_create       283
 #define TARGET_NR_eventfd              284
 #define TARGET_NR_fallocate            285
 #define TARGET_NR_timerfd_settime      286