summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2017-05-30 22:16:59 +0200
committerRichard Braun <rbraun@sceen.net>2017-05-30 22:16:59 +0200
commit436fe6cb9711401fcc1f1d8fc29025f1aec5b774 (patch)
tree521e9c563f161e8faa6370372af26b3a4f5623ae /arch
parent4eaa58c85eec654eb8bf8e002b3f3a419f5ce16b (diff)
Move assert.h to the include directory
This turns assert.h into a standard header.
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/machine/acpimp.c2
-rw-r--r--arch/x86/machine/biosmem.c2
-rw-r--r--arch/x86/machine/cpu.c2
-rw-r--r--arch/x86/machine/ioapic.c2
-rw-r--r--arch/x86/machine/lapic.c2
-rw-r--r--arch/x86/machine/pic.c2
-rw-r--r--arch/x86/machine/pit.c3
-rw-r--r--arch/x86/machine/pmap.c2
-rw-r--r--arch/x86/machine/tcb.h3
-rw-r--r--arch/x86/machine/trap.c2
-rw-r--r--arch/x86/machine/uart.c2
11 files changed, 13 insertions, 11 deletions
diff --git a/arch/x86/machine/acpimp.c b/arch/x86/machine/acpimp.c
index bba2b8c..0af1ae7 100644
--- a/arch/x86/machine/acpimp.c
+++ b/arch/x86/machine/acpimp.c
@@ -15,12 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <assert.h>
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <kern/assert.h>
#include <kern/init.h>
#include <kern/kmem.h>
#include <kern/macros.h>
diff --git a/arch/x86/machine/biosmem.c b/arch/x86/machine/biosmem.c
index 65329a0..bfa22af 100644
--- a/arch/x86/machine/biosmem.c
+++ b/arch/x86/machine/biosmem.c
@@ -15,13 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <assert.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <kern/assert.h>
#include <kern/init.h>
#include <kern/macros.h>
#include <kern/panic.h>
diff --git a/arch/x86/machine/cpu.c b/arch/x86/machine/cpu.c
index eaa43ae..7c60849 100644
--- a/arch/x86/machine/cpu.c
+++ b/arch/x86/machine/cpu.c
@@ -15,12 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <assert.h>
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <kern/assert.h>
#include <kern/init.h>
#include <kern/macros.h>
#include <kern/panic.h>
diff --git a/arch/x86/machine/ioapic.c b/arch/x86/machine/ioapic.c
index 66178b3..d48cc30 100644
--- a/arch/x86/machine/ioapic.c
+++ b/arch/x86/machine/ioapic.c
@@ -15,11 +15,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <assert.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
-#include <kern/assert.h>
#include <kern/error.h>
#include <kern/init.h>
#include <kern/intr.h>
diff --git a/arch/x86/machine/lapic.c b/arch/x86/machine/lapic.c
index 6bd1d72..148a2a9 100644
--- a/arch/x86/machine/lapic.c
+++ b/arch/x86/machine/lapic.c
@@ -15,12 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <assert.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
-#include <kern/assert.h>
#include <kern/init.h>
#include <kern/macros.h>
#include <kern/panic.h>
diff --git a/arch/x86/machine/pic.c b/arch/x86/machine/pic.c
index 9084abc..52f9461 100644
--- a/arch/x86/machine/pic.c
+++ b/arch/x86/machine/pic.c
@@ -15,9 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <assert.h>
#include <stdint.h>
-#include <kern/assert.h>
#include <kern/error.h>
#include <kern/init.h>
#include <kern/intr.h>
diff --git a/arch/x86/machine/pit.c b/arch/x86/machine/pit.c
index bf53ee1..c31c7e0 100644
--- a/arch/x86/machine/pit.c
+++ b/arch/x86/machine/pit.c
@@ -15,7 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <kern/assert.h>
+#include <assert.h>
+
#include <kern/init.h>
#include <machine/io.h>
#include <machine/pit.h>
diff --git a/arch/x86/machine/pmap.c b/arch/x86/machine/pmap.c
index 1de9b09..1aab9cc 100644
--- a/arch/x86/machine/pmap.c
+++ b/arch/x86/machine/pmap.c
@@ -18,11 +18,11 @@
* TODO Review locking.
*/
+#include <assert.h>
#include <stddef.h>
#include <stdio.h>
#include <string.h>
-#include <kern/assert.h>
#include <kern/cpumap.h>
#include <kern/error.h>
#include <kern/init.h>
diff --git a/arch/x86/machine/tcb.h b/arch/x86/machine/tcb.h
index 5f45585..914ec9d 100644
--- a/arch/x86/machine/tcb.h
+++ b/arch/x86/machine/tcb.h
@@ -21,7 +21,8 @@
#ifndef _X86_TCB_H
#define _X86_TCB_H
-#include <kern/assert.h>
+#include <assert.h>
+
#include <kern/macros.h>
#include <machine/cpu.h>
diff --git a/arch/x86/machine/trap.c b/arch/x86/machine/trap.c
index 3de4fd2..e033b35 100644
--- a/arch/x86/machine/trap.c
+++ b/arch/x86/machine/trap.c
@@ -19,10 +19,10 @@
* additional configuration and resources to be properly handled.
*/
+#include <assert.h>
#include <stdint.h>
#include <stdio.h>
-#include <kern/assert.h>
#include <kern/atomic.h>
#include <kern/init.h>
#include <kern/macros.h>
diff --git a/arch/x86/machine/uart.c b/arch/x86/machine/uart.c
index 82b6c83..24fcace 100644
--- a/arch/x86/machine/uart.c
+++ b/arch/x86/machine/uart.c
@@ -18,10 +18,10 @@
* TODO Make serial line parameters configurable.
*/
+#include <assert.h>
#include <stdint.h>
#include <stdio.h>
-#include <kern/assert.h>
#include <kern/console.h>
#include <kern/error.h>
#include <kern/init.h>