diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 951e9fd64e4..1db38949869 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-14  Joel Brobecker  <brobecker@adacore.com>
+
+	* ada-lang.c (add_nonlocal_symbols): Initialize data to
+	all zeros.  Remove setting of data.arg_sym to NULL.
+
 2011-12-14  Pedro Alves  <pedro@codesourcery.com>
 
 	PR threads/10729
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 33d7253f577..1befc43e931 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -4922,8 +4922,8 @@ add_nonlocal_symbols (struct obstack *obstackp, const char *name,
   struct objfile *objfile;
   struct match_data data;
 
+  memset (&data, 0, sizeof data);
   data.obstackp = obstackp;
-  data.arg_sym = NULL;
 
   ALL_OBJFILES (objfile)
     {