---
inmates/demos/arm/gic-demo.c | 2 +-
inmates/demos/arm/uart-demo.c | 2 +-
inmates/lib/arm-common/include/inmate.h | 2 ++
inmates/lib/inmate_common.h | 2 --
inmates/lib/x86/inmate.h | 3 +++
inmates/tools/arm/linux-loader.c | 2 +-
inmates/tools/arm64/linux-loader.c | 2 +-
7 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/inmates/demos/arm/gic-demo.c b/inmates/demos/arm/gic-demo.c
index 37bf4d86..83284374 100644
--- a/inmates/demos/arm/gic-demo.c
+++ b/inmates/demos/arm/gic-demo.c
@@ -54,7 +54,7 @@ static void handle_IRQ(unsigned int irqn)
timer_start(ticks_per_beat);
}
-void inmate_main(void)
+void inmate_main(void *irq_stack)
{
printk("Initializing the GIC...\n");
gic_setup(handle_IRQ);
diff --git a/inmates/demos/arm/uart-demo.c b/inmates/demos/arm/uart-demo.c
index 4748d40b..fad56b0f 100644
--- a/inmates/demos/arm/uart-demo.c
+++ b/inmates/demos/arm/uart-demo.c
@@ -12,7 +12,7 @@
#include <inmate.h>
-void inmate_main(void)
+void inmate_main(void *irq_stack)
{
unsigned int i = 0, j;
/*
diff --git a/inmates/lib/arm-common/include/inmate.h
b/inmates/lib/arm-common/include/inmate.h
index 3d35f35a..19730a9d 100644
--- a/inmates/lib/arm-common/include/inmate.h
+++ b/inmates/lib/arm-common/include/inmate.h
@@ -90,6 +90,8 @@ u64 timer_get_ticks(void);
u64 timer_ticks_to_ns(u64 ticks);
void timer_start(u64 timeout);
+void inmate_main(void *irq_stack);
+
#include <arch/inmate.h>
#include "../inmate_common.h"
diff --git a/inmates/lib/inmate_common.h b/inmates/lib/inmate_common.h
index 54f02790..307d2dc6 100644
--- a/inmates/lib/inmate_common.h
+++ b/inmates/lib/inmate_common.h
@@ -78,6 +78,4 @@ bool cmdline_parse_bool(const char *param);
#define CMDLINE_BUFFER(size) \
const char cmdline[size] __attribute__((section(".cmdline")))
-void inmate_main(void);
-
#endif /* !__ASSEMBLY__ */
diff --git a/inmates/lib/x86/inmate.h b/inmates/lib/x86/inmate.h
index cef30784..b7cfa587 100644
--- a/inmates/lib/x86/inmate.h
+++ b/inmates/lib/x86/inmate.h
@@ -255,6 +255,9 @@ extern volatile u32 smp_num_cpus;
extern u8 smp_cpu_ids[SMP_MAX_CPUS];
void smp_wait_for_all_cpus(void);
void smp_start_cpu(unsigned int cpu_id, void (*entry)(void));
+
+void inmate_main(void);
+
#endif
#include "../inmate_common.h"
diff --git a/inmates/tools/arm/linux-loader.c b/inmates/tools/arm/linux-loader.c
index 0fe56b63..736b6c59 100644
--- a/inmates/tools/arm/linux-loader.c
+++ b/inmates/tools/arm/linux-loader.c
@@ -14,7 +14,7 @@
#include <inmate.h>
-void inmate_main(void)
+void inmate_main(void *irq_stack)
{
void register (*entry)(unsigned long, unsigned long, unsigned long);
unsigned long register dtb;
diff --git a/inmates/tools/arm64/linux-loader.c
b/inmates/tools/arm64/linux-loader.c
index ca952ae7..dc299a67 100644
--- a/inmates/tools/arm64/linux-loader.c
+++ b/inmates/tools/arm64/linux-loader.c
@@ -12,7 +12,7 @@
#include <inmate.h>
-void inmate_main(void)
+void inmate_main(void *irq_stack)
{
unsigned long dtb;
void (*entry)(u64 dtb, u64 x1, u64 x2, u64 x3);
--
2.14.1
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
