ia64/xen-unstable

changeset 3337:a477f7643de6

bitkeeper revision 1.1159.1.508 (41d2c334D3CtOjd6Glhc_MnA3jjEGQ)

manual merge
author kaf24@scramble.cl.cam.ac.uk
date Wed Dec 29 14:46:12 2004 +0000 (2004-12-29)
parents b2fa96909734
children 597555bad4b5
files xen/arch/x86/traps.c xen/common/kernel.c
line diff
     1.1 --- a/xen/arch/x86/traps.c	Wed Dec 29 14:42:47 2004 +0000
     1.2 +++ b/xen/arch/x86/traps.c	Wed Dec 29 14:46:12 2004 +0000
     1.3 @@ -51,6 +51,7 @@
     1.4  #include <asm/uaccess.h>
     1.5  #include <asm/i387.h>
     1.6  #include <asm/debugger.h>
     1.7 +#include <asm/msr.h>
     1.8  
     1.9  /*
    1.10   * opt_nmi: one of 'ignore', 'dom0', or 'fatal'.
     2.1 --- a/xen/common/kernel.c	Wed Dec 29 14:42:47 2004 +0000
     2.2 +++ b/xen/common/kernel.c	Wed Dec 29 14:46:12 2004 +0000
     2.3 @@ -41,6 +41,7 @@ integer_param("xenheap_megabytes", opt_x
     2.4  unsigned long xenheap_phys_end;
     2.5  
     2.6  xmem_cache_t *domain_struct_cachep;
     2.7 +xmem_cache_t *exec_domain_struct_cachep;
     2.8  struct domain *dom0;
     2.9  
    2.10  vm_assist_info_t vm_assist_info[MAX_VMASST_TYPE + 1];