diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2aba9bceb8..43367f8cd2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-02  Thiemo Seufer  <ths@mips.com>
+
+	* linux-thread-db.c (thread_db_get_thread_local_address): Fix type
+	mismatch.
+	* tui/tui-stack.c (tui_show_frame_info): Likewise.
+
 2006-08-01  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* c-exp.y (type): Remove incorrect pointer to member case.
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index d91a894166..517dc44d07 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -1080,7 +1080,8 @@ thread_db_get_thread_local_address (ptid_t ptid,
       thread_db_map_id2thr (thread_info, 1);
 
       /* Finally, get the address of the variable.  */
-      err = td_thr_tls_get_addr_p (&thread_info->private->th, (void *) lm,
+      err = td_thr_tls_get_addr_p (&thread_info->private->th,
+				   (void *)(size_t) lm,
 				   offset, &address);
 
 #ifdef THREAD_DB_HAS_TD_NOTALLOC
diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c
index 05230daa48..907f00a236 100644
--- a/gdb/tui/tui-stack.c
+++ b/gdb/tui/tui-stack.c
@@ -356,7 +356,7 @@ tui_show_frame_info (struct frame_info *fi)
 	  else
 	    {
 	      if (find_pc_partial_function (get_frame_pc (fi), (char **) NULL,
-					    &low, (CORE_ADDR) NULL) == 0)
+					    &low, (CORE_ADDR) 0) == 0)
 		error (_("No function contains program counter for selected frame."));
 	      else
 		low = tui_get_low_disassembly_address (low, get_frame_pc (fi));