From: Ján Tomko <[email protected]> It has no effect anymore.
Signed-off-by: Ján Tomko <[email protected]> --- meson.build | 7 ------- meson_options.txt | 2 -- 2 files changed, 9 deletions(-) diff --git a/meson.build b/meson.build index c1871de64c..6ac9d01952 100644 --- a/meson.build +++ b/meson.build @@ -2029,12 +2029,6 @@ elif get_option('sysctl_config').enabled() error('sysctl configuration is supported only on linux') endif -if not get_option('userfaultfd_sysctl').disabled() and conf.has('WITH_SYSCTL') - conf.set('WITH_USERFAULTFD_SYSCTL', 1) -elif get_option('userfaultfd_sysctl').enabled() - error('userfaultfd_sysctl option requires sysctl_config to be enabled') -endif - prio = get_option('tls_priority') if prio == 'auto' # If local OS has 'crypto-policies' then default to that @@ -2345,7 +2339,6 @@ misc_summary = { 'sysctl config': conf.has('WITH_SYSCTL'), 'tests': tests_enabled, 'TLS priority': conf.get_unquoted('TLS_PRIORITY'), - 'userfaultfd sysctl': conf.has('WITH_USERFAULTFD_SYSCTL'), 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), 'Warning Flags': supported_cc_flags, diff --git a/meson_options.txt b/meson_options.txt index 8b6b26dfc6..e12ace4e11 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -132,6 +132,4 @@ option('nbdkit_config_default', type: 'feature', value: 'auto', description: 'Wh option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils for power management') option('ssh_proxy', type: 'feature', value: 'auto', description: 'Build ssh-proxy for ssh over vsock') option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether to install sysctl configs') -# dep:sysctl_config -option('userfaultfd_sysctl', type: 'feature', value: 'auto', description: 'Whether to install sysctl config for enabling unprivileged userfaultfd') option('tls_priority', type: 'string', value: 'auto', description: 'set the default TLS session priority string') -- 2.51.1
