On Mon, Jan 08, 2018 at 06:09:51PM +0100, Peter Zijlstra wrote: > On Tue, Jan 09, 2018 at 03:54:45AM +1100, Michael Ellerman wrote: > > 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 > > Leftovers? The previous patch seems to define all that in common > headers, why redefine here again?
Not leftovers - this is for the sake of 32-bit compiles. There is code in this file and in book3s_segment.S which gets used both for 32-bit and 64-bit kernels, and this is supplying a definition on 32-bit platforms. Without this, 32-bit builds that have PR KVM configured will fail. Paul.
