1.1 --- a/xen/arch/ia64/domain.c	Mon Apr 04 17:15:29 2005 +0000
     1.2 +++ b/xen/arch/ia64/domain.c	Mon Apr 04 17:49:17 2005 +0000
     1.3 @@ -139,16 +139,6 @@ void startup_cpu_idle_loop(void)
     1.4  	continue_cpu_idle_loop();
     1.5  }
     1.6  
     1.7 -struct domain *arch_alloc_domain_struct(void)
     1.8 -{
     1.9 -	return xmalloc(struct domain);
    1.10 -}
    1.11 -
    1.12 -void arch_free_domain_struct(struct domain *d)
    1.13 -{
    1.14 -	xfree(d);
    1.15 -}
    1.16 -
    1.17  struct exec_domain *arch_alloc_exec_domain_struct(void)
    1.18  {
    1.19  	/* Per-vp stack is used here. So we need keep exec_domain

     2.1 --- a/xen/arch/x86/domain.c	Mon Apr 04 17:15:29 2005 +0000
     2.2 +++ b/xen/arch/x86/domain.c	Mon Apr 04 17:49:17 2005 +0000
     2.3 @@ -192,16 +192,6 @@ void dump_pageframe_info(struct domain *
     2.4             page->u.inuse.type_info);
     2.5  }
     2.6  
     2.7 -struct domain *arch_alloc_domain_struct(void)
     2.8 -{
     2.9 -    return xmalloc(struct domain);
    2.10 -}
    2.11 -
    2.12 -void arch_free_domain_struct(struct domain *d)
    2.13 -{
    2.14 -    xfree(d);
    2.15 -}
    2.16 -
    2.17  struct exec_domain *arch_alloc_exec_domain_struct(void)
    2.18  {
    2.19      return xmalloc(struct exec_domain);

     3.1 --- a/xen/common/schedule.c	Mon Apr 04 17:15:29 2005 +0000
     3.2 +++ b/xen/common/schedule.c	Mon Apr 04 17:49:17 2005 +0000
     3.3 @@ -94,7 +94,7 @@ void free_domain_struct(struct domain *d
     3.4          if ( d->exec_domain[i] )
     3.5              arch_free_exec_domain_struct(d->exec_domain[i]);
     3.6  
     3.7 -    arch_free_domain_struct(d);
     3.8 +    xfree(d);
     3.9  }
    3.10  
    3.11  struct exec_domain *alloc_exec_domain_struct(struct domain *d,
    3.12 @@ -147,7 +147,7 @@ struct domain *alloc_domain_struct(void)
    3.13  {
    3.14      struct domain *d;
    3.15  
    3.16 -    if ( (d = arch_alloc_domain_struct()) == NULL )
    3.17 +    if ( (d = xmalloc(struct domain)) == NULL )
    3.18          return NULL;
    3.19      
    3.20      memset(d, 0, sizeof(*d));
    3.21 @@ -158,7 +158,7 @@ struct domain *alloc_domain_struct(void)
    3.22      return d;
    3.23  
    3.24   out:
    3.25 -    arch_free_domain_struct(d);
    3.26 +    xfree(d);
    3.27      return NULL;
    3.28  }
    3.29  

     4.1 --- a/xen/include/xen/domain.h	Mon Apr 04 17:15:29 2005 +0000
     4.2 +++ b/xen/include/xen/domain.h	Mon Apr 04 17:49:17 2005 +0000
     4.3 @@ -6,10 +6,6 @@
     4.4   * Arch-specifics.
     4.5   */
     4.6  
     4.7 -extern struct domain *arch_alloc_domain_struct(void);
     4.8 -
     4.9 -extern void arch_free_domain_struct(struct domain *d);
    4.10 -
    4.11  struct exec_domain *arch_alloc_exec_domain_struct(void);
    4.12  
    4.13  extern void arch_free_exec_domain_struct(struct exec_domain *ed);