diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-08-12 09:43:45 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-08-12 09:43:45 +0200 |
commit | cada23f308e3869ceb5c75f164d249448dfaec07 (patch) | |
tree | 97c7aebcad0eb2a93a7519251a01f5be9255ee75 /arch/arm64/kvm/sys_regs.c | |
parent | KVM: s390: fix pfmf non-quiescing control handling (diff) | |
parent | arm64: KVM: use 'int' instead of 'u32' for variable 'target' in kvm_host.h. (diff) | |
download | linux-cada23f308e3869ceb5c75f164d249448dfaec07.tar.xz linux-cada23f308e3869ceb5c75f164d249448dfaec07.zip |
Merge branch 'kvm-arm64/fixes-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-master
Diffstat (limited to 'arch/arm64/kvm/sys_regs.c')
-rw-r--r-- | arch/arm64/kvm/sys_regs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 94923609753b..02e9d09e1d80 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -211,6 +211,9 @@ static const struct sys_reg_desc sys_reg_descs[] = { /* FAR_EL1 */ { Op0(0b11), Op1(0b000), CRn(0b0110), CRm(0b0000), Op2(0b000), NULL, reset_unknown, FAR_EL1 }, + /* PAR_EL1 */ + { Op0(0b11), Op1(0b000), CRn(0b0111), CRm(0b0100), Op2(0b000), + NULL, reset_unknown, PAR_EL1 }, /* PMINTENSET_EL1 */ { Op0(0b11), Op1(0b000), CRn(0b1001), CRm(0b1110), Op2(0b001), |