Merge branch 'working-s390' into master

Signed-off-by: Paul Moore <pmoore@redhat.com>

1 files changed, 31 insertions, 0 deletions

diff --git a/include/seccomp.h.in b/include/seccomp.h.in
index 08eae61..adab19a 100644
--- a/include/seccomp.h.in
+++ b/include/seccomp.h.in
@@ -173,6 +173,12 @@ struct scmp_arg_cmp {
 #define SCMP_ARCH_PPC64LE	AUDIT_ARCH_PPC64LE
 
 /**
+ * The S390 architecture tokens
+ */
+#define SCMP_ARCH_S390		AUDIT_ARCH_S390
+#define SCMP_ARCH_S390X		AUDIT_ARCH_S390X
+
+/**
  * Convert a syscall name into the associated syscall number
  * @param x the syscall name
  */
@@ -1526,6 +1532,31 @@ int seccomp_export_bpf(const scmp_filter_ctx ctx, int fd);
 #define __NR_switch_endian	__PNR_switch_endian
 #endif /* __NR_switch_endian */
 
+#define __PNR_get_mempolicy	-10192
+#ifndef __NR_get_mempolicy
+#define __NR_get_mempolicy	__PNR_get_mempolicy
+#endif /* __NR_get_mempolicy */
+
+#define __PNR_move_pages	-10193
+#ifndef __NR_move_pages
+#define __NR_move_pages		__PNR_move_pages
+#endif /* __NR_move_pages */
+
+#define __PNR_mbind		-10194
+#ifndef __NR_mbind
+#define __NR_mbind		__PNR_mbind
+#endif /* __NR_mbind */
+
+#define __PNR_set_mempolicy	-10195
+#ifndef __NR_set_mempolicy
+#define __NR_set_mempolicy	__PNR_set_mempolicy
+#endif /* __NR_set_mempolicy */
+
+#define __PNR_s390_runtime_instr	-10196
+#ifndef __NR_s390_runtime_instr
+#define __NR_s390_runtime_instr		__PNR_s390_runtime_instr
+#endif /* __NR_s390_runtime_instr */
+
 #ifdef __cplusplus
 }
 #endif