aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Samokhvalov <pg83@yandex.ru>2022-07-04 20:26:39 +0300
committerAnton Samokhvalov <pg83@yandex.ru>2022-07-04 20:26:39 +0300
commitd24a1abec70c5dbe8305f6b8550b8ab8857bda50 (patch)
tree0008d3a4afa7ff8f5c264cb28ed4e6d90011eca1
parentbc042fb29bad7f78570163c4a934aad486db3232 (diff)
downloadydb-d24a1abec70c5dbe8305f6b8550b8ab8857bda50.tar.gz
CPPCOM-76
ref:ce3ec1004c8bb8f8053c17fa9cedf373772f912d
-rw-r--r--contrib/libs/tcmalloc/tcmalloc/internal/linux_syscall_support.h1
-rw-r--r--contrib/libs/tcmalloc/tcmalloc/internal/percpu.cc3
2 files changed, 1 insertions, 3 deletions
diff --git a/contrib/libs/tcmalloc/tcmalloc/internal/linux_syscall_support.h b/contrib/libs/tcmalloc/tcmalloc/internal/linux_syscall_support.h
index 0abf54ff1c3..367c8a9e4dd 100644
--- a/contrib/libs/tcmalloc/tcmalloc/internal/linux_syscall_support.h
+++ b/contrib/libs/tcmalloc/tcmalloc/internal/linux_syscall_support.h
@@ -55,6 +55,7 @@ static_assert(sizeof(kernel_rseq_cs) == (4 * sizeof(unsigned long long)),
#if !defined(__NR_rseq)
#if defined(__x86_64__)
#define __NR_rseq 334
+#define __NR_membarrier 324
#elif defined(__aarch64__)
#define __NR_rseq 293
#elif defined(__PPC__)
diff --git a/contrib/libs/tcmalloc/tcmalloc/internal/percpu.cc b/contrib/libs/tcmalloc/tcmalloc/internal/percpu.cc
index 7b777d48280..f8706f0f212 100644
--- a/contrib/libs/tcmalloc/tcmalloc/internal/percpu.cc
+++ b/contrib/libs/tcmalloc/tcmalloc/internal/percpu.cc
@@ -19,9 +19,6 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <syscall.h>
-#if defined(__linux__)
-#include <asm-generic/unistd.h>
-#endif
#include <unistd.h>
#include <atomic>