Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fixes from Paolo Bonzini:
 "Two very simple bugfixes, affecting all supported architectures"

[ Two? There's three commits in here.  Oh well, I guess Paolo didn't
  count the preparatory symbol export ]

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: correct null pid check in kvm_vcpu_yield_to()
  KVM: check for !is_zero_pfn() in kvm_is_mmio_pfn()
  mm: export symbol dependencies of is_zero_pfn()

diff --combined mm/memory.c
index adeac306610f7d7895e9d361d11649fb31f0a914,1fcf59a097b3eae62a665734d30f861a92ce35ec..d17f1bcd2a91c3090cae29639fa0a4d2642f294b
--- 1/mm/memory.c
--- 2/mm/memory.c
+++ b/mm/memory.c
@@@ -118,6 -118,8 +118,8 @@@ __setup("norandmaps", disable_randmaps)
  unsigned long zero_pfn __read_mostly;
  unsigned long highest_memmap_pfn __read_mostly;
  
+ EXPORT_SYMBOL(zero_pfn);
+ 
  /*
   * CONFIG_MMU architectures set up ZERO_PAGE in their paging_init()
   */
@@@ -751,7 -753,7 +753,7 @@@ struct page *vm_normal_page(struct vm_a
        unsigned long pfn = pte_pfn(pte);
  
        if (HAVE_PTE_SPECIAL) {
 -              if (likely(!pte_special(pte) || pte_numa(pte)))
 +              if (likely(!pte_special(pte)))
                        goto check_pfn;
                if (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP))
                        return NULL;
@@@ -777,14 -779,15 +779,14 @@@
                }
        }
  
 +      if (is_zero_pfn(pfn))
 +              return NULL;
  check_pfn:
        if (unlikely(pfn > highest_memmap_pfn)) {
                print_bad_pte(vma, addr, pte, NULL);
                return NULL;
        }
  
 -      if (is_zero_pfn(pfn))
 -              return NULL;
 -
        /*
         * NOTE! We still have PageReserved() pages in the page tables.
         * eg. VDSO mappings can cause them to exist.