1.1 --- a/xen/arch/x86/traps.c	Thu Nov 18 17:55:33 2004 +0000
     1.2 +++ b/xen/arch/x86/traps.c	Thu Nov 18 18:37:24 2004 +0000
     1.3 @@ -464,7 +464,7 @@ asmlinkage void do_general_protection(st
     1.4  {
     1.5      struct exec_domain *ed = current;
     1.6      struct domain *d = ed->domain;
     1.7 -    struct trap_bounce *tb = &d->thread.trap_bounce;
     1.8 +    struct trap_bounce *tb = &ed->thread.trap_bounce;
     1.9      trap_info_t *ti;
    1.10      unsigned long fixup;
    1.11  
    1.12 @@ -616,7 +616,7 @@ asmlinkage void do_debug(struct xen_regs
    1.13  {
    1.14      unsigned int condition;
    1.15      struct exec_domain *d = current;
    1.16 -    struct trap_bounce *tb = &ed->thread.trap_bounce;
    1.17 +    struct trap_bounce *tb = &d->thread.trap_bounce;
    1.18  
    1.19      DEBUGGER_trap_entry(TRAP_debug, regs, error_code);
    1.20  

     2.1 --- a/xen/arch/x86/x86_32/asm-offsets.c	Thu Nov 18 17:55:33 2004 +0000
     2.2 +++ b/xen/arch/x86/x86_32/asm-offsets.c	Thu Nov 18 18:37:24 2004 +0000
     2.3 @@ -34,19 +34,17 @@ void __dummy__(void)
     2.4      OFFSET(XREGS_orig_eax, struct xen_regs, orig_eax);
     2.5      BLANK();
     2.6  
     2.7 -    OFFSET(DOMAIN_processor, struct domain, processor);
     2.8 -    OFFSET(DOMAIN_shared_info, struct domain, shared_info);
     2.9 -    OFFSET(DOMAIN_event_sel, struct domain, thread.event_selector);
    2.10 -    OFFSET(DOMAIN_event_addr, struct domain, thread.event_address);
    2.11 -    OFFSET(DOMAIN_failsafe_sel, struct domain, thread.failsafe_selector);
    2.12 -    OFFSET(DOMAIN_failsafe_addr, struct domain, thread.failsafe_address);
    2.13 -    OFFSET(DOMAIN_trap_bounce, struct domain, thread.trap_bounce);
    2.14 +    OFFSET(EDOMAIN_processor, struct exec_domain, processor);
    2.15 +    OFFSET(EDOMAIN_vcpu_info, struct exec_domain, vcpu_info);
    2.16 +    OFFSET(EDOMAIN_event_sel, struct exec_domain, thread.event_selector);
    2.17 +    OFFSET(EDOMAIN_event_addr, struct exec_domain, thread.event_address);
    2.18 +    OFFSET(EDOMAIN_failsafe_sel, struct exec_domain, thread.failsafe_selector);
    2.19 +    OFFSET(EDOMAIN_failsafe_addr, struct exec_domain, thread.failsafe_address);
    2.20 +    OFFSET(EDOMAIN_trap_bounce, struct exec_domain, thread.trap_bounce);
    2.21      BLANK();
    2.22  
    2.23 -    OFFSET(SHINFO_upcall_pending, shared_info_t, 
    2.24 -           vcpu_data[0].evtchn_upcall_pending);
    2.25 -    OFFSET(SHINFO_upcall_mask, shared_info_t, 
    2.26 -           vcpu_data[0].evtchn_upcall_mask);
    2.27 +    OFFSET(VCPUINFO_upcall_pending, vcpu_info_t, evtchn_upcall_pending);
    2.28 +    OFFSET(VCPUINFO_upcall_mask, vcpu_info_t, evtchn_upcall_mask);
    2.29      BLANK();
    2.30  
    2.31      OFFSET(TRAPBOUNCE_error_code, struct trap_bounce, error_code);

     3.1 --- a/xen/include/xen/sched.h	Thu Nov 18 17:55:33 2004 +0000
     3.2 +++ b/xen/include/xen/sched.h	Thu Nov 18 18:37:24 2004 +0000
     3.3 @@ -59,7 +59,7 @@ struct exec_domain
     3.4  {
     3.5      u32 processor;
     3.6  
     3.7 -    shared_info_t *shared_info;
     3.8 +    vcpu_info_t *vcpu_info;
     3.9  
    3.10      struct domain *domain;
    3.11      struct exec_domain *ed_next_list;