[Xen-changelog] [xen master] x86/ioreq: Fix build from a collision of c/s f46b61973 and c/s 6e387461ed

[patchbot@xxxxxxx]

commit e62e140daa393c89342f7ca19906e303ebedf8db
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Apr 6 18:56:42 2018 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Sat Apr 7 15:49:59 2018 +0100

    x86/ioreq: Fix build from a collision of c/s f46b61973 and c/s 6e387461ed
    
    Drop the _mfn() wrappers now that page_to_mfn() returns the correct type.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
    Release-acked-by: Juergen Gross <jgross@xxxxxxxx>
---
 xen/arch/x86/hvm/ioreq.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c
index 3a201f5563..905132980f 100644
--- a/xen/arch/x86/hvm/ioreq.c
+++ b/xen/arch/x86/hvm/ioreq.c
@@ -973,12 +973,12 @@ int hvm_get_ioreq_server_frame(struct domain *d, 
ioservid_t id,
         if ( !HANDLE_BUFIOREQ(s) )
             goto out;
 
-        *mfn = _mfn(page_to_mfn(s->bufioreq.page));
+        *mfn = page_to_mfn(s->bufioreq.page);
         rc = 0;
         break;
 
     case XENMEM_resource_ioreq_server_frame_ioreq(0):
-        *mfn = _mfn(page_to_mfn(s->ioreq.page));
+        *mfn = page_to_mfn(s->ioreq.page);
         rc = 0;
         break;
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog