diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-07-25 15:00:32 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-07-25 15:00:32 +0200 |
| commit | a7bcc6aa05bc61edd1ac178b6331e780aeab940f (patch) | |
| tree | af6cb90b11c95744135e233478c89b55fede8bf7 /lib/os_mon/src | |
| parent | 81664b189c21710767b78a9db9d74d55585cfeed (diff) | |
| parent | 84bc4fb47b58f258a50e23ba96db51608272b859 (diff) | |
| download | otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.tar.gz otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.tar.bz2 otp-a7bcc6aa05bc61edd1ac178b6331e780aeab940f.zip | |
Merge branch 'egil/r16/remove-vxworks-support/OTP-10146'
* egil/r16/remove-vxworks-support/OTP-10146: (30 commits)
erts: Update doc to reflect VxWorks removal
erts: Remove VxWorks from documentation
Update preloaded erl_prim_loader and prim_file
snmp: Remove VxWorks
megaco: Remove VxWorks
diameter: Remove VxWorks
mnesia: Remove VxWorks
typer: Remove VxWorks
ssh: Remove VxWorks
inets: Remove VxWorks
hipe: Remove VxWorks
cosFileTransfer: Remove VxWorks
asn1: Remove VxWorks
orber: Remove VxWorks
os_mon: Remove VxWorks
runtime_tools: Remove VxWorks
test_server: Remove VxWorks references in doc
test_server: Remove VxWorks
stdlib: Remove VxWorks
kernel: Remove VxWorks from tests
...
Conflicts:
erts/emulator/test/Makefile
Diffstat (limited to 'lib/os_mon/src')
| -rw-r--r-- | lib/os_mon/src/memsup.erl | 4 | ||||
| -rw-r--r-- | lib/os_mon/src/os_mon.erl | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl index 54771b4703..a1b8591c8c 100644 --- a/lib/os_mon/src/memsup.erl +++ b/lib/os_mon/src/memsup.erl @@ -185,7 +185,6 @@ init([]) -> {unix, irix} -> true; {unix, sunos} -> true; {win32, _OSname} -> false; - vxworks -> true; _ -> exit({unsupported_os, OS}) end, @@ -617,8 +616,7 @@ code_change(Vsn, PrevState, "1.8") -> {unix, openbsd} -> true; {unix, netbsd} -> true; {unix, sunos} -> true; - {win32, _OSname} -> false; - vxworks -> true + {win32, _OSname} -> false end, Pid = if PortMode -> spawn_link(fun() -> port_init() end); diff --git a/lib/os_mon/src/os_mon.erl b/lib/os_mon/src/os_mon.erl index 2b6cd7c498..df1eccb064 100644 --- a/lib/os_mon/src/os_mon.erl +++ b/lib/os_mon/src/os_mon.erl @@ -177,8 +177,6 @@ services({unix, _}) -> % Other unix. [cpu_sup, disksup, memsup]; services({win32, _}) -> [disksup, memsup, os_sup, sysinfo]; -services(vxworks) -> - [memsup]; services(_) -> []. |