SELFOUR-1283: Use arch include dir and include sel4_arch from there

diff --git a/libsel4allocman/CMakeLists.txt b/libsel4allocman/CMakeLists.txt
index 235f4b3..1692376 100644
--- a/libsel4allocman/CMakeLists.txt
+++ b/libsel4allocman/CMakeLists.txt

@@ -22,4 +22,5 @@
 
 add_library(sel4allocman STATIC EXCLUDE_FROM_ALL ${deps})
 target_include_directories(sel4allocman PUBLIC include "sel4_arch/${KernelSel4Arch}")
+target_include_directories(sel4allocman PUBLIC include "arch/${KernelArch}")
 target_link_libraries(sel4allocman Configuration muslc sel4 sel4vka sel4utils)

diff --git a/libsel4allocman/Makefile b/libsel4allocman/Makefile
index 0e62795..c68e45d 100644
--- a/libsel4allocman/Makefile
+++ b/libsel4allocman/Makefile

@@ -21,7 +21,8 @@
 
 # Header files/directories this library provides
 HDRFILES := $(sort $(wildcard $(SOURCE_DIR)/include/*)) \
-    $(sort $(wildcard ${SOURCE_DIR}/sel4_arch/${SEL4_ARCH}/*))
+	$(sort $(wildcard ${SOURCE_DIR}/sel4_arch/${SEL4_ARCH}/*)) \
+	$(sort $(wildcard ${SOURCE_DIR}/arch/${ARCH}/*))
 
 CFLAGS += -std=gnu99
 

diff --git a/libsel4allocman/arch/arm/allocman/arch/mapping.h b/libsel4allocman/arch/arm/allocman/arch/mapping.h
new file mode 100644
index 0000000..7c1db87
--- /dev/null
+++ b/libsel4allocman/arch/arm/allocman/arch/mapping.h

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
+ *
+ * This software may be distributed and modified according to the terms of
+ * the BSD 2-Clause license. Note that NO WARRANTY is provided.
+ * See "LICENSE_BSD2.txt" for details.
+ *
+ * @TAG(DATA61_BSD)
+ */
+
+#pragma once
+
+#include <allocman/sel4_arch/mapping.h>

diff --git a/libsel4allocman/arch/arm/allocman/arch/reservation.h b/libsel4allocman/arch/arm/allocman/arch/reservation.h
new file mode 100644
index 0000000..628d0f3
--- /dev/null
+++ b/libsel4allocman/arch/arm/allocman/arch/reservation.h

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
+ *
+ * This software may be distributed and modified according to the terms of
+ * the BSD 2-Clause license. Note that NO WARRANTY is provided.
+ * See "LICENSE_BSD2.txt" for details.
+ *
+ * @TAG(DATA61_BSD)
+ */
+
+#pragma once
+
+#include <allocman/sel4_arch/reservation.h>

diff --git a/libsel4allocman/arch/x86/allocman/arch/mapping.h b/libsel4allocman/arch/x86/allocman/arch/mapping.h
new file mode 100644
index 0000000..7c1db87
--- /dev/null
+++ b/libsel4allocman/arch/x86/allocman/arch/mapping.h

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
+ *
+ * This software may be distributed and modified according to the terms of
+ * the BSD 2-Clause license. Note that NO WARRANTY is provided.
+ * See "LICENSE_BSD2.txt" for details.
+ *
+ * @TAG(DATA61_BSD)
+ */
+
+#pragma once
+
+#include <allocman/sel4_arch/mapping.h>

diff --git a/libsel4allocman/arch/x86/allocman/arch/reservation.h b/libsel4allocman/arch/x86/allocman/arch/reservation.h
new file mode 100644
index 0000000..628d0f3
--- /dev/null
+++ b/libsel4allocman/arch/x86/allocman/arch/reservation.h

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
+ *
+ * This software may be distributed and modified according to the terms of
+ * the BSD 2-Clause license. Note that NO WARRANTY is provided.
+ * See "LICENSE_BSD2.txt" for details.
+ *
+ * @TAG(DATA61_BSD)
+ */
+
+#pragma once
+
+#include <allocman/sel4_arch/reservation.h>

diff --git a/libsel4allocman/src/bootstrap.c b/libsel4allocman/src/bootstrap.c
index f9bfec8..0a85761 100644
--- a/libsel4allocman/src/bootstrap.c
+++ b/libsel4allocman/src/bootstrap.c

@@ -19,7 +19,7 @@
 #include <allocman/mspace/dual_pool.h>
 #include <allocman/utspace/split.h>
 #include <allocman/bootstrap.h>
-#include <allocman/sel4_arch/reservation.h>
+#include <allocman/arch/reservation.h>
 #include <stdio.h>
 #include <vka/capops.h>
 #include <vka/object.h>

diff --git a/libsel4allocman/src/mspace/virtual_pool.c b/libsel4allocman/src/mspace/virtual_pool.c
index 61c6f2b..594dd9c 100644
--- a/libsel4allocman/src/mspace/virtual_pool.c
+++ b/libsel4allocman/src/mspace/virtual_pool.c

@@ -17,7 +17,7 @@
 #include <sel4/sel4.h>
 #include <sel4utils/mapping.h>
 #include <vka/kobject_t.h>
-#include <allocman/sel4_arch/mapping.h>
+#include <allocman/arch/mapping.h>
 #include <string.h>
 
 /* This allocator deliberately does not use the vspace library to prevent