diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-11-23 09:22:19 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-11-25 10:21:38 +0000 |
| commit | d493e9952a9f3d22a1c4b9a8d91f0f316a88159b (patch) | |
| tree | e009cfe077e4e9d3716f5b160a275f314ed481bf /src/qml | |
| parent | 73876d390a21be39734d9312a0ffd1d4bf7acf2f (diff) | |
Revert "masm: Treat Android as generic Posix regarding mmap and friends"
This reverts commit ffecc122d785de9c4c5defd8724526b8dd4982dc.
It turns out that madvise() only fails when given MADV_WILLNEED as
argument on the affected devices. MADV_WILLNEED is indeed optional.
Since commit 2034e10c9378364ecc7aa1af27505562d86688de we do not crash on
a failed MADV_WILLNEED anymore. Therefore, we can re-enable the linux
code path for android.
Task-number: QTBUG-107774
Task-number: QTBUG-106864
Task-number: QTBUG-106269
Change-Id: If67a38e4fc206bd5d5ed0ef8bf66ededd09d8f59
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit ac4fea75379467dde9065825d3f15da3b86e9ad8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/memory/qv4mm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp index aaf9dab134..60b909862b 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp @@ -177,7 +177,7 @@ struct MemorySegment { size_t pageSize = WTF::pageSize(); size = (size + pageSize - 1) & ~(pageSize - 1); -#if (!defined(Q_OS_LINUX) && !defined(Q_OS_WIN)) || defined(Q_OS_ANDROID) +#if !defined(Q_OS_LINUX) && !defined(Q_OS_WIN) // Linux and Windows zero out pages that have been decommitted and get committed again. // unfortunately that's not true on other OSes (e.g. BSD based ones), so zero out the // memory before decommit, so that we can be sure that all chunks we allocate will be |