diff options
| author | Patrick Rohr <prohr@google.com> | 2023-05-10 10:40:16 -0700 |
|---|---|---|
| committer | Patrick Rohr <prohr@google.com> | 2023-05-12 15:50:39 -0700 |
| commit | a59dc28b445cefab030efa80ca1bc76394e9aa24 (patch) | |
| tree | d59cd7ca143d92b50d22e3841ac4051f610ccb01 /base | |
| parent | 832220f68ce42e09ded152d8c682c6986bd37bea (diff) | |
| download | cronet-a59dc28b445cefab030efa80ca1bc76394e9aa24.tar.gz | |
Revert "cronet: put SYS_pkey symbols behind buildflag check"
This reverts commit 3acbe46767acd73bc93f0d24c76ca163cfbc413f.
This change was not actually needed.
Test: TH
Change-Id: Ic26465412937e13aa5e30029c45ff91dd1d3bfee
Diffstat (limited to 'base')
| -rw-r--r-- | base/allocator/partition_allocator/pkey.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/base/allocator/partition_allocator/pkey.cc b/base/allocator/partition_allocator/pkey.cc index 1613b0f68..dc4d0a67f 100644 --- a/base/allocator/partition_allocator/pkey.cc +++ b/base/allocator/partition_allocator/pkey.cc @@ -32,11 +32,7 @@ PkeySettings PkeySettings::settings PA_PKEY_ALIGN; PA_COMPONENT_EXPORT(PARTITION_ALLOC) int PkeyMprotect(void* addr, size_t len, int prot, int pkey) { -#if BUILDFLAG(ENABLE_PKEYS) return syscall(SYS_pkey_mprotect, addr, len, prot, pkey); -#else - return 0; -#endif } int PkeyMprotectIfEnabled(void* addr, size_t len, int prot, int pkey) { @@ -80,18 +76,12 @@ void TagGlobalsWithPkey(int pkey) { PA_COMPONENT_EXPORT(PARTITION_ALLOC) int PkeyAlloc(int access_rights) { -#if BUILDFLAG(ENABLE_PKEYS) return syscall(SYS_pkey_alloc, 0, access_rights); -#else - return 0; -#endif } PA_COMPONENT_EXPORT(PARTITION_ALLOC) void PkeyFree(int pkey) { -#if BUILDFLAG(ENABLE_PKEYS) PA_PCHECK(syscall(SYS_pkey_free, pkey) == 0); -#endif } uint32_t Rdpkru() { |