diff options
| author | 2014-03-17 20:05:40 +0000 | |
|---|---|---|
| committer | 2014-03-17 20:05:41 +0000 | |
| commit | ff3e67ec3a20b7d4a780f60c8af773cb27ca897b (patch) | |
| tree | ffc2f1125fd81bdd8afe063843a95db84b69c04d | |
| parent | 4eccb97426f5f4233335504256246744c76556aa (diff) | |
| parent | 71a3ebabb2a6b4921071d115aa176d8222aeb803 (diff) | |
Merge "Quick typo fix in the 4GB lowmem code"
| -rw-r--r-- | runtime/mem_map.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mem_map.cc b/runtime/mem_map.cc index 629db3200c..5647d939ae 100644 --- a/runtime/mem_map.cc +++ b/runtime/mem_map.cc @@ -47,7 +47,7 @@ static std::ostream& operator<<( } #if defined(__LP64__) && !defined(__x86_64__) -MemMap::next_mem_pos_ = kPageSize * 2; // first page to check for low-mem extent +uintptr_t MemMap::next_mem_pos_ = kPageSize * 2; // first page to check for low-mem extent #endif static bool CheckMapRequest(byte* expected_ptr, void* actual_ptr, size_t byte_count, @@ -133,7 +133,7 @@ MemMap* MemMap::MapAnonymous(const char* name, byte* expected, size_t byte_count if (low_4gb && expected == nullptr) { flags |= MAP_FIXED; - for (uintptr_t ptr = next_mem_pos; ptr < 4 * GB; ptr += kPageSize) { + for (uintptr_t ptr = next_mem_pos_; ptr < 4 * GB; ptr += kPageSize) { uintptr_t tail_ptr; // Check pages are free. |