diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 23:21:14 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 23:21:14 +1100 |
commit | ebf0b6a8b1e445d2be66087732aafcda12ab9f59 (patch) | |
tree | f00716a1dbde6b54dea5469ef209baac01883ec3 /arch/powerpc/kvm/book3s_rmhandlers.S | |
parent | 5400fc229e6078a6964b15fb98e9a994df3d642a (diff) | |
parent | 1b689a95ce7427075f9ac9fb4aea1af530742b7f (diff) | |
download | linux-stable-ebf0b6a8b1e445d2be66087732aafcda12ab9f59.tar.gz linux-stable-ebf0b6a8b1e445d2be66087732aafcda12ab9f59.tar.bz2 linux-stable-ebf0b6a8b1e445d2be66087732aafcda12ab9f59.zip |
Merge branch 'fixes' into next
Merge our fixes branch from the 4.15 cycle.
Unusually the fixes branch saw some significant features merged,
notably the RFI flush patches, so we want the code in next to be
tested against that, to avoid any surprises when the two are merged.
There's also some other work on the panic handling that was reverted
in fixes and we now want to do properly in next, which would conflict.
And we also fix a few other minor merge conflicts.
Diffstat (limited to 'arch/powerpc/kvm/book3s_rmhandlers.S')
-rw-r--r-- | arch/powerpc/kvm/book3s_rmhandlers.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S index 42a4b237df5f..34a5adeff084 100644 --- a/arch/powerpc/kvm/book3s_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_rmhandlers.S @@ -46,6 +46,9 @@ #define FUNC(name) name +#define RFI_TO_KERNEL RFI +#define RFI_TO_GUEST RFI + .macro INTERRUPT_TRAMPOLINE intno .global kvmppc_trampoline_\intno @@ -141,7 +144,7 @@ kvmppc_handler_skip_ins: GET_SCRATCH0(r13) /* And get back into the code */ - RFI + RFI_TO_KERNEL #endif /* @@ -164,6 +167,6 @@ _GLOBAL_TOC(kvmppc_entry_trampoline) ori r5, r5, MSR_EE mtsrr0 r7 mtsrr1 r6 - RFI + RFI_TO_KERNEL #include "book3s_segment.S" |