From b4b108de4d2586cf86601dfe40988c79fae67c54 Mon Sep 17 00:00:00 2001
From: Benjamin Walsh <walsh.benj@gmail.com>
Date: Thu, 13 Oct 2016 10:31:48 -0400
Subject: [PATCH] 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 <benjamin.walsh@windriver.com>
---
 arch/arm/core/thread_abort.c                 | 2 +-
 kernel/unified/fifo.c                        | 2 +-
 kernel/unified/include/{sched.h => ksched.h} | 6 +++---
 kernel/unified/include/wait_q.h              | 2 +-
 kernel/unified/init.c                        | 2 +-
 kernel/unified/lifo.c                        | 2 +-
 kernel/unified/mem_map.c                     | 2 +-
 kernel/unified/mem_pool.c                    | 2 +-
 kernel/unified/offload.c                     | 2 +-
 kernel/unified/sched.c                       | 2 +-
 kernel/unified/sem.c                         | 2 +-
 kernel/unified/stack.c                       | 2 +-
 kernel/unified/thread.c                      | 2 +-
 kernel/unified/thread_abort.c                | 2 +-
 kernel/unified/timer.c                       | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)
 rename kernel/unified/include/{sched.h => ksched.h} (99%)

diff --git a/arch/arm/core/thread_abort.c b/arch/arm/core/thread_abort.c
index 6f41c91d3ab..9fe8314caa5 100644
--- a/arch/arm/core/thread_abort.c
+++ b/arch/arm/core/thread_abort.c
@@ -30,7 +30,7 @@
 #include <nano_private.h>
 #include <toolchain.h>
 #include <sections.h>
-#include <sched.h>
+#include <ksched.h>
 #include <wait_q.h>
 
 extern void _k_thread_single_abort(struct tcs *thread);
diff --git a/kernel/unified/fifo.c b/kernel/unified/fifo.c
index f0ca5486d4e..112bedeaeb7 100644
--- a/kernel/unified/fifo.c
+++ b/kernel/unified/fifo.c
@@ -27,7 +27,7 @@
 #include <toolchain.h>
 #include <sections.h>
 #include <wait_q.h>
-#include <sched.h>
+#include <ksched.h>
 #include <misc/slist.h>
 
 void k_fifo_init(struct k_fifo *fifo)
diff --git a/kernel/unified/include/sched.h b/kernel/unified/include/ksched.h
similarity index 99%
rename from kernel/unified/include/sched.h
rename to kernel/unified/include/ksched.h
index c851e404ca0..0073dc7edb4 100644
--- a/kernel/unified/include/sched.h
+++ b/kernel/unified/include/ksched.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _sched__h_
-#define _sched__h_
+#ifndef _ksched__h_
+#define _ksched__h_
 
 #include <kernel.h>
 #include <nano_private.h>
@@ -336,4 +336,4 @@ static inline void _unpend_thread(struct k_thread *thread)
 	_mark_thread_as_not_pending(thread);
 }
 
-#endif /* _sched__h_ */
+#endif /* _ksched__h_ */
diff --git a/kernel/unified/include/wait_q.h b/kernel/unified/include/wait_q.h
index a8a358d02bd..14a8d005627 100644
--- a/kernel/unified/include/wait_q.h
+++ b/kernel/unified/include/wait_q.h
@@ -23,7 +23,7 @@
 
 #ifdef CONFIG_KERNEL_V2
 #include <misc/dlist.h>
-#include <sched.h>
+#include <ksched.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/kernel/unified/init.c b/kernel/unified/init.c
index 9a5acb8244d..6d76d606a99 100644
--- a/kernel/unified/init.c
+++ b/kernel/unified/init.c
@@ -31,7 +31,7 @@
 #include <device.h>
 #include <init.h>
 #include <linker-defs.h>
-#include <sched.h>
+#include <ksched.h>
 
 /* kernel build timestamp items */
 
diff --git a/kernel/unified/lifo.c b/kernel/unified/lifo.c
index 259ed5f87b3..cbd9720640e 100644
--- a/kernel/unified/lifo.c
+++ b/kernel/unified/lifo.c
@@ -25,7 +25,7 @@
 #include <toolchain.h>
 #include <sections.h>
 #include <wait_q.h>
-#include <sched.h>
+#include <ksched.h>
 
 void k_lifo_init(struct k_lifo *lifo)
 {
diff --git a/kernel/unified/mem_map.c b/kernel/unified/mem_map.c
index ad3da0b5453..7c19e209435 100644
--- a/kernel/unified/mem_map.c
+++ b/kernel/unified/mem_map.c
@@ -21,7 +21,7 @@
 #include <sections.h>
 #include <wait_q.h>
 #include <misc/dlist.h>
-#include <sched.h>
+#include <ksched.h>
 #include <init.h>
 
 extern struct k_mem_map _k_mem_map_ptr_start[];
diff --git a/kernel/unified/mem_pool.c b/kernel/unified/mem_pool.c
index 37ebbc5dc8a..b524c671ce6 100644
--- a/kernel/unified/mem_pool.c
+++ b/kernel/unified/mem_pool.c
@@ -21,7 +21,7 @@
 #include <kernel.h>
 #include <nano_private.h>
 #include <misc/debug/object_tracing_common.h>
-#include <sched.h>
+#include <ksched.h>
 #include <wait_q.h>
 #include <init.h>
 
diff --git a/kernel/unified/offload.c b/kernel/unified/offload.c
index 14fd7b840e3..a0e228d27eb 100644
--- a/kernel/unified/offload.c
+++ b/kernel/unified/offload.c
@@ -23,7 +23,7 @@
 
 #include <kernel.h>
 #include <nano_private.h>
-#include <sched.h>
+#include <ksched.h>
 #include <init.h>
 
 struct offload_work {
diff --git a/kernel/unified/sched.c b/kernel/unified/sched.c
index b663bad3761..a03b1387055 100644
--- a/kernel/unified/sched.c
+++ b/kernel/unified/sched.c
@@ -17,7 +17,7 @@
 #include <kernel.h>
 #include <nano_private.h>
 #include <atomic.h>
-#include <sched.h>
+#include <ksched.h>
 #include <wait_q.h>
 
 /* set the bit corresponding to prio in ready q bitmap */
diff --git a/kernel/unified/sem.c b/kernel/unified/sem.c
index 681b67e3e5c..1907aab8f73 100644
--- a/kernel/unified/sem.c
+++ b/kernel/unified/sem.c
@@ -33,7 +33,7 @@
 #include <sections.h>
 #include <wait_q.h>
 #include <misc/dlist.h>
-#include <sched.h>
+#include <ksched.h>
 
 #ifdef CONFIG_SEMAPHORE_GROUPS
 struct _sem_desc {
diff --git a/kernel/unified/stack.c b/kernel/unified/stack.c
index 32b5787c2ad..2a3e6e5efde 100644
--- a/kernel/unified/stack.c
+++ b/kernel/unified/stack.c
@@ -23,7 +23,7 @@
 #include <misc/debug/object_tracing_common.h>
 #include <toolchain.h>
 #include <sections.h>
-#include <sched.h>
+#include <ksched.h>
 #include <wait_q.h>
 #include <misc/__assert.h>
 
diff --git a/kernel/unified/thread.c b/kernel/unified/thread.c
index 39430592a6b..28f30eecef8 100644
--- a/kernel/unified/thread.c
+++ b/kernel/unified/thread.c
@@ -31,7 +31,7 @@
 #include <misc/printk.h>
 #include <sys_clock.h>
 #include <drivers/system_timer.h>
-#include <sched.h>
+#include <ksched.h>
 #include <wait_q.h>
 
 extern struct _static_thread_data _k_task_list_start[];
diff --git a/kernel/unified/thread_abort.c b/kernel/unified/thread_abort.c
index 4fe807a8402..50194048900 100644
--- a/kernel/unified/thread_abort.c
+++ b/kernel/unified/thread_abort.c
@@ -27,7 +27,7 @@
 #include <toolchain.h>
 #include <sections.h>
 #include <wait_q.h>
-#include <sched.h>
+#include <ksched.h>
 
 extern void _k_thread_single_abort(struct k_thread *thread);
 
diff --git a/kernel/unified/timer.c b/kernel/unified/timer.c
index 5f9686d7ebf..870546f1f20 100644
--- a/kernel/unified/timer.c
+++ b/kernel/unified/timer.c
@@ -17,7 +17,7 @@
 #include <nano_private.h>
 #include <misc/debug/object_tracing_common.h>
 #include <wait_q.h>
-#include <sched.h>
+#include <ksched.h>
 #include <init.h>
 
 /**