diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 177f00480cb..aa9ab19b994 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-16  Joel Brobecker  <brobecker@adacore.com>
+
+	* procfs.c (solib_mappings_callback, find_memory_regions_callback):
+	Revert the previous change.  Might not be correct, actually.
+
 2009-04-16  Joel Brobecker  <brobecker@adacore.com>
 
 	* ada-lang.h (ada_adjust_exception_stop, ada_print_exception_stop)
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 36d0e476a6b..adb44f4e060 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -5473,7 +5473,7 @@ int solib_mappings_callback (struct prmap *map,
      no file, so the ioctl may return failure, but that's
      not a problem.  */
 #endif
-  return (*func) (fd, (CORE_ADDR) (uintptr_t) map->pr_vaddr);
+  return (*func) (fd, (CORE_ADDR) map->pr_vaddr);
 }
 
 /*
@@ -5524,7 +5524,7 @@ find_memory_regions_callback (struct prmap *map,
 					   void *),
 			      void *data)
 {
-  return (*func) ((CORE_ADDR) (uintptr_t) map->pr_vaddr,
+  return (*func) ((CORE_ADDR) map->pr_vaddr,
 		  map->pr_size,
 		  (map->pr_mflags & MA_READ) != 0,
 		  (map->pr_mflags & MA_WRITE) != 0,