From 01369546d2c1f2859106c277c5b7c8f028464ec4 Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Fri, 19 Jan 2024 13:09:01 +0100 Subject: [PATCH] dde_linux: adjust wireguard and test to arm_v8 spec 'arm_64' has been moved to 'arm_v8' issue #5095 --- repos/dde_linux/recipes/src/wireguard/content.mk | 4 ++-- repos/dde_linux/src/app/wireguard/dummies.c | 3 +++ .../src/app/wireguard/spec/x86_64/generated_dummies.c | 10 +++++++++- .../src/test/driver_time/spec/arm_64/target.mk | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/repos/dde_linux/recipes/src/wireguard/content.mk b/repos/dde_linux/recipes/src/wireguard/content.mk index a04a0e1860..a53ddbe9dc 100644 --- a/repos/dde_linux/recipes/src/wireguard/content.mk +++ b/repos/dde_linux/recipes/src/wireguard/content.mk @@ -1,6 +1,6 @@ MIRRORED_FROM_REP_DIR := \ - lib/mk/spec/arm_64/wireguard.mk \ - lib/mk/spec/arm_64/wireguard_lx_inc_dirs.mk \ + lib/mk/spec/arm_v8/wireguard.mk \ + lib/mk/spec/arm_v8/wireguard_lx_inc_dirs.mk \ lib/mk/spec/x86_64/wireguard.mk \ lib/mk/spec/x86_64/wireguard_lx_inc_dirs.mk \ lib/mk/wireguard.inc \ diff --git a/repos/dde_linux/src/app/wireguard/dummies.c b/repos/dde_linux/src/app/wireguard/dummies.c index e19d632a96..bdcf759a24 100644 --- a/repos/dde_linux/src/app/wireguard/dummies.c +++ b/repos/dde_linux/src/app/wireguard/dummies.c @@ -15,6 +15,9 @@ #include +DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map); +EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); + extern int __init buses_init(void); int __init buses_init(void) { diff --git a/repos/dde_linux/src/app/wireguard/spec/x86_64/generated_dummies.c b/repos/dde_linux/src/app/wireguard/spec/x86_64/generated_dummies.c index 4b4fd55d0c..b55d4b947e 100644 --- a/repos/dde_linux/src/app/wireguard/spec/x86_64/generated_dummies.c +++ b/repos/dde_linux/src/app/wireguard/spec/x86_64/generated_dummies.c @@ -1,7 +1,7 @@ /* * \brief Dummy definitions of Linux Kernel functions * \author Automatically generated file - do no edit - * \date 2023-12-06 + * \date 2024-01-25 */ #include @@ -133,6 +133,14 @@ void ack_bad_irq(unsigned int irq) } +#include + +const struct cpumask * cpu_clustergroup_mask(int cpu) +{ + lx_emul_trace_and_stop(__func__); +} + + #include noinstr void ct_irq_enter(void) diff --git a/repos/dde_linux/src/test/driver_time/spec/arm_64/target.mk b/repos/dde_linux/src/test/driver_time/spec/arm_64/target.mk index 209599a14c..26be425634 100644 --- a/repos/dde_linux/src/test/driver_time/spec/arm_64/target.mk +++ b/repos/dde_linux/src/test/driver_time/spec/arm_64/target.mk @@ -1,4 +1,4 @@ -REQUIRES := arm_64 +REQUIRES := arm_v8 SRC_CC += timestamp.cc SRC_C += lx_emul.c