diff options
| -rw-r--r-- | cmd/zed/zed.c | 9 | ||||
| -rw-r--r-- | config/user.m4 | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cmd/zed/zed.c b/cmd/zed/zed.c index d2fc0e899..c54a59b0a 100644 --- a/cmd/zed/zed.c +++ b/cmd/zed/zed.c @@ -97,10 +97,7 @@ _setup_sig_handlers(void) static void _lock_memory(void) { -#if ! _POSIX_MEMLOCK - zed_log_die("Failed to lock memory pages: mlockall() not supported"); - -#else /* _POSIX_MEMLOCK */ +#if HAVE_MLOCKALL int i = 0; const int max_tries = 10; @@ -114,7 +111,9 @@ _lock_memory(void) } zed_log_die("Failed to lock memory pages: %s", strerror(errno)); -#endif /* _POSIX_MEMLOCK */ +#else /* HAVE_MLOCKALL */ + zed_log_die("Failed to lock memory pages: mlockall() not supported"); +#endif /* HAVE_MLOCKALL */ } /* diff --git a/config/user.m4 b/config/user.m4 index 6c127820c..38024370b 100644 --- a/config/user.m4 +++ b/config/user.m4 @@ -13,4 +13,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ ZFS_AC_CONFIG_USER_LIBBLKID ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN ZFS_AC_CONFIG_USER_RUNSTATEDIR +dnl # +dnl # Checks for library functions + AC_CHECK_FUNCS([mlockall]) ]) |