summaryrefslogtreecommitdiffstats
path: root/qemu/linux-user/sparc64
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/sparc64
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/sparc64')
-rw-r--r--qemu/linux-user/sparc64/syscall_nr.h14
-rw-r--r--qemu/linux-user/sparc64/target_syscall.h (renamed from qemu/linux-user/sparc64/syscall.h)5
2 files changed, 19 insertions, 0 deletions
diff --git a/qemu/linux-user/sparc64/syscall_nr.h b/qemu/linux-user/sparc64/syscall_nr.h
index 34a984cc8..2b49ead26 100644
--- a/qemu/linux-user/sparc64/syscall_nr.h
+++ b/qemu/linux-user/sparc64/syscall_nr.h
@@ -341,3 +341,17 @@
#define TARGET_NR_kern_features 340
#define TARGET_NR_kcmp 341
#define TARGET_NR_finit_module 342
+#define TARGET_NR_sched_setattr 343
+#define TARGET_NR_sched_getattr 344
+#define TARGET_NR_renameat2 345
+#define TARGET_NR_seccomp 346
+#define TARGET_NR_getrandom 347
+#define TARGET_NR_memfd_create 348
+#define TARGET_NR_bpf 349
+#define TARGET_NR_execveat 350
+#define TARGET_NR_membarrier 351
+#define TARGET_NR_userfaultfd 352
+#define TARGET_NR_bind 353
+#define TARGET_NR_listen 354
+#define TARGET_NR_setsockopt 355
+#define TARGET_NR_mlock2 356
diff --git a/qemu/linux-user/sparc64/syscall.h b/qemu/linux-user/sparc64/target_syscall.h
index 8398d3f46..eb827fcac 100644
--- a/qemu/linux-user/sparc64/syscall.h
+++ b/qemu/linux-user/sparc64/target_syscall.h
@@ -1,3 +1,6 @@
+#ifndef TARGET_SYSCALL_H
+#define TARGET_SYSCALL_H
+
struct target_pt_regs {
abi_ulong u_regs[16];
abi_ulong tstate;
@@ -19,3 +22,5 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 4096
#define TARGET_MLOCKALL_MCL_CURRENT 0x2000
#define TARGET_MLOCKALL_MCL_FUTURE 0x4000
+
+#endif /* TARGET_SYSCALL_H */