Skip to content

Commit b4b108d

Browse files
bboccoqqbenwrs
authored andcommitted
unified: rename sched.h to ksched.h
Build breaks when enabling CONFIG_NEWLIB_LIBC because it has its own sched.h file. This is a bad symptom of a greater issue: the build system passes many '-I<path>' options to the compiler, and that allows including header files by simply specifying their names (when located somewhere else than <zephyr>/include/) and can cause clashes when several files in different locations have the same name, like in this case. Fixes ZEP-1062. Change-Id: I81d1d69ee6669a609cd0c420b1b8f870d17dcb67 Signed-off-by: Benjamin Walsh <[email protected]>
1 parent 3751123 commit b4b108d

File tree

15 files changed

+17
-17
lines changed

15 files changed

+17
-17
lines changed

arch/arm/core/thread_abort.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <nano_private.h>
3131
#include <toolchain.h>
3232
#include <sections.h>
33-
#include <sched.h>
33+
#include <ksched.h>
3434
#include <wait_q.h>
3535

3636
extern void _k_thread_single_abort(struct tcs *thread);

kernel/unified/fifo.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <toolchain.h>
2828
#include <sections.h>
2929
#include <wait_q.h>
30-
#include <sched.h>
30+
#include <ksched.h>
3131
#include <misc/slist.h>
3232

3333
void k_fifo_init(struct k_fifo *fifo)

kernel/unified/include/sched.h renamed to kernel/unified/include/ksched.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef _sched__h_
18-
#define _sched__h_
17+
#ifndef _ksched__h_
18+
#define _ksched__h_
1919

2020
#include <kernel.h>
2121
#include <nano_private.h>
@@ -336,4 +336,4 @@ static inline void _unpend_thread(struct k_thread *thread)
336336
_mark_thread_as_not_pending(thread);
337337
}
338338

339-
#endif /* _sched__h_ */
339+
#endif /* _ksched__h_ */

kernel/unified/include/wait_q.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#ifdef CONFIG_KERNEL_V2
2525
#include <misc/dlist.h>
26-
#include <sched.h>
26+
#include <ksched.h>
2727
#endif
2828

2929
#ifdef __cplusplus

kernel/unified/init.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <device.h>
3232
#include <init.h>
3333
#include <linker-defs.h>
34-
#include <sched.h>
34+
#include <ksched.h>
3535

3636
/* kernel build timestamp items */
3737

kernel/unified/lifo.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <toolchain.h>
2626
#include <sections.h>
2727
#include <wait_q.h>
28-
#include <sched.h>
28+
#include <ksched.h>
2929

3030
void k_lifo_init(struct k_lifo *lifo)
3131
{

kernel/unified/mem_map.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <sections.h>
2222
#include <wait_q.h>
2323
#include <misc/dlist.h>
24-
#include <sched.h>
24+
#include <ksched.h>
2525
#include <init.h>
2626

2727
extern struct k_mem_map _k_mem_map_ptr_start[];

kernel/unified/mem_pool.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <kernel.h>
2222
#include <nano_private.h>
2323
#include <misc/debug/object_tracing_common.h>
24-
#include <sched.h>
24+
#include <ksched.h>
2525
#include <wait_q.h>
2626
#include <init.h>
2727

kernel/unified/offload.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <kernel.h>
2525
#include <nano_private.h>
26-
#include <sched.h>
26+
#include <ksched.h>
2727
#include <init.h>
2828

2929
struct offload_work {

kernel/unified/sched.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <kernel.h>
1818
#include <nano_private.h>
1919
#include <atomic.h>
20-
#include <sched.h>
20+
#include <ksched.h>
2121
#include <wait_q.h>
2222

2323
/* set the bit corresponding to prio in ready q bitmap */

kernel/unified/sem.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <sections.h>
3434
#include <wait_q.h>
3535
#include <misc/dlist.h>
36-
#include <sched.h>
36+
#include <ksched.h>
3737

3838
#ifdef CONFIG_SEMAPHORE_GROUPS
3939
struct _sem_desc {

kernel/unified/stack.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <misc/debug/object_tracing_common.h>
2424
#include <toolchain.h>
2525
#include <sections.h>
26-
#include <sched.h>
26+
#include <ksched.h>
2727
#include <wait_q.h>
2828
#include <misc/__assert.h>
2929

kernel/unified/thread.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <misc/printk.h>
3232
#include <sys_clock.h>
3333
#include <drivers/system_timer.h>
34-
#include <sched.h>
34+
#include <ksched.h>
3535
#include <wait_q.h>
3636

3737
extern struct _static_thread_data _k_task_list_start[];

kernel/unified/thread_abort.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <toolchain.h>
2828
#include <sections.h>
2929
#include <wait_q.h>
30-
#include <sched.h>
30+
#include <ksched.h>
3131

3232
extern void _k_thread_single_abort(struct k_thread *thread);
3333

kernel/unified/timer.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <nano_private.h>
1818
#include <misc/debug/object_tracing_common.h>
1919
#include <wait_q.h>
20-
#include <sched.h>
20+
#include <ksched.h>
2121
#include <init.h>
2222

2323
/**

0 commit comments

Comments
 (0)