Merge "bionic: CFIShadow: Remove use of PAGE_SIZE macro." into main am: 97a0587f20
am: fcf5ee6e76
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2717359 Change-Id: Iadb56131b16ce9423f3227593c7d2b3985eac0c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
d5c5aaa9ad
1 changed files with 1 additions and 2 deletions
|
@ -68,8 +68,7 @@ class CFIShadow {
|
|||
#endif
|
||||
|
||||
// Shadow is 2 -> 2**kShadowGranularity.
|
||||
static constexpr uintptr_t kShadowSize =
|
||||
align_up((kMaxTargetAddr >> (kShadowGranularity - 1)), PAGE_SIZE);
|
||||
static constexpr uintptr_t kShadowSize = kMaxTargetAddr >> (kShadowGranularity - 1);
|
||||
|
||||
// Returns offset inside the shadow region for an address.
|
||||
static constexpr uintptr_t MemToShadowOffset(uintptr_t x) {
|
||||
|
|
Loading…
Reference in a new issue