+2013-06-20  Yao Qi  <yao@codesourcery.com>
+
+       * breakpoint.c (create_breakpoints_sal_default): Remove
+       parameter 'lsal'.  Update declaration.
+       (bkpt_create_breakpoints_sal): Caller update.
+       (tracepoint_create_breakpoints_sal): Likewise.
+
 2013-06-20  Pedro Alves  <pedro@codesourcery.com>
            Yao Qi  <yao@codesourcery.com>
 
 
 
 static void create_breakpoints_sal_default (struct gdbarch *,
                                            struct linespec_result *,
-                                           struct linespec_sals *,
                                            char *, char *, enum bptype,
                                            enum bpdisp, int, int,
                                            int,
                             int from_tty, int enabled,
                             int internal, unsigned flags)
 {
-  create_breakpoints_sal_default (gdbarch, canonical, lsal,
+  create_breakpoints_sal_default (gdbarch, canonical,
                                  cond_string, extra_string,
                                  type_wanted,
                                  disposition, thread, task,
                                   int from_tty, int enabled,
                                   int internal, unsigned flags)
 {
-  create_breakpoints_sal_default (gdbarch, canonical, lsal,
+  create_breakpoints_sal_default (gdbarch, canonical,
                                  cond_string, extra_string,
                                  type_wanted,
                                  disposition, thread, task,
 static void
 create_breakpoints_sal_default (struct gdbarch *gdbarch,
                                struct linespec_result *canonical,
-                               struct linespec_sals *lsal,
                                char *cond_string,
                                char *extra_string,
                                enum bptype type_wanted,