diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 217b64d094..4e81cfabe3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-22  Markus Deuling  <deuling@de.ibm.com>
+
+	* reggroups.c (default_register_reggroup_p): Replace current_gdbarch
+	by gdbarch.
+
 2007-10-22  Markus Deuling  <deuling@de.ibm.com>
 
 	* infcmd.c (default_print_registers_info, print_return_value)
diff --git a/gdb/reggroups.c b/gdb/reggroups.c
index 7102c06ea5..63954f683e 100644
--- a/gdb/reggroups.c
+++ b/gdb/reggroups.c
@@ -157,16 +157,14 @@ default_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
   int float_p;
   int raw_p;
 
-  if (gdbarch_register_name (current_gdbarch, regnum) == NULL
-      || *gdbarch_register_name (current_gdbarch, regnum) == '\0')
+  if (gdbarch_register_name (gdbarch, regnum) == NULL
+      || *gdbarch_register_name (gdbarch, regnum) == '\0')
     return 0;
   if (group == all_reggroup)
     return 1;
   vector_p = TYPE_VECTOR (register_type (gdbarch, regnum));
   float_p = TYPE_CODE (register_type (gdbarch, regnum)) == TYPE_CODE_FLT;
-  /* FIXME: cagney/2003-04-13: Can't yet use gdbarch_num_regs
-     (gdbarch), as not all architectures are multi-arch.  */
-  raw_p = regnum < gdbarch_num_regs (current_gdbarch);
+  raw_p = regnum < gdbarch_num_regs (gdbarch);
   if (group == float_reggroup)
     return float_p;
   if (group == vector_reggroup)