inmates: arm: Flatten include path

Move inmate.h and gic.h one level down, removing "inmates/" from their
path. This allows to reference inmate.h in generic library modules.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/inmates/demos/arm/gic-demo.c b/inmates/demos/arm/gic-demo.c
index 330da6669430da00182f115e91fa6a5c6fadc0cf..25876c20353797f2ce433845f00202e2b14a589f 100644 (file)
--- a/inmates/demos/arm/gic-demo.c
+++ b/inmates/demos/arm/gic-demo.c
@@ -11,8 +11,8 @@
  */
 
 #include <asm/gic_common.h>
-#include <inmates/inmate.h>
 #include <mach/timer.h>
+#include <inmate.h>
 
 #define BEATS_PER_SEC          10
 

diff --git a/inmates/demos/arm/uart-demo.c b/inmates/demos/arm/uart-demo.c
index fd72164459d17f67231d27be9425db22e825beb6..46be1ce6a2788b1e9b908dee5f6323777fe27aea 100644 (file)
--- a/inmates/demos/arm/uart-demo.c
+++ b/inmates/demos/arm/uart-demo.c
@@ -10,7 +10,7 @@
  * the COPYING file in the top-level directory.
  */
 
-#include <inmates/inmate.h>
+#include <inmate.h>
 
 /*
  * To ease the debugging, we can send a spurious hypercall, which should return

diff --git a/inmates/lib/arm/gic-v2.c b/inmates/lib/arm/gic-v2.c
index f14a74252afff9f9f4eaf6633cb1632d9340cdbc..8c6434c7c61b8aaa1c4a6e69a77f2658e365578d 100644 (file)
--- a/inmates/lib/arm/gic-v2.c
+++ b/inmates/lib/arm/gic-v2.c
@@ -11,9 +11,8 @@
  */
 #include <asm/gic_common.h>
 #include <asm/gic_v2.h>
-#include <inmates/gic.h>
-#include <inmates/inmate.h>
 #include <mach/gic_v2.h>
+#include <gic.h>
 
 void gic_enable(unsigned int irqn)
 {

diff --git a/inmates/lib/arm/gic-v3.c b/inmates/lib/arm/gic-v3.c
index fd4dfe69a74d2903ebfd54a0a51f52ae3cbae251..36c0cb2a3d44a123c75802c5ab7367f1bab292a8 100644 (file)
--- a/inmates/lib/arm/gic-v3.c
+++ b/inmates/lib/arm/gic-v3.c
@@ -11,8 +11,8 @@
  */
 #include <asm/gic_common.h>
 #include <asm/gic_v3.h>
-#include <inmates/gic.h>
 #include <mach/gic_v3.h>
+#include <gic.h>
 
 void gic_enable(unsigned int irqn)
 {

diff --git a/inmates/lib/arm/gic.c b/inmates/lib/arm/gic.c
index 6f7db8c320ae6342b9b1028a077ad03d5c9950de..0ab819855826139ae1dbdb4f00a451e362d9b9cf 100644 (file)
--- a/inmates/lib/arm/gic.c
+++ b/inmates/lib/arm/gic.c
@@ -10,8 +10,8 @@
  * the COPYING file in the top-level directory.
  */
 
-#include <inmates/inmate.h>
-#include <inmates/gic.h>
+#include <inmate.h>
+#include <gic.h>
 
 static irq_handler_t irq_handler = (irq_handler_t)NULL;
 static __attribute__((aligned(0x1000))) u32 irq_stack[1024];

diff --git a/inmates/lib/arm/include/inmates/gic.h b/inmates/lib/arm/include/gic.h
similarity index 100%
rename from inmates/lib/arm/include/inmates/gic.h
rename to inmates/lib/arm/include/gic.h

diff --git a/inmates/lib/arm/include/inmates/inmate.h b/inmates/lib/arm/include/inmate.h
similarity index 92%
rename from inmates/lib/arm/include/inmates/inmate.h
rename to inmates/lib/arm/include/inmate.h
index 63a3e3552ca662a5e6b409822db1a0d7a3b7da73..5bd51f1ba8aacc3e079445f2e91625818c584141 100644 (file)
--- a/inmates/lib/arm/include/inmates/inmate.h
+++ b/inmates/lib/arm/include/inmate.h
@@ -9,8 +9,9 @@
  * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.
  */
-#ifndef _JAILHOUSE_INMATES_INMATE_H
-#define _JAILHOUSE_INMATES_INMATE_H
+
+#ifndef _JAILHOUSE_INMATE_H
+#define _JAILHOUSE_INMATE_H
 
 #ifndef __ASSEMBLY__
 typedef signed char s8;
@@ -51,4 +52,4 @@ u64 timer_ticks_to_ns(u64 ticks);
 void timer_start(u64 timeout);
 
 #endif /* !__ASSEMBLY__ */
-#endif
+#endif /* !_JAILHOUSE_INMATE_H */

diff --git a/inmates/lib/arm/printk.c b/inmates/lib/arm/printk.c
index 0bc6e0acaba27e10a5811ac6f02a45a494c4f96d..239731a589e531099cf4cc5d6638e13169c4fb6e 100644 (file)
--- a/inmates/lib/arm/printk.c
+++ b/inmates/lib/arm/printk.c
@@ -13,7 +13,7 @@
 #include <jailhouse/types.h>
 #include <asm/debug.h>
 #include <stdarg.h>
-#include <inmates/inmate.h>
+#include <inmate.h>
 
 static struct uart_chip chip;
 

diff --git a/inmates/lib/arm/timer.c b/inmates/lib/arm/timer.c
index 5f5e86585aed7d82d90148a932ab25b9832de576..fcb41614c2f2e664ef2dd7b5cf6a9b5bb1a06ffe 100644 (file)
--- a/inmates/lib/arm/timer.c
+++ b/inmates/lib/arm/timer.c
@@ -13,7 +13,7 @@
  */
 
 #include <asm/sysregs.h>
-#include <inmates/inmate.h>
+#include <inmate.h>
 
 unsigned long timer_get_frequency(void)
 {