diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2016-09-06 09:28:43 +0100 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2016-09-08 12:53:00 +0200 |
| commit | 3aedd5c49e63c0d31a53b00ab906d48f53abb68b (patch) | |
| tree | 276d564323cc9a23398f157be5dd0cf0aed07f6e /virt | |
| parent | 427d7cacf97220844aa39146e11365655bbff8bd (diff) | |
| download | linux-rpi3-3aedd5c49e63c0d31a53b00ab906d48f53abb68b.tar.gz linux-rpi3-3aedd5c49e63c0d31a53b00ab906d48f53abb68b.tar.bz2 linux-rpi3-3aedd5c49e63c0d31a53b00ab906d48f53abb68b.zip | |
arm: KVM: Use common AArch32 conditional execution code
Add the bit of glue and const-ification that is required to use
the code inherited from the arm64 port, and move over to it.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/aarch32.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/virt/kvm/arm/aarch32.c b/virt/kvm/arm/aarch32.c index cb02e562acb8..ba4417b640c7 100644 --- a/virt/kvm/arm/aarch32.c +++ b/virt/kvm/arm/aarch32.c @@ -24,6 +24,11 @@ #include <linux/kvm_host.h> #include <asm/kvm_emulate.h> +#ifndef CONFIG_ARM64 +#define COMPAT_PSR_T_BIT PSR_T_BIT +#define COMPAT_PSR_IT_MASK PSR_IT_MASK +#endif + /* * stolen from arch/arm/kernel/opcodes.c * |