diff --git a/src/Gfind_dynamic_proc_info.c b/src/Gfind_dynamic_proc_info.c
index 84304fa5..f933fdae 100644
--- a/src/Gfind_dynamic_proc_info.c
+++ b/src/Gfind_dynamic_proc_info.c
@@ -31,8 +31,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #ifdef UNW_REMOTE_ONLY
 
 static inline int
-local_find_proc_info (unw_dyn_info_list_t *list,
-		      unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
+local_find_proc_info (unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
 		      int need_unwind_info, void *arg)
 {
   return -UNW_ENOINFO;
@@ -41,12 +40,13 @@ local_find_proc_info (unw_dyn_info_list_t *list,
 #else /* !UNW_REMOTE_ONLY */
 
 static inline int
-local_find_proc_info (unw_dyn_info_list_t *list,
-		      unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
+local_find_proc_info (unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi,
 		      int need_unwind_info, void *arg)
 {
+  unw_dyn_info_list_t *list;
   unw_dyn_info_t *di;
 
+  list = (unw_dyn_info_list_t *) _U_dyn_info_list_addr ();
   for (di = list->first; di; di = di->next)
     if (ip >= di->start_ip && ip < di->end_ip)
       return unwi_extract_dynamic_proc_info (as, ip, pi, di, need_unwind_info,
@@ -82,9 +82,7 @@ unwi_find_dynamic_proc_info (unw_addr_space_t as, unw_word_t ip,
 			     void *arg)
 {
   if (as == unw_local_addr_space)
-    return local_find_proc_info ((unw_dyn_info_list_t *)
-				 _U_dyn_info_list_addr (),
-				 as, ip, pi, need_unwind_info, arg);
+    return local_find_proc_info (as, ip, pi, need_unwind_info, arg);
   else
     return remote_find_proc_info (as, ip, pi, need_unwind_info, arg);
 }