[XEN] Fix x86/64 build.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 362365dd2fcbb733757d3736239db792174404fc..e7be9f5a4796777a9b7aadcf717bd30479410462 100644 (file)
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -214,7 +214,7 @@ long arch_do_domctl(
         int i;
         struct domain *d = find_domain_by_id(domctl->domain);
         unsigned long max_pfns = domctl->u.getmemlist.max_pfns;
-        unsigned long mfn, gmfn;
+        unsigned long mfn;
         struct list_head *list_ent;
 
         ret = -EINVAL;

diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index b527c51d991ed601ca7e77754a33d199c6c1aa6f..c6bae2284e13503d09342c49c90ff652552504a5 100644 (file)
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -229,7 +229,7 @@ unsigned long do_iret(void)
     regs->rsp    = iret_saved.rsp;
     regs->ss     = iret_saved.ss | 3; /* force guest privilege */
 
-    if ( !(iret_saved.flags & VGCF_in_sycall) )
+    if ( !(iret_saved.flags & VGCF_in_syscall) )
     {
         regs->entry_vector = 0;
         regs->r11 = iret_saved.r11;