lib/posix-futex: Adapt to updated libposix-process config options

Following the consolidation of CONFIG_LIBPOSIX_PROCESS_PIDS and
CONFIG_LIBPOSIX_PROCESS_CLONE into LIBPOSIX_PROCESS_MULTITHREADING,
update to the new config.

Signed-off-by: Michalis Pappas <michalis@unikraft.io>
Approved-by: Andrei Tatar <andrei@unikraft.io>
Reviewed-by: Sergiu Moga <sergiu@unikraft.io>
Reviewed-by: Andrei Tatar <andrei@unikraft.io>
GitHub-Closes: #1627

diff --git a/lib/posix-futex/Makefile.uk b/lib/posix-futex/Makefile.uk
index f2c3651872d1d37092d33cbe75bcb2be2d7469ae..f3a893117387cab8b2d911174a8c39ca772f4877 100644 (file)
--- a/lib/posix-futex/Makefile.uk
+++ b/lib/posix-futex/Makefile.uk
@@ -11,6 +11,6 @@ ifneq ($(filter y,$(CONFIG_LIBPOSIX_FUTEX_TEST) $(CONFIG_LIBUKTEST_ALL)),)
 endif
 
 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_FUTEX) += futex-6
-ifeq ($(CONFIG_LIBPOSIX_PROCESS_CLONE),y)
+ifeq ($(CONFIG_LIBPOSIX_PROCESS_MULTITHREADING),y)
 UK_PROVIDED_SYSCALLS-$(CONFIG_LIBPOSIX_FUTEX) += set_tid_address-1
 endif

diff --git a/lib/posix-futex/futex.c b/lib/posix-futex/futex.c
index 56b92465a43530df4bf2e0432f04177342fa0164..f21d173da2dd0606abf9220ee5755e248d8d4f9e 100644 (file)
--- a/lib/posix-futex/futex.c
+++ b/lib/posix-futex/futex.c
@@ -51,9 +51,9 @@
 #include <uk/thread.h>
 #include <uk/thread.h>
 #include <uk/list.h>
-#if CONFIG_LIBPOSIX_PROCESS_CLONE
+#if CONFIG_LIBPOSIX_PROCESS_MULTITHREADING
 #include <uk/process.h>
-#endif /* CONFIG_LIBPOSIX_PROCESS_CLONE */
+#endif /* CONFIG_LIBPOSIX_PROCESS_MULTITHREADING */
 #include <uk/sched.h>
 #include <uk/list.h>
 #include <uk/assert.h>
@@ -345,7 +345,7 @@ UK_LLSYSCALL_R_DEFINE(int, futex, uint32_t *, uaddr, int, futex_op,
        }
 }
 
-#if CONFIG_LIBPOSIX_PROCESS_CLONE
+#if CONFIG_LIBPOSIX_PROCESS_MULTITHREADING
 /*
  * Reference to child TID that should be cleared on thread exit
  * (if not NULL):
@@ -407,4 +407,4 @@ static void thread_exit_handler(struct uk_thread *child)
 
 UK_THREAD_INIT_PRIO(0x0, thread_exit_handler, UK_PRIO_EARLIEST);
 
-#endif /* CONFIG_LIBPOSIX_PROCESS_CLONE */
+#endif /* CONFIG_LIBPOSIX_PROCESS_MULTITHREADING */