aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-06-03 09:46:18 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-06-03 09:46:18 +0200
commit2c323bd46cecd0592a47e32e4b57f3b6600b828d (patch)
treebdd04d7516469645c8ce2faee1acc4a205456cab /erts
parentb4774c9d55a1606a1abc726e0f7ce563065284b3 (diff)
parent5dc2cc80ee62c8c7da2775b56e9ed5e1f30eb940 (diff)
downloadotp-2c323bd46cecd0592a47e32e4b57f3b6600b828d.tar.gz
otp-2c323bd46cecd0592a47e32e4b57f3b6600b828d.tar.bz2
otp-2c323bd46cecd0592a47e32e4b57f3b6600b828d.zip
Merge branch 'jh/freebsdcpu/OTP-12796'
* jh/freebsdcpu/OTP-12796: os_mon: Comply with C89 standard os_mon: Update docs for FreeBSD os_mon: Implement cpu_sup:util/0,1 for FreeBSD
Diffstat (limited to 'erts')
-rw-r--r--erts/configure.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 39d3c51e3f..ce0cef871f 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -4710,6 +4710,8 @@ case $host_os in
use_cpu_sup=yes ;;
linux*)
use_cpu_sup=yes ;;
+ freebsd*)
+ use_cpu_sup=yes ;;
esac
if test "$use_cpu_sup" = "yes"; then