Skip to content

Commit cffefc8

Browse files
gmarullcarlescufi
authored andcommitted
kernel: migrate includes to <zephyr/...>
In order to bring consistency in-tree, migrate all kernel code to the new prefix <zephyr/...>. Note that the conversion has been scripted, refer to zephyrproject-rtos#45388 for more details. Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
1 parent 6388778 commit cffefc8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+258
-258
lines changed

kernel/atomic_c.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
* (originally from x86's atomic.c)
1919
*/
2020

21-
#include <toolchain.h>
22-
#include <arch/cpu.h>
23-
#include <spinlock.h>
24-
#include <sys/atomic.h>
25-
#include <kernel_structs.h>
21+
#include <zephyr/toolchain.h>
22+
#include <zephyr/arch/cpu.h>
23+
#include <zephyr/spinlock.h>
24+
#include <zephyr/sys/atomic.h>
25+
#include <zephyr/kernel_structs.h>
2626

2727
/* Single global spinlock for atomic operations. This is fallback
2828
* code, not performance sensitive. At least by not using irq_lock()
@@ -37,7 +37,7 @@ static struct k_spinlock lock;
3737
* forbidden.
3838
*/
3939
#ifdef CONFIG_USERSPACE
40-
#include <syscall_handler.h>
40+
#include <zephyr/syscall_handler.h>
4141

4242
#define ATOMIC_SYSCALL_HANDLER_TARGET(name) \
4343
static inline atomic_val_t z_vrfy_##name(atomic_t *target) \

kernel/banner.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <kernel.h>
8-
#include <sys/util.h>
9-
#include <init.h>
10-
#include <device.h>
7+
#include <zephyr/kernel.h>
8+
#include <zephyr/sys/util.h>
9+
#include <zephyr/init.h>
10+
#include <zephyr/device.h>
1111
#include <version.h>
1212

1313
/* boot banner items */

kernel/cache_handlers.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <cache.h>
8-
#include <syscall_handler.h>
7+
#include <zephyr/cache.h>
8+
#include <zephyr/syscall_handler.h>
99

1010
static inline int z_vrfy_sys_cache_data_all(int op)
1111
{

kernel/compiler_stack_protect.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
* function __stack_chk_fail and global variable __stack_chk_guard.
1717
*/
1818

19-
#include <toolchain.h> /* compiler specific configurations */
19+
#include <zephyr/toolchain.h> /* compiler specific configurations */
2020

21-
#include <kernel_structs.h>
22-
#include <toolchain.h>
23-
#include <linker/sections.h>
24-
#include <kernel.h>
25-
#include <app_memory/app_memdomain.h>
21+
#include <zephyr/kernel_structs.h>
22+
#include <zephyr/toolchain.h>
23+
#include <zephyr/linker/sections.h>
24+
#include <zephyr/kernel.h>
25+
#include <zephyr/app_memory/app_memdomain.h>
2626

2727
/**
2828
*

kernel/condvar.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <kernel.h>
8-
#include <kernel_structs.h>
9-
#include <toolchain.h>
7+
#include <zephyr/kernel.h>
8+
#include <zephyr/kernel_structs.h>
9+
#include <zephyr/toolchain.h>
1010
#include <ksched.h>
11-
#include <wait_q.h>
12-
#include <syscall_handler.h>
11+
#include <zephyr/wait_q.h>
12+
#include <zephyr/syscall_handler.h>
1313

1414
static struct k_spinlock lock;
1515

kernel/device.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66

77
#include <string.h>
8-
#include <device.h>
9-
#include <sys/atomic.h>
10-
#include <syscall_handler.h>
8+
#include <zephyr/device.h>
9+
#include <zephyr/sys/atomic.h>
10+
#include <zephyr/syscall_handler.h>
1111

1212
extern const struct init_entry __init_start[];
1313
extern const struct init_entry __init_PRE_KERNEL_1_start[];

kernel/errno.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* context switching.
1313
*/
1414

15-
#include <kernel.h>
16-
#include <syscall_handler.h>
15+
#include <zephyr/kernel.h>
16+
#include <zephyr/syscall_handler.h>
1717

1818
/*
1919
* Define _k_neg_eagain for use in assembly files as errno.h is

kernel/events.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
* @brief Kernel event object
2222
*/
2323

24-
#include <kernel.h>
25-
#include <kernel_structs.h>
24+
#include <zephyr/kernel.h>
25+
#include <zephyr/kernel_structs.h>
2626

27-
#include <toolchain.h>
28-
#include <wait_q.h>
29-
#include <sys/dlist.h>
27+
#include <zephyr/toolchain.h>
28+
#include <zephyr/wait_q.h>
29+
#include <zephyr/sys/dlist.h>
3030
#include <ksched.h>
31-
#include <init.h>
32-
#include <syscall_handler.h>
33-
#include <tracing/tracing.h>
34-
#include <sys/check.h>
31+
#include <zephyr/init.h>
32+
#include <zephyr/syscall_handler.h>
33+
#include <zephyr/tracing/tracing.h>
34+
#include <zephyr/sys/check.h>
3535

3636
#define K_EVENT_WAIT_ANY 0x00 /* Wait for any events */
3737
#define K_EVENT_WAIT_ALL 0x01 /* Wait for all events */

kernel/fatal.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <kernel.h>
7+
#include <zephyr/kernel.h>
88

99
#include <kernel_internal.h>
10-
#include <kernel_structs.h>
11-
#include <sys/__assert.h>
12-
#include <arch/cpu.h>
13-
#include <logging/log_ctrl.h>
14-
#include <logging/log.h>
15-
#include <fatal.h>
16-
#include <debug/coredump.h>
10+
#include <zephyr/kernel_structs.h>
11+
#include <zephyr/sys/__assert.h>
12+
#include <zephyr/arch/cpu.h>
13+
#include <zephyr/logging/log_ctrl.h>
14+
#include <zephyr/logging/log.h>
15+
#include <zephyr/fatal.h>
16+
#include <zephyr/debug/coredump.h>
1717

1818
LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
1919

kernel/futex.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <kernel.h>
8-
#include <kernel_structs.h>
9-
#include <spinlock.h>
7+
#include <zephyr/kernel.h>
8+
#include <zephyr/kernel_structs.h>
9+
#include <zephyr/spinlock.h>
1010
#include <kswap.h>
11-
#include <syscall_handler.h>
12-
#include <init.h>
11+
#include <zephyr/syscall_handler.h>
12+
#include <zephyr/init.h>
1313
#include <ksched.h>
1414

1515
static struct z_futex_data *k_futex_find_data(struct k_futex *futex)

0 commit comments

Comments
 (0)