aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-02-01 10:26:13 +0100
committerLukas Larsson <[email protected]>2019-02-01 10:26:13 +0100
commite7b3656bae68d14435eca2de9a7efbdb62b83f07 (patch)
tree05e0366269bd160f655ef0ec1a0d928bcc9ba7a5
parent74ed1c61906eec6e4bf68ae89d9b072a6bf26fb8 (diff)
parentf4e19bd421ef28e34abb869439993b022fc0806e (diff)
downloadotp-e7b3656bae68d14435eca2de9a7efbdb62b83f07.tar.gz
otp-e7b3656bae68d14435eca2de9a7efbdb62b83f07.tar.bz2
otp-e7b3656bae68d14435eca2de9a7efbdb62b83f07.zip
Merge branch 'lukas/erts/fix_system_info_kernelpoll/OTP-15556' into maint
* lukas/erts/fix_system_info_kernelpoll/OTP-15556: erts: Fix erlang:system_info(kernel_poll) to return correct value
-rw-r--r--erts/emulator/beam/erl_bif_info.c2
-rw-r--r--erts/emulator/beam/erl_init.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 6137edef1b..f6a98c85fd 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -2967,7 +2967,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
} else if (ERTS_IS_ATOM_STR("context_reductions", BIF_ARG_1)) {
BIF_RET(make_small(CONTEXT_REDS));
} else if (ERTS_IS_ATOM_STR("kernel_poll", BIF_ARG_1)) {
-#ifdef ERTS_ENABLE_KERNEL_POLL
+#if ERTS_ENABLE_KERNEL_POLL
BIF_RET(am_true);
#else
BIF_RET(am_false);
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 41bec17dfa..30da0c83e0 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -78,7 +78,7 @@ const char etp_erts_version[] = ERLANG_VERSION;
const char etp_otp_release[] = ERLANG_OTP_RELEASE;
const char etp_compile_date[] = ERLANG_COMPILE_DATE;
const char etp_arch[] = ERLANG_ARCHITECTURE;
-#ifdef ERTS_ENABLE_KERNEL_POLL
+#if ERTS_ENABLE_KERNEL_POLL
const int erts_use_kernel_poll = 1;
const int etp_kernel_poll_support = 1;
#else