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@citrix.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
Release-acked-by: Juergen Gross <jgross@suse.com>

diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c
index 3a201f5563785db049222d2f7166c90a2ab163a9..905132980fbc3af0c73ed6102ebba704b8a2104d 100644 (file)
--- 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;