[compiler-rt] 016e59b - Revert "[Scudo] enabling anonymous named pages on Linux 5.17 and onwards."

[Alex Brachet via llvm-commits]

Author: Alex Brachet
Date: 2022-04-05T16:38:49Z
New Revision: 016e59bf2cbf3e550a1fca5c4de204d84565ab03

URL: https://github.com/llvm/llvm-project/commit/016e59bf2cbf3e550a1fca5c4de204d84565ab03
DIFF: https://github.com/llvm/llvm-project/commit/016e59bf2cbf3e550a1fca5c4de204d84565ab03.diff

LOG: Revert "[Scudo] enabling anonymous named pages on Linux 5.17 and onwards."

This reverts commit 619499252307c520fd840a5f3c79ffa00eaf2264.

Added: 
    

Modified: 
    compiler-rt/lib/scudo/standalone/linux.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/scudo/standalone/linux.cpp b/compiler-rt/lib/scudo/standalone/linux.cpp
index 88875c54a3495..c77c1bb600d93 100644
--- a/compiler-rt/lib/scudo/standalone/linux.cpp
+++ b/compiler-rt/lib/scudo/standalone/linux.cpp
@@ -28,11 +28,11 @@
 #include <time.h>
 #include <unistd.h>
 
+#if SCUDO_ANDROID
 #include <sys/prctl.h>
-// Definitions of prctl arguments to set a vma name in kernels (Linux from 5.17).
-#ifndef PR_SET_VMA
-#define PR_SET_VMA 0x53564d41
-#define PR_SET_VMA_ANON_NAME 0
+// Definitions of prctl arguments to set a vma name in Android kernels.
+#define ANDROID_PR_SET_VMA 0x53564d41
+#define ANDROID_PR_SET_VMA_ANON_NAME 0
 #endif
 
 namespace scudo {
@@ -66,8 +66,10 @@ void *map(void *Addr, uptr Size, UNUSED const char *Name, uptr Flags,
       dieOnMapUnmapError(errno == ENOMEM ? Size : 0);
     return nullptr;
   }
+#if SCUDO_ANDROID
   if (Name)
-    prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, P, Size, Name);
+    prctl(ANDROID_PR_SET_VMA, ANDROID_PR_SET_VMA_ANON_NAME, P, Size, Name);
+#endif
   return P;
 }