direct-io.hg

changeset 12201:46fad06ab0b3

[XEN] Fix x86/64 build.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Wed Nov 01 18:48:57 2006 +0000 (2006-11-01)
parents aac5c1fcde6e
children 9a4274724794
files xen/arch/x86/domctl.c xen/arch/x86/x86_64/traps.c
line diff
     1.1 --- a/xen/arch/x86/domctl.c	Wed Nov 01 18:39:33 2006 +0000
     1.2 +++ b/xen/arch/x86/domctl.c	Wed Nov 01 18:48:57 2006 +0000
     1.3 @@ -214,7 +214,7 @@ long arch_do_domctl(
     1.4          int i;
     1.5          struct domain *d = find_domain_by_id(domctl->domain);
     1.6          unsigned long max_pfns = domctl->u.getmemlist.max_pfns;
     1.7 -        unsigned long mfn, gmfn;
     1.8 +        unsigned long mfn;
     1.9          struct list_head *list_ent;
    1.10  
    1.11          ret = -EINVAL;
     2.1 --- a/xen/arch/x86/x86_64/traps.c	Wed Nov 01 18:39:33 2006 +0000
     2.2 +++ b/xen/arch/x86/x86_64/traps.c	Wed Nov 01 18:48:57 2006 +0000
     2.3 @@ -229,7 +229,7 @@ unsigned long do_iret(void)
     2.4      regs->rsp    = iret_saved.rsp;
     2.5      regs->ss     = iret_saved.ss | 3; /* force guest privilege */
     2.6  
     2.7 -    if ( !(iret_saved.flags & VGCF_in_sycall) )
     2.8 +    if ( !(iret_saved.flags & VGCF_in_syscall) )
     2.9      {
    2.10          regs->entry_vector = 0;
    2.11          regs->r11 = iret_saved.r11;