diff options
| author | Colin Cross <ccross@android.com> | 2023-01-04 21:14:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-04 21:14:20 +0000 |
| commit | 415e67588eb8a8d3e9eed6737dbb962d7d1e3f69 (patch) | |
| tree | d822e37661fac3bd1d0381d2166737e621e3bdff | |
| parent | 06a375cb0222ee6d872976b8e7590c29bb88069b (diff) | |
| parent | d3bce99497250cbc3ca5107a3eb5aa6a96b2357d (diff) | |
| download | minijail-415e67588eb8a8d3e9eed6737dbb962d7d1e3f69.tar.gz | |
minijail: add local definitions of MADV_FREE and __NR_membarrier am: 45b8aa4693 am: 9fd8cacad0 am: d3bce99497
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2366449
Change-Id: Idc77d1f7683dcdeb804429a4f3e10963dcf4ebdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | gen_constants-inl.h | 4 | ||||
| -rw-r--r-- | gen_syscalls-inl.h | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/gen_constants-inl.h b/gen_constants-inl.h index f5fdd29..d09349c 100644 --- a/gen_constants-inl.h +++ b/gen_constants-inl.h @@ -73,3 +73,7 @@ struct fscrypt_policy_v1 { #if !defined(FS_IOC_GET_ENCRYPTION_POLICY_EX) #define FS_IOC_GET_ENCRYPTION_POLICY_EX _IOWR('f', 22, __u8[9]) #endif + +#if !defined(MADV_FREE) +#define MADV_FREE 8 +#endif diff --git a/gen_syscalls-inl.h b/gen_syscalls-inl.h index 7a2f230..aee71e2 100644 --- a/gen_syscalls-inl.h +++ b/gen_syscalls-inl.h @@ -92,3 +92,13 @@ #endif #endif /* __NR_rseq */ + +#ifndef __NR_membarrier +#ifdef __x86_64__ +#define __NR_membarrier 324 +#elif __i386__ +#define __NR_membarrier 375 +#elif __arm64__ +#define __NR_membarrier 283 +#endif +#endif /* __NR_membarrier */ |