diff --git a/kernel/include/kernel_offsets.h b/kernel/include/kernel_offsets.h index 7a35c956724..cb459c96a2f 100644 --- a/kernel/include/kernel_offsets.h +++ b/kernel/include/kernel_offsets.h @@ -46,7 +46,7 @@ GEN_OFFSET_SYM(_ready_q_t, cache); GEN_OFFSET_SYM(_kernel_t, current_fp); #endif -GEN_ABSOLUTE_SYM(_STRUCT_KERNEL_SIZE, sizeof(struct _kernel)); +GEN_ABSOLUTE_SYM(_STRUCT_KERNEL_SIZE, sizeof(struct z_kernel)); GEN_OFFSET_SYM(_thread_base_t, user_options); GEN_OFFSET_SYM(_thread_base_t, thread_state); diff --git a/kernel/include/kernel_structs.h b/kernel/include/kernel_structs.h index e1615c53799..46e79fb50c1 100644 --- a/kernel/include/kernel_structs.h +++ b/kernel/include/kernel_structs.h @@ -111,7 +111,7 @@ struct _cpu { typedef struct _cpu _cpu_t; -struct _kernel { +struct z_kernel { /* For compatibility with pre-SMP code, union the first CPU * record with the legacy fields so code can continue to use * the "_kernel.XXX" expressions and assembly offsets. @@ -169,9 +169,9 @@ struct _kernel { struct _kernel_arch arch; }; -typedef struct _kernel _kernel_t; +typedef struct z_kernel _kernel_t; -extern struct _kernel _kernel; +extern struct z_kernel _kernel; #ifdef CONFIG_SMP #define _current_cpu (_arch_curr_cpu()) diff --git a/kernel/sched.c b/kernel/sched.c index 1ac656ccafd..47b0ad233b3 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -37,8 +37,8 @@ #define _priq_wait_best _priq_dumb_best #endif -/* the only struct _kernel instance */ -struct _kernel _kernel; +/* the only struct z_kernel instance */ +struct z_kernel _kernel; static struct k_spinlock sched_lock; diff --git a/subsys/debug/openocd.c b/subsys/debug/openocd.c index df6dcd2e1e0..95d97a15c8a 100644 --- a/subsys/debug/openocd.c +++ b/subsys/debug/openocd.c @@ -34,8 +34,8 @@ __attribute__((used, section(".openocd_dbg"))) size_t _kernel_openocd_offsets[] = { /* Version 0 starts */ [OPENOCD_OFFSET_VERSION] = 1, - [OPENOCD_OFFSET_K_CURR_THREAD] = offsetof(struct _kernel, current), - [OPENOCD_OFFSET_K_THREADS] = offsetof(struct _kernel, threads), + [OPENOCD_OFFSET_K_CURR_THREAD] = offsetof(struct z_kernel, current), + [OPENOCD_OFFSET_K_THREADS] = offsetof(struct z_kernel, threads), [OPENOCD_OFFSET_T_ENTRY] = offsetof(struct k_thread, entry), [OPENOCD_OFFSET_T_NEXT_THREAD] = offsetof(struct k_thread, next_thread), [OPENOCD_OFFSET_T_STATE] = offsetof(struct _thread_base, thread_state), diff --git a/tests/kernel/mem_protect/app_memory/src/main.c b/tests/kernel/mem_protect/app_memory/src/main.c index 61c4d77f97b..83e0dd61cbe 100644 --- a/tests/kernel/mem_protect/app_memory/src/main.c +++ b/tests/kernel/mem_protect/app_memory/src/main.c @@ -29,7 +29,7 @@ struct test_struct __kernel_bss kernel_bss; struct test_struct __kernel_noinit kernel_noinit; /* Real kernel variable, check it is in the right place */ -extern struct _kernel _kernel; +extern struct z_kernel _kernel; struct test_struct app_data = {3, 4, NULL}; struct test_struct app_bss;