Kill db_symbol_is_ambiguous(). There's no ambiguous symbol since LKMs

are no longer supported.

ok tb@, guenther@

2 files changed, 1 insertions, 38 deletions

diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index c72bdb14414..4a11e623dbe 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_sym.c,v 1.43 2016/01/27 10:37:12 mpi Exp $	*/
+/*	$OpenBSD: db_sym.c,v 1.44 2016/02/12 10:58:41 mpi Exp $	*/
 /*	$NetBSD: db_sym.c,v 1.24 2000/08/11 22:50:47 tv Exp $	*/
 
 /*
@@ -245,34 +245,6 @@ db_lookup(char *symstr)
 }
 
 /*
- * Does this symbol name appear in more than one symbol table?
- * Used by db_symbol_values to decide whether to qualify a symbol.
- */
-boolean_t db_qualify_ambiguous_names = FALSE;
-
-boolean_t
-db_symbol_is_ambiguous(db_sym_t sym)
-{
-	char		*sym_name;
-	int	i;
-	boolean_t	found_once = FALSE;
-
-	if (!db_qualify_ambiguous_names)
-		return FALSE;
-
-	db_symbol_values(sym, &sym_name, 0);
-	for (i = 0; i < MAXNOSYMTABS; i++) {
-		if (db_symtabs[i].name &&
-		    db_elf_sym_lookup(&db_symtabs[i], sym_name)) {
-			if (found_once)
-				return TRUE;
-			found_once = TRUE;
-		}
-	}
-	return FALSE;
-}
-
-/*
  * Find the closest symbol to val, and return its name
  * and the difference between val and the symbol found.
  */
@@ -315,8 +287,6 @@ db_symbol_values(db_sym_t sym, char **namep, db_expr_t *valuep)
 
 	db_elf_sym_values(db_last_symtab, sym, namep, &value);
 
-	if (db_symbol_is_ambiguous(sym))
-		*namep = db_qualify(sym, db_last_symtab->name);
 	if (valuep)
 		*valuep = value;
 }
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index 66f1d8defaf..6a4ee3db6b9 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -74,11 +74,6 @@ typedef int		db_strategy_t;	/* search strategy */
  */
 typedef void (db_forall_func_t)(db_symtab_t *, db_sym_t, char *, char *, int, void *);
 
-extern boolean_t	db_qualify_ambiguous_names;
-					/* if TRUE, check across symbol tables
-					 * for multiple occurrences of a name.
-					 * Might slow down quite a bit */
-
 extern unsigned int db_maxoff;		/* like gdb's "max-symbolic-offset" */
 /*
  * Functions exported by the symtable module
@@ -97,8 +92,6 @@ int db_value_of_name(char *, db_expr_t *);
 
 db_sym_t db_lookup(char *);
 
-boolean_t db_symbol_is_ambiguous(db_sym_t);
-
 db_sym_t db_search_symbol(db_addr_t, db_strategy_t, db_expr_t *);
 					/* find symbol given value */