diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-24 00:43:18 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-24 00:43:18 +0300 |
| commit | a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a (patch) | |
| tree | 1d2061bbf8ac521bb9839075beb4263752bebb23 /arch/powerpc/kernel/exceptions-64s.S | |
| parent | 78e5dfea84dc15d69940831b3981b3014d17222e (diff) | |
| parent | 681c617b7c42fce0798c2b0b472f270f28c82d56 (diff) | |
| download | linux-a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a.tar.xz | |
Merge branch 'topic/ppc-kvm' into next
This brings in two series from Paul, one of which touches KVM code and
may need to be merged into the kvm-ppc tree to resolve conflicts.
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 3ac87e53b3da..a19fbaa8e873 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1273,7 +1273,7 @@ EXC_REAL_BEGIN(denorm_exception_hv, 0x1500, 0x100) bne+ denorm_assist #endif - KVMTEST_PR(0x1500) + KVMTEST_HV(0x1500) EXCEPTION_PROLOG_PSERIES_1(denorm_common, EXC_HV) EXC_REAL_END(denorm_exception_hv, 0x1500, 0x100) @@ -1285,7 +1285,7 @@ EXC_VIRT_END(denorm_exception, 0x5500, 0x100) EXC_VIRT_NONE(0x5500, 0x100) #endif -TRAMP_KVM_SKIP(PACA_EXGEN, 0x1500) +TRAMP_KVM_HV(PACA_EXGEN, 0x1500) #ifdef CONFIG_PPC_DENORMALISATION TRAMP_REAL_BEGIN(denorm_assist) |