diff -r bc8f03bef99f tools/libxc/xc_domain.c
--- a/tools/libxc/xc_domain.c	Thu Jan 11 21:06:24 2007 +0800
+++ b/tools/libxc/xc_domain.c	Fri Jan 12 23:20:55 2007 +0800
@@ -247,12 +247,12 @@ int xc_domain_hvm_getcontext(int xc_hand
     domctl.domain = (domid_t)domid;
     set_xen_guest_handle(domctl.u.hvmcontext.ctxt, hvm_ctxt);
 
-    if ( (rc = mlock(hvm_ctxt, sizeof(*hvm_ctxt))) != 0 )
+    if ( (rc = lock_pages(hvm_ctxt, sizeof(*hvm_ctxt))) != 0 )
         return rc;
 
     rc = do_domctl(xc_handle, &domctl);
 
-    safe_munlock(hvm_ctxt, sizeof(*hvm_ctxt));
+    unlock_pages(hvm_ctxt, sizeof(*hvm_ctxt));
 
     return rc;
 }
@@ -269,12 +269,12 @@ int xc_domain_hvm_setcontext(int xc_hand
     domctl.domain = domid;
     set_xen_guest_handle(domctl.u.hvmcontext.ctxt, hvm_ctxt);
 
-    if ( (rc = mlock(hvm_ctxt, sizeof(*hvm_ctxt))) != 0 )
+    if ( (rc = lock_pages(hvm_ctxt, sizeof(*hvm_ctxt))) != 0 )
         return rc;
 
     rc = do_domctl(xc_handle, &domctl);
 
-    safe_munlock(hvm_ctxt, sizeof(*hvm_ctxt));
+    unlock_pages(hvm_ctxt, sizeof(*hvm_ctxt));
 
     return rc;
 }