diff options
| author | jhb <jhb@FreeBSD.org> | 2001-12-12 21:15:30 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-12-12 21:15:30 +0000 |
| commit | 580f3319c9eb0f39c49d27d0b354dd7d392782de (patch) | |
| tree | 93e75d079db12e7b24e895b78c16a3c22d5aec9e /gnu | |
| parent | 53b37471d409cd98e02a24d3938a654aab377d1e (diff) | |
| download | FreeBSD-src-580f3319c9eb0f39c49d27d0b354dd7d392782de.zip FreeBSD-src-580f3319c9eb0f39c49d27d0b354dd7d392782de.tar.gz | |
Catch up to the globaldata -> pcpu changes.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c | 20 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/gdb/kvm-fbsd.c | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c index b2238ad..f5aab1a 100644 --- a/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c +++ b/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c @@ -49,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <machine/tss.h> #include <machine/frame.h> #define _KERNEL -#include <machine/globaldata.h> +#include <sys/pcpu.h> #undef _KERNEL static void kcore_files_info PARAMS ((struct target_ops *)); @@ -118,7 +118,7 @@ static CORE_ADDR kernel_start; static CORE_ADDR pcpu; #define PCPU_OFFSET(name) \ - offsetof(struct globaldata, gd_ ## name) + offsetof(struct pcpu, pc_ ## name) /* * Symbol names of kernel entry points. Use special frames. @@ -784,21 +784,21 @@ static CORE_ADDR kvm_getpcpu (cfd, cpuid) int cfd, cpuid; { - SLIST_HEAD(, globaldata) pcpu_head; - struct globaldata lgd; - struct globaldata *gd; + SLIST_HEAD(, pcpu) pcpu_head; + struct pcpu lpc; + struct pcpu *pc; physrd (cfd, ksym_lookup ("cpuhead") - KERNOFF, (char*)&pcpu_head, sizeof pcpu_head); - gd = SLIST_FIRST (&pcpu_head); - for (; gd != NULL; gd = SLIST_NEXT (&lgd, gd_allcpu)) + pc = SLIST_FIRST (&pcpu_head); + for (; pc != NULL; pc = SLIST_NEXT (&lpc, pc_allcpu)) { - kvm_read (cfd, (CORE_ADDR)gd, (char*)&lgd, sizeof lgd); - if (lgd.gd_cpuid == cpuid) + kvm_read (cfd, (CORE_ADDR)pc, (char*)&lpc, sizeof lpc); + if (lpc.pc_cpuid == cpuid) break; } - return ((CORE_ADDR)gd); + return ((CORE_ADDR)pc); } /* diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c index b2238ad..f5aab1a 100644 --- a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c +++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c @@ -49,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <machine/tss.h> #include <machine/frame.h> #define _KERNEL -#include <machine/globaldata.h> +#include <sys/pcpu.h> #undef _KERNEL static void kcore_files_info PARAMS ((struct target_ops *)); @@ -118,7 +118,7 @@ static CORE_ADDR kernel_start; static CORE_ADDR pcpu; #define PCPU_OFFSET(name) \ - offsetof(struct globaldata, gd_ ## name) + offsetof(struct pcpu, pc_ ## name) /* * Symbol names of kernel entry points. Use special frames. @@ -784,21 +784,21 @@ static CORE_ADDR kvm_getpcpu (cfd, cpuid) int cfd, cpuid; { - SLIST_HEAD(, globaldata) pcpu_head; - struct globaldata lgd; - struct globaldata *gd; + SLIST_HEAD(, pcpu) pcpu_head; + struct pcpu lpc; + struct pcpu *pc; physrd (cfd, ksym_lookup ("cpuhead") - KERNOFF, (char*)&pcpu_head, sizeof pcpu_head); - gd = SLIST_FIRST (&pcpu_head); - for (; gd != NULL; gd = SLIST_NEXT (&lgd, gd_allcpu)) + pc = SLIST_FIRST (&pcpu_head); + for (; pc != NULL; pc = SLIST_NEXT (&lpc, pc_allcpu)) { - kvm_read (cfd, (CORE_ADDR)gd, (char*)&lgd, sizeof lgd); - if (lgd.gd_cpuid == cpuid) + kvm_read (cfd, (CORE_ADDR)pc, (char*)&lpc, sizeof lpc); + if (lpc.pc_cpuid == cpuid) break; } - return ((CORE_ADDR)gd); + return ((CORE_ADDR)pc); } /* |
