From 48f516469abf2000624033ea400156f9067642ca Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Thu, 16 Dec 2021 12:47:32 -0500 Subject: [PATCH] kernel: Fix typo in macro name Fixes a typo in the macro ARCH_DYMANIC_OBJ_K_THREAD_ALIGNMENT so that DYMANIC becomes DYNAMIC. Signed-off-by: Peter Mitsis --- include/arch/x86/ia32/arch.h | 6 +++--- include/arch/x86/intel64/arch.h | 2 +- kernel/userspace.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/arch/x86/ia32/arch.h b/include/arch/x86/ia32/arch.h index 19c59d7abf2..29fd3368099 100644 --- a/include/arch/x86/ia32/arch.h +++ b/include/arch/x86/ia32/arch.h @@ -435,13 +435,13 @@ extern struct task_state_segment _main_tss; */ #if defined(CONFIG_EAGER_FPU_SHARING) || defined(CONFIG_LAZY_FPU_SHARING) #ifdef CONFIG_SSE -#define ARCH_DYMANIC_OBJ_K_THREAD_ALIGNMENT 16 +#define ARCH_DYNAMIC_OBJ_K_THREAD_ALIGNMENT 16 #else -#define ARCH_DYMANIC_OBJ_K_THREAD_ALIGNMENT (sizeof(void *)) +#define ARCH_DYNAMIC_OBJ_K_THREAD_ALIGNMENT (sizeof(void *)) #endif #else /* No special alignment requirements, simply align on pointer size. */ -#define ARCH_DYMANIC_OBJ_K_THREAD_ALIGNMENT (sizeof(void *)) +#define ARCH_DYNAMIC_OBJ_K_THREAD_ALIGNMENT (sizeof(void *)) #endif /* CONFIG_*_FP_SHARING */ diff --git a/include/arch/x86/intel64/arch.h b/include/arch/x86/intel64/arch.h index f016eb17c2a..b428e55b0c6 100644 --- a/include/arch/x86/intel64/arch.h +++ b/include/arch/x86/intel64/arch.h @@ -147,6 +147,6 @@ struct x86_ssf { /* * Thread object needs to be 16-byte aligned. */ -#define ARCH_DYMANIC_OBJ_K_THREAD_ALIGNMENT 16 +#define ARCH_DYNAMIC_OBJ_K_THREAD_ALIGNMENT 16 #endif /* ZEPHYR_INCLUDE_ARCH_X86_INTEL64_ARCH_H_ */ diff --git a/kernel/userspace.c b/kernel/userspace.c index 7d4439fe336..cdf8ee75740 100644 --- a/kernel/userspace.c +++ b/kernel/userspace.c @@ -124,8 +124,8 @@ uint8_t *z_priv_stack_find(k_thread_stack_t *stack) * the maximum alignment needed for all kernel objects * (hence the following DYN_OBJ_DATA_ALIGN). */ -#ifdef ARCH_DYMANIC_OBJ_K_THREAD_ALIGNMENT -#define DYN_OBJ_DATA_ALIGN_K_THREAD (ARCH_DYMANIC_OBJ_K_THREAD_ALIGNMENT) +#ifdef ARCH_DYNAMIC_OBJ_K_THREAD_ALIGNMENT +#define DYN_OBJ_DATA_ALIGN_K_THREAD (ARCH_DYNAMIC_OBJ_K_THREAD_ALIGNMENT) #else #define DYN_OBJ_DATA_ALIGN_K_THREAD (sizeof(void *)) #endif @@ -187,8 +187,8 @@ static size_t obj_align_get(enum k_objects otype) switch (otype) { case K_OBJ_THREAD: -#ifdef ARCH_DYMANIC_OBJ_K_THREAD_ALIGNMENT - ret = ARCH_DYMANIC_OBJ_K_THREAD_ALIGNMENT; +#ifdef ARCH_DYNAMIC_OBJ_K_THREAD_ALIGNMENT + ret = ARCH_DYNAMIC_OBJ_K_THREAD_ALIGNMENT; #else ret = __alignof(struct dyn_obj); #endif