aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Delva <adelva@google.com>2023-03-04 09:08:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-04 09:08:40 +0000
commit8720ac56d4fec0b99fecefec6b43b0cefae19725 (patch)
treebc1ce8880b80c1291f6b864f47711d6bfbe242c7
parent8d3081f0c92891a33b31cf81fa9bd6edb852095d (diff)
parent4943409893d1eb2306d6160463a9a4b4ccbffea9 (diff)
downloadminijail-8720ac56d4fec0b99fecefec6b43b0cefae19725.tar.gz
CHERRY-PICK: Fix "Extend host glibc workaround to clone3" am: 18076dbcb3 am: 822e93c765 am: 4bf50e90d1 am: 3a17443e99 am: 4943409893
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/2470182 Change-Id: I9a073476066fdac5abd118e8077ebda3248bd59d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--gen_syscalls-inl.h3
1 files changed, 1 insertions, 2 deletions
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