aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2017-01-24 11:34:26 +0100
committerBjörn-Egil Dahlberg <[email protected]>2017-01-24 11:34:26 +0100
commit7400b93124572af795c8d7356e22e3bf1f1f2a09 (patch)
tree549027769baf5d77f1a809b502f27b6d7cb8554e
parent9970c8c5c0074afbf1cabadd84ceb9fa6da512b1 (diff)
parent5670c3cf8dc65b4c220572c065b2b7d4b607cea9 (diff)
downloadotp-7400b93124572af795c8d7356e22e3bf1f1f2a09.tar.gz
otp-7400b93124572af795c8d7356e22e3bf1f1f2a09.tar.bz2
otp-7400b93124572af795c8d7356e22e3bf1f1f2a09.zip
Merge branch 'schimulkar/os_mon/linux-on-ibm-z/PR-1309/OTP-14161' into maint
* schimulkar/os_mon/linux-on-ibm-z/PR-1309/OTP-14161: Adding s390x support
-rw-r--r--lib/os_mon/src/memsup.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl
index 4729d090f8..0a9a883390 100644
--- a/lib/os_mon/src/memsup.erl
+++ b/lib/os_mon/src/memsup.erl
@@ -701,6 +701,7 @@ get_os_wordsize_with_uname() ->
"sparc64" -> 64;
"amd64" -> 64;
"ppc64" -> 64;
+ "s390x" -> 64;
_ -> 32
end.