oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

**** Merged from HEAD ****

Browse Source 
1999-10-16  Martin Baulig  <martin@home-of-linux.org>

	Applied all patches from the FreeBSD 3.3 ports collection.

	* swap.c: Only #include <rlist.h> for __FreeBSD_version < 400005.

	* prockernel.c: Make it compile on FreeBSD / alpha.

	* procsignal.c: Some fixes for FreeBSD-current.
This commit is contained in:
Martin Baulig
1999-10-16 18:31:43 +00:00
committed by Martin Baulig
parent 95f279d1a7
commit 5530697ab8
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sysdeps/freebsd/prockernel.c
View File

@@ -34,10 +34,10 @@
#if (!defined __OpenBSD__) && (!defined __bsdi__)
#include <sys/user.h>
#endif
#ifndef __bsdi__
#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__))
#include <machine/pcb.h>
#endif
#ifdef __FreeBSD__
#if defined(__FreeBSD__) && !defined(__alpha__)
#include <machine/tss.h>
#endif
@@ -155,6 +155,7 @@ glibtop_get_proc_kernel_p (glibtop *server,
(char *) &pcb, sizeof (pcb)) == sizeof (pcb))
{
#ifdef __FreeBSD__
#ifndef __alpha__
#if (__FreeBSD_version >= 300003)
buf->kstk_esp = (u_int64_t) pcb.pcb_esp;
buf->kstk_eip = (u_int64_t) pcb.pcb_eip;
@@ -162,6 +163,9 @@ glibtop_get_proc_kernel_p (glibtop *server,
buf->kstk_esp = (u_int64_t) pcb.pcb_ksp;
buf->kstk_eip = (u_int64_t) pcb.pcb_pc;
#endif
#else
/*xxx FreeBSD/Alpha? */
#endif
#else
buf->kstk_esp = (u_int64_t) pcb.pcb_tss.tss_esp0;
#ifdef __bsdi__