diff options
| author | Sverker Eriksson <[email protected]> | 2012-03-13 11:12:15 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-03-13 11:12:27 +0100 |
| commit | 027456f090fa4d298dd34655d6bb44d2531a135f (patch) | |
| tree | 140b4c42e5d9f8fa9960faccebc00677d290d2f1 /erts | |
| parent | 0d29090cd4bc35d8d7966c45b9d6936298b65350 (diff) | |
| parent | 00a2aff2ba74c4e95a4d20ee79829f2bc5f920fd (diff) | |
| download | otp-027456f090fa4d298dd34655d6bb44d2531a135f.tar.gz otp-027456f090fa4d298dd34655d6bb44d2531a135f.tar.bz2 otp-027456f090fa4d298dd34655d6bb44d2531a135f.zip | |
Merge branch 'sverk/cpu-topology-crash' into maint
* sverk/cpu-topology-crash:
erts: Fix crash on Linux if /sys/devices/system/node is not readable
OTP-9978
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/lib_src/common/erl_misc_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c index 5e94ff19db..4806311dfe 100644 --- a/erts/lib_src/common/erl_misc_utils.c +++ b/erts/lib_src/common/erl_misc_utils.c @@ -834,8 +834,8 @@ read_topology(erts_cpu_info_t *cpuinfo) ix = -1; if (realpath(ERTS_SYS_NODE_PATH, npath)) { - got_nodes = 1; ndir = opendir(npath); + got_nodes = (ndir != NULL); } do { |