diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:36 +1100 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:42 +1100 |
| commit | f3f4aeb9ea8954c0da3cf0d12693f9a57f1f4ac7 (patch) | |
| tree | 3663ab29736373c565d88e941162d37311cc3c75 /arch/arm64/kvm/hyp.S | |
| parent | 2a3f5f14fdf2e8fb680af168fa642ef8a9218ffb (diff) | |
| parent | 849a2d3d9be31368559e6852cf64d749e6903818 (diff) | |
| download | talos-obmc-linux-openbmc-20160202-1.tar.gz talos-obmc-linux-openbmc-20160202-1.zip | |
Merge tag 'v4.3.5' into dev-4.3openbmc-20160202-1
This is the 4.3.5 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch/arm64/kvm/hyp.S')
| -rw-r--r-- | arch/arm64/kvm/hyp.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index e5836138ec42..3e840649b133 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -1007,9 +1007,15 @@ el1_trap: b.ne 1f // Not an abort we care about /* This is an abort. Check for permission fault */ +alternative_if_not ARM64_WORKAROUND_834220 and x2, x1, #ESR_ELx_FSC_TYPE cmp x2, #FSC_PERM b.ne 1f // Not a permission fault +alternative_else + nop // Force a Stage-1 translation to occur + nop // and return to the guest if it failed + nop +alternative_endif /* * Check for Stage-1 page table walk, which is guaranteed |
