Merge branch 'gpc-fixes' of git://git.infradead.org/users/dwmw2/linux into HEAD

Pull Xen-for-KVM changes from David Woodhouse:

* add support for 32-bit guests in SCHEDOP_poll

* the rest of the gfn-to-pfn cache API cleanup

"I still haven't reinstated the last of those patches to make gpc->len
immutable."

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc arch/x86/kvm/xen.c
index 2f21fa5,5208e05..d7af402
--- 1/arch/x86/kvm/xen.c
--- 2/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@@ -1165,9 -1152,9 +1152,9 @@@ static bool wait_pending_event(struct k
        bool ret = true;
        int idx, i;
  
 -      read_lock_irqsave(&gpc->lock, flags);
        idx = srcu_read_lock(&kvm->srcu);
-       if (!kvm_gpc_check(kvm, gpc, gpc->gpa, PAGE_SIZE))
 +      read_lock_irqsave(&gpc->lock, flags);
+       if (!kvm_gpc_check(gpc, PAGE_SIZE))
                goto out_rcu;
  
        ret = false;

diff --cc include/linux/kvm_host.h
Simple merge