2 files changed, 5 insertions, 5 deletions

diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c
index 18e1e30019e3..4a340cb23013 100644
--- a/virt/kvm/iommu.c
+++ b/virt/kvm/iommu.c
@@ -52,7 +52,7 @@ static pfn_t kvm_pin_pages(struct kvm_memory_slot *slot, gfn_t gfn,
         end_gfn = gfn + (size >> PAGE_SHIFT);
         gfn    += 1;
 
-        if (is_error_pfn(pfn))
+        if (is_error_noslot_pfn(pfn))
                 return pfn;
 
         while (gfn < end_gfn)
@@ -106,7 +106,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot)
                  * important because we unmap and unpin in 4kb steps later.
                  */
                 pfn = kvm_pin_pages(slot, gfn, page_size);
-                if (is_error_pfn(pfn)) {
+                if (is_error_noslot_pfn(pfn)) {
                         gfn += 1;
                         continue;
                 }
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index be70035fd42a..2fb73191801f 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1208,7 +1208,7 @@ __gfn_to_pfn_memslot(struct kvm_memory_slot *slot, gfn_t gfn, bool atomic,
                 return KVM_PFN_ERR_RO_FAULT;
 
         if (kvm_is_error_hva(addr))
-                return KVM_PFN_ERR_BAD;
+                return KVM_PFN_NOSLOT;
 
         /* Do not map writable pfn in the readonly memslot. */
         if (writable && memslot_is_readonly(slot)) {
@@ -1290,7 +1290,7 @@ EXPORT_SYMBOL_GPL(gfn_to_page_many_atomic);
 
 static struct page *kvm_pfn_to_page(pfn_t pfn)
 {
-        if (is_error_pfn(pfn))
+        if (is_error_noslot_pfn(pfn))
                 return KVM_ERR_PTR_BAD_PAGE;
 
         if (kvm_is_mmio_pfn(pfn)) {
@@ -1322,7 +1322,7 @@ EXPORT_SYMBOL_GPL(kvm_release_page_clean);
 
 void kvm_release_pfn_clean(pfn_t pfn)
 {
-        if (!is_error_pfn(pfn) && !kvm_is_mmio_pfn(pfn))
+        if (!is_error_noslot_pfn(pfn) && !kvm_is_mmio_pfn(pfn))
                 put_page(pfn_to_page(pfn));
 }
 EXPORT_SYMBOL_GPL(kvm_release_pfn_clean);