aboutsummaryrefslogtreecommitdiffstats
path: root/lib/os_mon/src/cpu_sup.erl
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 /lib/os_mon/src/cpu_sup.erl
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 'lib/os_mon/src/cpu_sup.erl')
-rw-r--r--lib/os_mon/src/cpu_sup.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/os_mon/src/cpu_sup.erl b/lib/os_mon/src/cpu_sup.erl
index b4ad8e2aa0..d8cfd845bc 100644
--- a/lib/os_mon/src/cpu_sup.erl
+++ b/lib/os_mon/src/cpu_sup.erl
@@ -160,7 +160,8 @@ handle_call(?quit, _From, State) ->
handle_call({?util, D, PC}, {Client, _Tag},
#state{os_type = {unix, Flavor}} = State)
when Flavor == sunos;
- Flavor == linux ->
+ Flavor == linux;
+ Flavor == freebsd ->
case measurement_server_call(State#state.server, {?util, D, PC, Client}) of
{error, Reason} ->
{ reply,