diff options
| -rw-r--r-- | src/getloadavg.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/getloadavg.c b/src/getloadavg.c index 339e9ba419a..49612bf2b57 100644 --- a/src/getloadavg.c +++ b/src/getloadavg.c | |||
| @@ -699,7 +699,6 @@ getloadavg (loadavg, nelem) | |||
| 699 | /* Get the address of LDAV_SYMBOL. */ | 699 | /* Get the address of LDAV_SYMBOL. */ |
| 700 | if (offset == 0) | 700 | if (offset == 0) |
| 701 | { | 701 | { |
| 702 | #ifndef SUNOS_5 | ||
| 703 | #ifndef sgi | 702 | #ifndef sgi |
| 704 | #ifndef NLIST_STRUCT | 703 | #ifndef NLIST_STRUCT |
| 705 | strcpy (nl[0].n_name, LDAV_SYMBOL); | 704 | strcpy (nl[0].n_name, LDAV_SYMBOL); |
| @@ -714,6 +713,7 @@ getloadavg (loadavg, nelem) | |||
| 714 | #endif /* not NLIST_NAME_UNION */ | 713 | #endif /* not NLIST_NAME_UNION */ |
| 715 | #endif /* NLIST_STRUCT */ | 714 | #endif /* NLIST_STRUCT */ |
| 716 | 715 | ||
| 716 | #ifndef SUNOS_5 | ||
| 717 | if (nlist (KERNEL_FILE, nl) >= 0) | 717 | if (nlist (KERNEL_FILE, nl) >= 0) |
| 718 | /* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i. */ | 718 | /* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i. */ |
| 719 | { | 719 | { |
| @@ -722,6 +722,7 @@ getloadavg (loadavg, nelem) | |||
| 722 | #endif | 722 | #endif |
| 723 | offset = nl[0].n_value; | 723 | offset = nl[0].n_value; |
| 724 | } | 724 | } |
| 725 | #endif /* !SUNOS_5 */ | ||
| 725 | #else /* sgi */ | 726 | #else /* sgi */ |
| 726 | int ldav_off; | 727 | int ldav_off; |
| 727 | 728 | ||
| @@ -729,7 +730,6 @@ getloadavg (loadavg, nelem) | |||
| 729 | if (ldav_off != -1) | 730 | if (ldav_off != -1) |
| 730 | offset = (long) ldav_off & 0x7fffffff; | 731 | offset = (long) ldav_off & 0x7fffffff; |
| 731 | #endif /* sgi */ | 732 | #endif /* sgi */ |
| 732 | #endif /* !SUNOS_5 */ | ||
| 733 | } | 733 | } |
| 734 | 734 | ||
| 735 | /* Make sure we have /dev/kmem open. */ | 735 | /* Make sure we have /dev/kmem open. */ |
| @@ -740,10 +740,14 @@ getloadavg (loadavg, nelem) | |||
| 740 | if (channel >= 0) | 740 | if (channel >= 0) |
| 741 | getloadavg_initialized = 1; | 741 | getloadavg_initialized = 1; |
| 742 | #else /* SUNOS_5 */ | 742 | #else /* SUNOS_5 */ |
| 743 | /* We pass 0 for the kernel, corefile, and swapfile names | ||
| 744 | to use the currently running kernel. */ | ||
| 743 | kd = kvm_open (0, 0, 0, O_RDONLY, 0); | 745 | kd = kvm_open (0, 0, 0, O_RDONLY, 0); |
| 744 | if (kd != 0) | 746 | if (kd != 0) |
| 745 | { | 747 | { |
| 748 | /* nlist the currently running kernel. */ | ||
| 746 | kvm_nlist (kd, nl); | 749 | kvm_nlist (kd, nl); |
| 750 | offset = nl[0].n_value; | ||
| 747 | getloadavg_initialized = 1; | 751 | getloadavg_initialized = 1; |
| 748 | } | 752 | } |
| 749 | #endif /* SUNOS_5 */ | 753 | #endif /* SUNOS_5 */ |