summaryrefslogtreecommitdiffstats
path: root/kernel/include/uapi/asm-generic
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/include/uapi/asm-generic')
-rw-r--r--kernel/include/uapi/asm-generic/mman-common.h5
-rw-r--r--kernel/include/uapi/asm-generic/mman.h1
-rw-r--r--kernel/include/uapi/asm-generic/signal.h2
-rw-r--r--kernel/include/uapi/asm-generic/unistd.h10
4 files changed, 16 insertions, 2 deletions
diff --git a/kernel/include/uapi/asm-generic/mman-common.h b/kernel/include/uapi/asm-generic/mman-common.h
index ddc3b36f1..a74dd84bb 100644
--- a/kernel/include/uapi/asm-generic/mman-common.h
+++ b/kernel/include/uapi/asm-generic/mman-common.h
@@ -25,6 +25,11 @@
# define MAP_UNINITIALIZED 0x0 /* Don't support this flag */
#endif
+/*
+ * Flags for mlock
+ */
+#define MLOCK_ONFAULT 0x01 /* Lock pages in range after they are faulted in, do not prefault */
+
#define MS_ASYNC 1 /* sync memory asynchronously */
#define MS_INVALIDATE 2 /* invalidate the caches */
#define MS_SYNC 4 /* synchronous memory sync */
diff --git a/kernel/include/uapi/asm-generic/mman.h b/kernel/include/uapi/asm-generic/mman.h
index e9fe6fd2a..7162cd4cc 100644
--- a/kernel/include/uapi/asm-generic/mman.h
+++ b/kernel/include/uapi/asm-generic/mman.h
@@ -17,5 +17,6 @@
#define MCL_CURRENT 1 /* lock all current mappings */
#define MCL_FUTURE 2 /* lock all future mappings */
+#define MCL_ONFAULT 4 /* lock all pages that are faulted in */
#endif /* __ASM_GENERIC_MMAN_H */
diff --git a/kernel/include/uapi/asm-generic/signal.h b/kernel/include/uapi/asm-generic/signal.h
index 9df61f1ed..3094618d3 100644
--- a/kernel/include/uapi/asm-generic/signal.h
+++ b/kernel/include/uapi/asm-generic/signal.h
@@ -80,8 +80,10 @@
* SA_RESTORER 0x04000000
*/
+#if !defined MINSIGSTKSZ || !defined SIGSTKSZ
#define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192
+#endif
#ifndef __ASSEMBLY__
typedef struct {
diff --git a/kernel/include/uapi/asm-generic/unistd.h b/kernel/include/uapi/asm-generic/unistd.h
index e016bd9b1..1324b0292 100644
--- a/kernel/include/uapi/asm-generic/unistd.h
+++ b/kernel/include/uapi/asm-generic/unistd.h
@@ -709,15 +709,21 @@ __SYSCALL(__NR_memfd_create, sys_memfd_create)
__SYSCALL(__NR_bpf, sys_bpf)
#define __NR_execveat 281
__SC_COMP(__NR_execveat, sys_execveat, compat_sys_execveat)
+#define __NR_userfaultfd 282
+__SYSCALL(__NR_userfaultfd, sys_userfaultfd)
+#define __NR_membarrier 283
+__SYSCALL(__NR_membarrier, sys_membarrier)
+#define __NR_mlock2 284
+__SYSCALL(__NR_mlock2, sys_mlock2)
#undef __NR_syscalls
-#define __NR_syscalls 282
+#define __NR_syscalls 285
/*
* All syscalls below here should go away really,
* these are provided for both review and as a porting
* help for the C library version.
-*
+ *
* Last chance: are any of these important enough to
* enable by default?
*/