MFC r311393:

OS_getSystemUptime: use nitems for calculating the number of elements
in a sysctl mib instead of hardcoding the number 2

MFstable/11 r310899:

MFC r310666,r310675:

r310666:

style(9) fixes

- Clean up trailing whitespace
- Fix variable type alignment in storage_OS_get_swap(..)

r310675:

Fix the build by moving the initializers for len/nswapdev down below the
declarations

Pointyhat to: ngie

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Do not count kernel threads as processes for hrSystemProcesses OID.

PR: bin/160494
Submitted by: Jeremy Chadwick <freebsd jdc.parodius.com>

Spelling fixes for usr.sbin/

Port all applications in usr.sbin/ from libulog to utmpx.

Let the snmp_hostres module use utmpx.

Approved by: harti

Fix build without -DNDEBUG.

Spotted by: obrien

assert(3) is not used here.

Forced commit because I lost the commit message in the previous commit:

This is the implementation of the HOSTRES MIB that was developed by
Victor during SoC 2005 with some stylification by philip@ and harti@.

Submitted by: Victor Cruceru <soc-victor@freebsd.org>
Reviewed by: philip, harti

msg