Skip to content

Commit efe3074

Browse files
dcpleungnashif
authored andcommitted
kernel: rename Z_THREAD_STACK_BUFFER to K_THREAD_STACK_BUFFER
Simple rename to align the kernel naming scheme. This is being used throughout the tree, especially in the architecture code. As this is not a private API internal to kernel, prefix it appropriately with K_. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
1 parent b69d248 commit efe3074

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

arch/arc/core/thread.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ FUNC_NORETURN void z_arc_switch_to_main_no_multithreading(k_thread_entry_t main_
286286
_kernel.cpus[0].irq_stack = (K_KERNEL_STACK_BUFFER(z_interrupt_stacks[0]) +
287287
K_KERNEL_STACK_SIZEOF(z_interrupt_stacks[0]));
288288

289-
void *main_stack = (Z_THREAD_STACK_BUFFER(z_main_stack) +
289+
void *main_stack = (K_THREAD_STACK_BUFFER(z_main_stack) +
290290
K_THREAD_STACK_SIZEOF(z_main_stack));
291291

292292
arch_irq_unlock(_ARC_V2_INIT_IRQ_LOCK_KEY);

arch/arm/core/cortex_a_r/thread.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
361361
guard_len,
362362
fault_addr, psp)) {
363363
/* Thread stack corruption */
364-
return (uint32_t)Z_THREAD_STACK_BUFFER(z_main_stack);
364+
return (uint32_t)K_THREAD_STACK_BUFFER(z_main_stack);
365365
}
366366
#endif
367367
#endif /* CONFIG_USERSPACE */

arch/arm/core/cortex_m/thread.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
439439
guard_len,
440440
fault_addr, psp)) {
441441
/* Thread stack corruption */
442-
return (uint32_t)Z_THREAD_STACK_BUFFER(z_main_stack);
442+
return (uint32_t)K_THREAD_STACK_BUFFER(z_main_stack);
443443
}
444444
#endif
445445
#endif /* CONFIG_USERSPACE */
@@ -595,11 +595,11 @@ FUNC_NORETURN void z_arm_switch_to_main_no_multithreading(
595595
z_arm_prepare_switch_to_main();
596596

597597
/* Set PSP to the highest address of the main stack. */
598-
char *psp = Z_THREAD_STACK_BUFFER(z_main_stack) +
598+
char *psp = K_THREAD_STACK_BUFFER(z_main_stack) +
599599
K_THREAD_STACK_SIZEOF(z_main_stack);
600600

601601
#if defined(CONFIG_BUILTIN_STACK_GUARD)
602-
char *psplim = (Z_THREAD_STACK_BUFFER(z_main_stack));
602+
char *psplim = (K_THREAD_STACK_BUFFER(z_main_stack));
603603
/* Clear PSPLIM before setting it to guard the main stack area. */
604604
__set_PSPLIM(0);
605605
#endif

arch/riscv/core/thread.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ FUNC_NORETURN void z_riscv_switch_to_main_no_multithreading(k_thread_entry_t mai
209209
_kernel.cpus[0].irq_stack = (K_KERNEL_STACK_BUFFER(z_interrupt_stacks[0]) +
210210
K_KERNEL_STACK_SIZEOF(z_interrupt_stacks[0]));
211211

212-
main_stack = (Z_THREAD_STACK_BUFFER(z_main_stack) +
212+
main_stack = (K_THREAD_STACK_BUFFER(z_main_stack) +
213213
K_THREAD_STACK_SIZEOF(z_main_stack));
214214

215215
__asm__ volatile (

include/zephyr/kernel/thread_stack.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ static inline char *K_KERNEL_STACK_BUFFER(k_thread_stack_t *sym)
294294
#define K_THREAD_STACK_DEFINE K_KERNEL_STACK_DEFINE
295295
#define K_THREAD_STACK_ARRAY_DEFINE K_KERNEL_STACK_ARRAY_DEFINE
296296
#define K_THREAD_STACK_MEMBER K_KERNEL_STACK_MEMBER
297-
#define Z_THREAD_STACK_BUFFER K_KERNEL_STACK_BUFFER
297+
#define K_THREAD_STACK_BUFFER K_KERNEL_STACK_BUFFER
298298
#define K_THREAD_STACK_DECLARE K_KERNEL_STACK_DECLARE
299299
#define K_THREAD_STACK_ARRAY_DECLARE K_KERNEL_STACK_ARRAY_DECLARE
300300
#define K_THREAD_PINNED_STACK_DEFINE K_KERNEL_PINNED_STACK_DEFINE
@@ -650,7 +650,7 @@ static inline char *K_KERNEL_STACK_BUFFER(k_thread_stack_t *sym)
650650
* @param sym defined stack symbol name
651651
* @return The buffer itself, a char *
652652
*/
653-
static inline char *Z_THREAD_STACK_BUFFER(k_thread_stack_t *sym)
653+
static inline char *K_THREAD_STACK_BUFFER(k_thread_stack_t *sym)
654654
{
655655
return (char *)sym + K_THREAD_STACK_RESERVED;
656656
}

kernel/thread.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ static char *setup_thread_stack(struct k_thread *new_thread,
385385
#ifdef CONFIG_USERSPACE
386386
if (z_stack_is_user_capable(stack)) {
387387
stack_obj_size = Z_THREAD_STACK_SIZE_ADJUST(stack_size);
388-
stack_buf_start = Z_THREAD_STACK_BUFFER(stack);
388+
stack_buf_start = K_THREAD_STACK_BUFFER(stack);
389389
stack_buf_size = stack_obj_size - K_THREAD_STACK_RESERVED;
390390
} else
391391
#endif /* CONFIG_USERSPACE */

tests/arch/arm/arm_no_multithreading/src/main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ void test_main(void)
5959
printk("ARM no-multithreading test\n");
6060

6161
uint32_t psp = (uint32_t)__get_PSP();
62-
uint32_t main_stack_base = (uint32_t)Z_THREAD_STACK_BUFFER(z_main_stack);
63-
uint32_t main_stack_top = (uint32_t)(Z_THREAD_STACK_BUFFER(z_main_stack) +
62+
uint32_t main_stack_base = (uint32_t)K_THREAD_STACK_BUFFER(z_main_stack);
63+
uint32_t main_stack_top = (uint32_t)(K_THREAD_STACK_BUFFER(z_main_stack) +
6464
K_THREAD_STACK_SIZEOF(z_main_stack));
6565

6666
__ASSERT(

tests/kernel/threads/thread_stack/src/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void stack_buffer_scenarios(void)
114114
#ifdef CONFIG_USERSPACE
115115
if (scenario_data.is_user) {
116116
reserved = K_THREAD_STACK_RESERVED;
117-
stack_buf = Z_THREAD_STACK_BUFFER(stack_obj);
117+
stack_buf = K_THREAD_STACK_BUFFER(stack_obj);
118118
/* always use the original size here */
119119
alignment = Z_THREAD_STACK_OBJ_ALIGN(STEST_STACKSIZE);
120120
} else

0 commit comments

Comments
 (0)