diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2017-01-24 11:35:01 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2017-01-24 11:35:01 +0100 |
| commit | 7a6d7efda47e96679cb5bf4f443b33c9b74cadbd (patch) | |
| tree | 92c92fab9383028e68dae6a1360aa128c7eeb9ec /lib | |
| parent | a80e8759c91bd803b3f324a94e008bbab6690345 (diff) | |
| parent | 7400b93124572af795c8d7356e22e3bf1f1f2a09 (diff) | |
| download | otp-7a6d7efda47e96679cb5bf4f443b33c9b74cadbd.tar.gz otp-7a6d7efda47e96679cb5bf4f443b33c9b74cadbd.tar.bz2 otp-7a6d7efda47e96679cb5bf4f443b33c9b74cadbd.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/os_mon/src/memsup.erl | 1 |
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. |