Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / hypervisor / arch / arm / asm-defines.c

diff --git a/hypervisor/arch/arm/asm-defines.c b/hypervisor/arch/arm/asm-defines.c
index 15ff68ddc2e4c6b298b3cae19c3c0cb8d86fefda..c54ebf4fe4d5ecb678dce208f68c9f5b41f66828 100644 (file)
--- a/hypervisor/arch/arm/asm-defines.c
+++ b/hypervisor/arch/arm/asm-defines.c
@@ -11,9 +11,21 @@
  */
 
 #include <jailhouse/gen-defines.h>
+#include <jailhouse/utils.h>
+#include <asm/percpu.h>
 
 void common(void);
 
 void common(void)
 {
+       OFFSET(PERCPU_LINUX_SP, per_cpu, linux_sp);
+       BLANK();
+
+       /* GCC evaluates constant expressions involving built-ins
+        * at compilation time, so this yields computed value.
+        */
+       DEFINE(PERCPU_STACK_END,
+              __builtin_offsetof(struct per_cpu, stack) + \
+              FIELD_SIZEOF(struct per_cpu, stack));
+       DEFINE(PERCPU_SIZE_SHIFT_ASM, PERCPU_SIZE_SHIFT);
 }