From 7d6af691fec87a6d6b140fc509b65f8f2b5a8120 Mon Sep 17 00:00:00 2001 From: Android Tools Maintainers Date: Thu, 13 Dec 2018 09:11:09 +0000 Subject: [PATCH] Use a portable PAGE_SIZE PAGE_SIZE is not defined on some architectures such as arm64 and mips64el, so let's use a portable and standardized one. Gbp-Pq: Name PAGE_SIZE.patch --- runtime/base/safe_copy.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/base/safe_copy.cc b/runtime/base/safe_copy.cc index 06249ac..bb544c7 100644 --- a/runtime/base/safe_copy.cc +++ b/runtime/base/safe_copy.cc @@ -54,10 +54,10 @@ ssize_t SafeCopy(void *dst, const void *src, size_t len) { } src_iovs[iovecs_used].iov_base = const_cast(cur); - if (!IsAlignedParam(cur, PAGE_SIZE)) { - src_iovs[iovecs_used].iov_len = AlignUp(cur, PAGE_SIZE) - cur; + if (!IsAlignedParam(cur, getpagesize())) { + src_iovs[iovecs_used].iov_len = AlignUp(cur, getpagesize()) - cur; } else { - src_iovs[iovecs_used].iov_len = PAGE_SIZE; + src_iovs[iovecs_used].iov_len = getpagesize(); } src_iovs[iovecs_used].iov_len = std::min(src_iovs[iovecs_used].iov_len, len); -- 2.30.2