ia64/xen-unstable

changeset 5532:1aac5f19494f

bitkeeper revision 1.1713.4.1 (42b896ce_iXHcZjWxYV17vzV3fQhTA)

Adapt to recent patches in common
author djm@sportsman.spdomain
date Tue Jun 21 22:38:06 2005 +0000 (2005-06-21)
parents fd4a89825472
children 51d718bd11de
files .rootkeys xen/include/asm-ia64/config.h xen/include/asm-ia64/shadow.h
line diff
     1.1 --- a/.rootkeys	Tue Jun 21 19:37:26 2005 +0000
     1.2 +++ b/.rootkeys	Tue Jun 21 22:38:06 2005 +0000
     1.3 @@ -1374,6 +1374,7 @@ 421098b72bPUyviWloEAIB85dGCm2Q xen/inclu
     1.4  421098b7Z6OwjZnrTZkh34DoDfcjrA xen/include/asm-ia64/regionreg.h
     1.5  421098b707cY5YluUcWK5Pc-71ETVw xen/include/asm-ia64/regs.h
     1.6  4214e2f3fbO_n9Z1kIcBR83d7W4OJw xen/include/asm-ia64/serial.h
     1.7 +42b89683nnFDAElJewfm2JxG-pv1BQ xen/include/asm-ia64/shadow.h
     1.8  429fb3bc53qJOyKJCBfhDNmTasj8Gw xen/include/asm-ia64/slab.h
     1.9  421098b7GkWOnlzSmPvNAhByOSZ1Dw xen/include/asm-ia64/time.h
    1.10  421098b7FK3xgShpnH0I0Ou3O4fJ2Q xen/include/asm-ia64/tlb.h
     2.1 --- a/xen/include/asm-ia64/config.h	Tue Jun 21 19:37:26 2005 +0000
     2.2 +++ b/xen/include/asm-ia64/config.h	Tue Jun 21 22:38:06 2005 +0000
     2.3 @@ -103,6 +103,9 @@ extern char _end[]; /* standard ELF symb
     2.4  #define	get_cpu()	0
     2.5  #define put_cpu()	do {} while(0)
     2.6  
     2.7 +// needed for common/dom0_ops.c until hyperthreading is supported
     2.8 +#define smp_num_siblings 1
     2.9 +
    2.10  // from linux/include/linux/mm.h
    2.11  struct page;
    2.12  
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/xen/include/asm-ia64/shadow.h	Tue Jun 21 22:38:06 2005 +0000
     3.3 @@ -0,0 +1,1 @@
     3.4 +/* empty */