diff options
Diffstat (limited to 'arch/arm/kvm/init.S')
-rw-r--r-- | arch/arm/kvm/init.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kvm/init.S b/arch/arm/kvm/init.S index 1b9844d369cc..b2d229f09c07 100644 --- a/arch/arm/kvm/init.S +++ b/arch/arm/kvm/init.S | |||
@@ -17,6 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/linkage.h> | 19 | #include <linux/linkage.h> |
20 | #include <asm/assembler.h> | ||
20 | #include <asm/unified.h> | 21 | #include <asm/unified.h> |
21 | #include <asm/asm-offsets.h> | 22 | #include <asm/asm-offsets.h> |
22 | #include <asm/kvm_asm.h> | 23 | #include <asm/kvm_asm.h> |
@@ -134,7 +135,7 @@ phase2: | |||
134 | ldr r0, =TRAMPOLINE_VA | 135 | ldr r0, =TRAMPOLINE_VA |
135 | adr r1, target | 136 | adr r1, target |
136 | bfi r0, r1, #0, #PAGE_SHIFT | 137 | bfi r0, r1, #0, #PAGE_SHIFT |
137 | mov pc, r0 | 138 | ret r0 |
138 | 139 | ||
139 | target: @ We're now in the trampoline code, switch page tables | 140 | target: @ We're now in the trampoline code, switch page tables |
140 | mcrr p15, 4, r2, r3, c2 | 141 | mcrr p15, 4, r2, r3, c2 |