[Minios-devel] [UNIKRAFT PATCH] plat/common: arm: Include correct inline function __uk_test_and_clear_bit

[Wei Chen <wei.chen@xxxxxxx>]

As __uk_test_and_clear_bit has been moved to uk/bitops.h, the time.c could
not find this function from atomic.h. This will cause Arm64 build failed:

  LD      unikraft_kvm-arm64
/root/UF/unikraft/build/unikraft_kvm-arm64.o: In function `time_block_until':
:(.text+0x400): undefined reference to `__uk_test_and_clear_bit'
:(.text+0x400): relocation truncated to fit: R_AARCH64_CALL26 against undefined 
symbol `__uk_test_and_clear_bit'
collect2: error: ld returned 1 exit status
/root/UF/unikraft/plat/kvm/Linker.uk:17: recipe for target 
'/root/UF/unikraft/build/unikraft_kvm-arm64' failed
make: *** [/root/UF/unikraft/build/unikraft_kvm-arm64] Error 1

Change atomic.h to bitops.h to solve this problem.

Signed-off-by: Wei Chen <wei.chen@xxxxxxx>
---
 plat/common/arm/time.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plat/common/arm/time.c b/plat/common/arm/time.c
index f1df98d..583387b 100644
--- a/plat/common/arm/time.c
+++ b/plat/common/arm/time.c
@@ -36,7 +36,7 @@
 #include <uk/assert.h>
 #include <uk/plat/time.h>
 #include <uk/plat/irq.h>
-#include <uk/arch/atomic.h>
+#include <uk/bitops.h>
 #include <cpu.h>
 
 static uint64_t boot_ticks;
-- 
2.17.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel