summaryrefslogtreecommitdiffstats
path: root/qemu/linux-user/mips64
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-05-18 13:18:31 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-05-18 13:42:15 +0300
commit437fd90c0250dee670290f9b714253671a990160 (patch)
treeb871786c360704244a07411c69fb58da9ead4a06 /qemu/linux-user/mips64
parent5bbd6fe9b8bab2a93e548c5a53b032d1939eec05 (diff)
These changes are the raw update to qemu-2.6.
Collission happened in the following patches: migration: do cleanup operation after completion(738df5b9) Bug fix.(1750c932f86) kvmclock: add a new function to update env->tsc.(b52baab2) The code provided by the patches was already in the upstreamed version. Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'qemu/linux-user/mips64')
-rw-r--r--qemu/linux-user/mips64/syscall_nr.h23
-rw-r--r--qemu/linux-user/mips64/target_syscall.h (renamed from qemu/linux-user/mips64/syscall.h)4
2 files changed, 27 insertions, 0 deletions
diff --git a/qemu/linux-user/mips64/syscall_nr.h b/qemu/linux-user/mips64/syscall_nr.h
index 004232a8a..746cc267e 100644
--- a/qemu/linux-user/mips64/syscall_nr.h
+++ b/qemu/linux-user/mips64/syscall_nr.h
@@ -316,6 +316,18 @@
#define TARGET_NR_process_vm_writev (TARGET_NR_Linux + 310)
#define TARGET_NR_kcmp (TARGET_NR_Linux + 311)
#define TARGET_NR_finit_module (TARGET_NR_Linux + 312)
+#define TARGET_NR_sched_setattr (TARGET_NR_Linux + 313)
+#define TARGET_NR_sched_getattr (TARGET_NR_Linux + 314)
+#define TARGET_NR_renameat2 (TARGET_NR_Linux + 315)
+#define TARGET_NR_seccomp (TARGET_NR_Linux + 316)
+#define TARGET_NR_getrandom (TARGET_NR_Linux + 317)
+#define TARGET_NR_memfd_create (TARGET_NR_Linux + 318)
+#define TARGET_NR_bpf (TARGET_NR_Linux + 319)
+#define TARGET_NR_execveat (TARGET_NR_Linux + 320)
+#define TARGET_NR_userfaultfd (TARGET_NR_Linux + 321)
+#define TARGET_NR_membarrier (TARGET_NR_Linux + 322)
+#define TARGET_NR_mlock2 (TARGET_NR_Linux + 323)
+
#else
/*
* Linux 64-bit syscalls are in the range from 5000 to 5999.
@@ -630,4 +642,15 @@
#define TARGET_NR_kcmp (TARGET_NR_Linux + 306)
#define TARGET_NR_finit_module (TARGET_NR_Linux + 307)
#define TARGET_NR_getdents64 (TARGET_NR_Linux + 308)
+#define TARGET_NR_sched_setattr (TARGET_NR_Linux + 309)
+#define TARGET_NR_sched_getattr (TARGET_NR_Linux + 310)
+#define TARGET_NR_renameat2 (TARGET_NR_Linux + 311)
+#define TARGET_NR_seccomp (TARGET_NR_Linux + 312)
+#define TARGET_NR_getrandom (TARGET_NR_Linux + 313)
+#define TARGET_NR_memfd_create (TARGET_NR_Linux + 314)
+#define TARGET_NR_bpf (TARGET_NR_Linux + 315)
+#define TARGET_NR_execveat (TARGET_NR_Linux + 316)
+#define TARGET_NR_userfaultfd (TARGET_NR_Linux + 317)
+#define TARGET_NR_membarrier (TARGET_NR_Linux + 318)
+#define TARGET_NR_mlock2 (TARGET_NR_Linux + 319)
#endif
diff --git a/qemu/linux-user/mips64/syscall.h b/qemu/linux-user/mips64/target_syscall.h
index 6733107dd..0e0c2d232 100644
--- a/qemu/linux-user/mips64/syscall.h
+++ b/qemu/linux-user/mips64/target_syscall.h
@@ -1,3 +1,5 @@
+#ifndef TARGET_SYSCALL_H
+#define TARGET_SYSCALL_H
/* this struct defines the way the registers are stored on the
stack during a system call. */
@@ -228,3 +230,5 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
+
+#endif /* TARGET_SYSCALL_H */