From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Wed, 1 Nov 2006 18:48:57 +0000 (+0000)
Subject: [XEN] Fix x86/64 build.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15567^2~145
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8f84664335ac2a736288d7e1de0ab6ac10a41be5;p=xen.git

[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 362365dd2f..e7be9f5a47 100644
--- 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 b527c51d99..c6bae2284e 100644
--- 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;