From f6803308596d957a85f3b8d756ceb04882dcee2d Mon Sep 17 00:00:00 2001 From: kib Date: Thu, 1 Mar 2007 13:55:15 +0000 Subject: [PATCH] Rename lookup() to kgdb_lookup() and make it global (for use in trgt_i386.c). No objections from: marcel --- gnu/usr.bin/gdb/kgdb/kgdb.h | 2 ++ gnu/usr.bin/gdb/kgdb/kthr.c | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/usr.bin/gdb/kgdb/kgdb.h b/gnu/usr.bin/gdb/kgdb/kgdb.h index 2103acdb082d..41c931027116 100644 --- a/gnu/usr.bin/gdb/kgdb/kgdb.h +++ b/gnu/usr.bin/gdb/kgdb/kgdb.h @@ -62,4 +62,6 @@ struct kthr *kgdb_thr_next(struct kthr *); struct kthr *kgdb_thr_select(struct kthr *); char *kgdb_thr_extra_thread_info(int); +uintptr_t kgdb_lookup(const char *sym); + #endif /* _KGDB_H_ */ diff --git a/gnu/usr.bin/gdb/kgdb/kthr.c b/gnu/usr.bin/gdb/kgdb/kthr.c index 37ecad2c2639..582cfa776279 100644 --- a/gnu/usr.bin/gdb/kgdb/kthr.c +++ b/gnu/usr.bin/gdb/kgdb/kthr.c @@ -52,8 +52,8 @@ static __cpumask_t stopped_cpus; static struct kthr *first; struct kthr *curkthr; -static uintptr_t -lookup(const char *sym) +uintptr_t +kgdb_lookup(const char *sym) { struct nlist nl[2]; @@ -80,28 +80,28 @@ kgdb_thr_init(void) struct kthr *kt; uintptr_t addr, paddr; - addr = lookup("_allproc"); + addr = kgdb_lookup("_allproc"); if (addr == 0) return (NULL); kvm_read(kvm, addr, &paddr, sizeof(paddr)); - dumppcb = lookup("_dumppcb"); + dumppcb = kgdb_lookup("_dumppcb"); if (dumppcb == 0) return (NULL); - addr = lookup("_dumptid"); + addr = kgdb_lookup("_dumptid"); if (addr != 0) kvm_read(kvm, addr, &dumptid, sizeof(dumptid)); else dumptid = -1; - addr = lookup("_stopped_cpus"); + addr = kgdb_lookup("_stopped_cpus"); if (addr != 0) kvm_read(kvm, addr, &stopped_cpus, sizeof(stopped_cpus)); else stopped_cpus = 0; - stoppcbs = lookup("_stoppcbs"); + stoppcbs = kgdb_lookup("_stoppcbs"); while (paddr != 0) { if (kvm_read(kvm, paddr, &p, sizeof(p)) != sizeof(p)) {