Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / hypervisor / arch / arm / entry.S

diff --git a/hypervisor/arch/arm/entry.S b/hypervisor/arch/arm/entry.S
index 6f9178ca9ad31368e3ea00701a2450ec3440ef84..430bb3ed212a9e92f0f3e293512375bddc57d701 100644 (file)
--- a/hypervisor/arch/arm/entry.S
+++ b/hypervisor/arch/arm/entry.S
@@ -10,6 +10,7 @@
  * the COPYING file in the top-level directory.
  */
 
+#include <asm/asm-defines.h>
 #include <asm/head.h>
 #include <asm/percpu.h>
 
@@ -22,7 +23,7 @@ arch_entry:
 
        ldr     r1, =__page_pool
        mov     r4, #1
-       lsl     r4, #PERCPU_SIZE_SHIFT
+       lsl     r4, #PERCPU_SIZE_SHIFT_ASM
        /*
         * percpu data = pool + cpuid * shift
         * TODO: handle aff1 and aff2