# HG changeset patch # User David J. MacKenzie # Date 742000050 0 # Node ID 1117ec91799c131db941a939aac68257e5a84b0b # Parent 735b8dc6cdd2ec8882a60e70b05d014aeb824689 *** empty log message *** diff -r 735b8dc6cdd2 -r 1117ec91799c src/getloadavg.c --- a/src/getloadavg.c Tue Jul 06 22:39:56 1993 +0000 +++ b/src/getloadavg.c Tue Jul 06 23:07:30 1993 +0000 @@ -699,7 +699,6 @@ /* Get the address of LDAV_SYMBOL. */ if (offset == 0) { -#ifndef SUNOS_5 #ifndef sgi #ifndef NLIST_STRUCT strcpy (nl[0].n_name, LDAV_SYMBOL); @@ -714,6 +713,7 @@ #endif /* not NLIST_NAME_UNION */ #endif /* NLIST_STRUCT */ +#ifndef SUNOS_5 if (nlist (KERNEL_FILE, nl) >= 0) /* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i. */ { @@ -722,6 +722,7 @@ #endif offset = nl[0].n_value; } +#endif /* !SUNOS_5 */ #else /* sgi */ int ldav_off; @@ -729,7 +730,6 @@ if (ldav_off != -1) offset = (long) ldav_off & 0x7fffffff; #endif /* sgi */ -#endif /* !SUNOS_5 */ } /* Make sure we have /dev/kmem open. */ @@ -740,10 +740,14 @@ if (channel >= 0) getloadavg_initialized = 1; #else /* SUNOS_5 */ + /* We pass 0 for the kernel, corefile, and swapfile names + to use the currently running kernel. */ kd = kvm_open (0, 0, 0, O_RDONLY, 0); if (kd != 0) { + /* nlist the currently running kernel. */ kvm_nlist (kd, nl); + offset = nl[0].n_value; getloadavg_initialized = 1; } #endif /* SUNOS_5 */