diff options
| author | Christopher Ferris <cferris@google.com> | 2014-02-03 17:00:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 17:00:01 +0000 |
| commit | a3fe7a7927840ac16645ea16783602afda2b263e (patch) | |
| tree | 339b0af4b8571fb1ace4b4adf19db112dd6d550e /libbacktrace | |
| parent | 1ffde8abbed48172014a733fe21c1be4137b3b67 (diff) | |
| parent | 10c2607c3cc4903ca8dcbe2245f66d21af199865 (diff) | |
| download | system_core-a3fe7a7927840ac16645ea16783602afda2b263e.zip system_core-a3fe7a7927840ac16645ea16783602afda2b263e.tar.gz system_core-a3fe7a7927840ac16645ea16783602afda2b263e.tar.bz2 | |
am 10c2607c: am 77b23023: am 3faf86c0: Merge "Call a specialized local map set."
* commit '10c2607c3cc4903ca8dcbe2245f66d21af199865':
Call a specialized local map set.
Diffstat (limited to 'libbacktrace')
| -rw-r--r-- | libbacktrace/UnwindMap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbacktrace/UnwindMap.cpp b/libbacktrace/UnwindMap.cpp index 03bb192..8268db6 100644 --- a/libbacktrace/UnwindMap.cpp +++ b/libbacktrace/UnwindMap.cpp @@ -45,7 +45,7 @@ UnwindMap::~UnwindMap() { pthread_mutex_lock(&g_map_mutex); if (--g_map_references == 0) { // Clear the local address space map. - unw_map_set(unw_local_addr_space, NULL); + unw_map_local_set(NULL); unw_map_cursor_destroy(&map_cursor_); } pthread_mutex_unlock(&g_map_mutex); @@ -61,8 +61,8 @@ bool UnwindMap::Build() { if (g_map_references == 0) { return_value = (unw_map_cursor_create(&map_cursor_, pid_) == 0); if (return_value) { - // Set the local address space to this cursor map. - unw_map_set(unw_local_addr_space, &map_cursor_); + // Set the local address space map to our new map. + unw_map_local_set(&map_cursor_); g_map_references = 1; g_map_cursor = map_cursor_; } |