[PATCH v13 13/85] KVM: Annotate that all paths in hva_to_pfn() might sleep

[Sean Christopherson]

Now that hva_to_pfn() no longer supports being called in atomic context,
move the might_sleep() annotation from hva_to_pfn_slow() to hva_to_pfn().

Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
Tested-by: Alex Bennée <alex.ben...@linaro.org>
Signed-off-by: Sean Christopherson <sea...@google.com>
---
 virt/kvm/kvm_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 0bc077213d3e..17acc75990a5 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2804,8 +2804,6 @@ static int hva_to_pfn_slow(unsigned long addr, bool 
*async, bool write_fault,
        struct page *page;
        int npages;
 
-       might_sleep();
-
        if (writable)
                *writable = write_fault;
 
@@ -2939,6 +2937,8 @@ kvm_pfn_t hva_to_pfn(unsigned long addr, bool 
interruptible, bool *async,
        kvm_pfn_t pfn;
        int npages, r;
 
+       might_sleep();
+
        if (hva_to_pfn_fast(addr, write_fault, writable, &pfn))
                return pfn;
 
-- 
2.47.0.rc1.288.g06298d1525-goog