diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2013-06-25 03:47:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 17:07:21 -0400 |
commit | 77d8caacd2924ca7cbb989c30709503e93c7f026 (patch) | |
tree | 67217679b55fdb665525afa9d9c59c24a4c5f436 /arch/powerpc/kernel | |
parent | 497f0957430403bc4e3a0c776da3907fe769b64f (diff) |
powerpc: Remove KVMTEST from RELON exception handlers
commit c9f69518e5f08170bc857984a077f693d63171df upstream.
KVMTEST is a macro which checks whether we are taking an exception from
guest context, if so we branch out of line and eventually call into the
KVM code to handle the switch.
When running real guests on bare metal (HV KVM) the hardware ensures
that we never take a relocation on exception when transitioning from
guest to host. For PR KVM we disable relocation on exceptions ourself in
kvmppc_core_init_vm(), as of commit a413f47 "Disable relocation on
exceptions whenever PR KVM is active".
So convert all the RELON macros to use NOTEST, and drop the remaining
KVM_HANDLER() definitions we have for 0xe40 and 0xe80.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 0a9fdea2fc0f..6bd676391a6d 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S | |||
@@ -1175,9 +1175,7 @@ __end_handlers: | |||
1175 | 1175 | ||
1176 | /* Equivalents to the above handlers for relocation-on interrupt vectors */ | 1176 | /* Equivalents to the above handlers for relocation-on interrupt vectors */ |
1177 | STD_RELON_EXCEPTION_HV_OOL(0xe40, emulation_assist) | 1177 | STD_RELON_EXCEPTION_HV_OOL(0xe40, emulation_assist) |
1178 | KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe40) | ||
1179 | MASKABLE_RELON_EXCEPTION_HV_OOL(0xe80, h_doorbell) | 1178 | MASKABLE_RELON_EXCEPTION_HV_OOL(0xe80, h_doorbell) |
1180 | KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe80) | ||
1181 | 1179 | ||
1182 | STD_RELON_EXCEPTION_PSERIES_OOL(0xf00, performance_monitor) | 1180 | STD_RELON_EXCEPTION_PSERIES_OOL(0xf00, performance_monitor) |
1183 | STD_RELON_EXCEPTION_PSERIES_OOL(0xf20, altivec_unavailable) | 1181 | STD_RELON_EXCEPTION_PSERIES_OOL(0xf20, altivec_unavailable) |