diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b385559630e..a4698d8f780 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-10  Andrey Smirnov  <andrew.smirnov@gmail.com>
+
+	* breakpoint.c (update_global_location_list): Remove nested
+	definition of `b'(-Wshadow).
+
 2011-12-10  Andrey Smirnov  <andrew.smirnov@gmail.com>
 
 	* breakpoint.c (insert_breakpoint_locations): Rename `error' to
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index e683c20daa0..0686587b472 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -10634,8 +10634,8 @@ update_global_location_list (int should_insert)
     {
       /* ALL_BP_LOCATIONS bp_location has LOC->OWNER always
 	 non-NULL.  */
-      struct breakpoint *b = loc->owner;
       struct bp_location **loc_first_p;
+      b = loc->owner;
 
       if (!should_be_inserted (loc)
 	  || !breakpoint_address_is_meaningful (b)