From: Paul Mackerras Date: Wed, 8 Feb 2017 08:35:34 +0000 (+1100) Subject: Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next X-Git-Tag: v4.11-rc1~109^2~35^2~1 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a4a741a04814170358f470d7103f8b13ceb6fefc;p=linux.git Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next This merges in a fix which touches both PPC and KVM code, which was therefore put into a topic branch in the powerpc tree. Signed-off-by: Paul Mackerras --- a4a741a04814170358f470d7103f8b13ceb6fefc diff --cc arch/powerpc/kvm/book3s_hv_rm_xics.c index 0b2e388f4cdf,29f43ed6d5eb..e78542d99cd6 --- a/arch/powerpc/kvm/book3s_hv_rm_xics.c +++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c @@@ -35,8 -35,8 +35,8 @@@ int kvm_irq_bypass = 1 EXPORT_SYMBOL(kvm_irq_bypass); static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp, - u32 new_irq); + u32 new_irq, bool check_resend); - static int xics_opal_rm_set_server(unsigned int hw_irq, int server_cpu); + static int xics_opal_set_server(unsigned int hw_irq, int server_cpu); /* -- ICS routines -- */ static void ics_rm_check_resend(struct kvmppc_xics *xics,