1.1 --- a/xen/arch/x86/domain.c	Sat Feb 05 09:30:02 2005 +0000
     1.2 +++ b/xen/arch/x86/domain.c	Sat Feb 05 09:34:44 2005 +0000
     1.3 @@ -273,6 +273,13 @@ void arch_do_createdomain(struct exec_do
     1.4      }
     1.5  }
     1.6  
     1.7 +void arch_do_boot_vcpu(struct exec_domain *ed)
     1.8 +{
     1.9 +    struct domain *d = ed->domain;
    1.10 +    ed->thread.schedule_tail = d->exec_domain[0]->thread.schedule_tail;
    1.11 +    ed->mm.perdomain_ptes = d->mm_perdomain_pt + (ed->eid << PDPT_VCPU_SHIFT);
    1.12 +}
    1.13 +
    1.14  #ifdef CONFIG_VMX
    1.15  void arch_vmx_do_resume(struct exec_domain *ed) 
    1.16  {

     2.1 --- a/xen/common/Makefile	Sat Feb 05 09:30:02 2005 +0000
     2.2 +++ b/xen/common/Makefile	Sat Feb 05 09:34:44 2005 +0000
     2.3 @@ -6,7 +6,7 @@ OBJS := $(subst dom_mem_ops.o,,$(OBJS))
     2.4  OBJS := $(subst grant_table.o,,$(OBJS))
     2.5  OBJS := $(subst page_alloc.o,,$(OBJS))
     2.6  OBJS := $(subst physdev.o,,$(OBJS))
     2.7 -OBJS := $(subst slab.o,,$(OBJS))
     2.8 +OBJS := $(subst xmalloc.o,,$(OBJS))
     2.9  endif
    2.10  
    2.11  ifneq ($(debugger),y)

     3.1 --- a/xen/common/domain.c	Sat Feb 05 09:30:02 2005 +0000
     3.2 +++ b/xen/common/domain.c	Sat Feb 05 09:34:44 2005 +0000
     3.3 @@ -330,9 +330,7 @@ long do_boot_vcpu(unsigned long vcpu, fu
     3.4  
     3.5      memcpy(&ed->thread, &idle0_exec_domain.thread, sizeof(ed->thread));
     3.6  
     3.7 -    /* arch_do_createdomain */
     3.8 -    ed->thread.schedule_tail = d->exec_domain[0]->thread.schedule_tail;
     3.9 -    ed->mm.perdomain_ptes = d->mm_perdomain_pt + (ed->eid << PDPT_VCPU_SHIFT);
    3.10 +    arch_do_boot_vcpu(ed);
    3.11  
    3.12      sched_add_domain(ed);
    3.13  

     4.1 --- a/xen/include/xen/domain.h	Sat Feb 05 09:30:02 2005 +0000
     4.2 +++ b/xen/include/xen/domain.h	Sat Feb 05 09:34:44 2005 +0000
     4.3 @@ -16,6 +16,8 @@ extern void arch_free_exec_domain_struct
     4.4  
     4.5  extern void arch_do_createdomain(struct exec_domain *ed);
     4.6  
     4.7 +extern void arch_do_boot_vcpu(struct exec_domain *ed);
     4.8 +
     4.9  extern int  arch_final_setup_guestos(
    4.10      struct exec_domain *d, full_execution_context_t *c);
    4.11