diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:03:53 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:03:53 +0100 |
| commit | e20e8b472345ea5babd805db6726d1a7000f7673 (patch) | |
| tree | 1aaff25991578806a867ba3efcb0f7fd59940388 /arch/mips/kvm/kvm_locore.S | |
| parent | 588956edf5bb33741de41687677f21f5c37671da (diff) | |
| parent | c59ecb2edfc11b725a0fa4cb5420c4dbae482c17 (diff) | |
Merge tag 'v3.14.36-rt31-lno1' into linux-linaro-lsk-v3.14-rt
Linux 3.14.36-rt31
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Conflicts:
arch/arm64/kernel/setup.c
arch/x86/kernel/traps.c
Diffstat (limited to 'arch/mips/kvm/kvm_locore.S')
| -rw-r--r-- | arch/mips/kvm/kvm_locore.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kvm/kvm_locore.S b/arch/mips/kvm/kvm_locore.S index bbace092ad0a..03a2db58b22d 100644 --- a/arch/mips/kvm/kvm_locore.S +++ b/arch/mips/kvm/kvm_locore.S @@ -428,7 +428,7 @@ __kvm_mips_return_to_guest: /* Setup status register for running guest in UM */ .set at or v1, v1, (ST0_EXL | KSU_USER | ST0_IE) - and v1, v1, ~ST0_CU0 + and v1, v1, ~(ST0_CU0 | ST0_MX) .set noat mtc0 v1, CP0_STATUS ehb |