| commit | 3a17443e99205ef25f3fca213cc6a1b355d36cf1 | [log] [tgz] |
|---|---|---|
| author | Alistair Delva <[email protected]> | Sat Mar 04 07:48:01 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Sat Mar 04 07:48:01 2023 +0000 |
| tree | bc1ce8880b80c1291f6b864f47711d6bfbe242c7 | |
| parent | 8d3081f0c92891a33b31cf81fa9bd6edb852095d [diff] | |
| parent | 4bf50e90d1a3653ead824120cd5f49ec616e0b1f [diff] |
CHERRY-PICK: Fix "Extend host glibc workaround to clone3" am: 18076dbcb3 am: 822e93c765 am: 4bf50e90d1 Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2470182 Change-Id: I27f0373ca6208943ad6a3e5a8f6fdbd295cbcf81 Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/gen_syscalls-inl.h b/gen_syscalls-inl.h index aee71e2..f885081 100644 --- a/gen_syscalls-inl.h +++ b/gen_syscalls-inl.h
@@ -86,13 +86,12 @@ #elif __arm64__ #define __NR_rseq 293 #endif +#endif /* __NR_rseq */ #ifndef __NR_clone3 #define __NR_clone3 435 #endif -#endif /* __NR_rseq */ - #ifndef __NR_membarrier #ifdef __x86_64__ #define __NR_membarrier 324