MFC r268981
Remove #ifdef-s to reduce difference to upstream.

Pointed by:     kib
Approved by:    re (glebius)

Sponsored by:	The FreeBSD Foundation
Merge remote-tracking branch 'freebsd/stable/10' into hardened/10/aslr