From 4d1748d5fdd8e81bf0efd03318b286e74095ab46 Mon Sep 17 00:00:00 2001 From: "djm@sportsman.spdomain" Date: Tue, 21 Jun 2005 22:38:06 +0000 Subject: bitkeeper revision 1.1713.4.1 (42b896ce_iXHcZjWxYV17vzV3fQhTA) Adapt to recent patches in common --- .rootkeys | 1 + xen/include/asm-ia64/config.h | 3 +++ xen/include/asm-ia64/shadow.h | 1 + 3 files changed, 5 insertions(+) create mode 100644 xen/include/asm-ia64/shadow.h diff --git a/.rootkeys b/.rootkeys index e8834f6861..a134ac2d99 100644 --- a/.rootkeys +++ b/.rootkeys @@ -1374,6 +1374,7 @@ 421098b7Z6OwjZnrTZkh34DoDfcjrA xen/include/asm-ia64/regionreg.h 421098b707cY5YluUcWK5Pc-71ETVw xen/include/asm-ia64/regs.h 4214e2f3fbO_n9Z1kIcBR83d7W4OJw xen/include/asm-ia64/serial.h +42b89683nnFDAElJewfm2JxG-pv1BQ xen/include/asm-ia64/shadow.h 429fb3bc53qJOyKJCBfhDNmTasj8Gw xen/include/asm-ia64/slab.h 421098b7GkWOnlzSmPvNAhByOSZ1Dw xen/include/asm-ia64/time.h 421098b7FK3xgShpnH0I0Ou3O4fJ2Q xen/include/asm-ia64/tlb.h diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h index 9df0d907aa..e64246d418 100644 --- a/xen/include/asm-ia64/config.h +++ b/xen/include/asm-ia64/config.h @@ -103,6 +103,9 @@ extern char _end[]; /* standard ELF symbol */ #define get_cpu() 0 #define put_cpu() do {} while(0) +// needed for common/dom0_ops.c until hyperthreading is supported +#define smp_num_siblings 1 + // from linux/include/linux/mm.h struct page; diff --git a/xen/include/asm-ia64/shadow.h b/xen/include/asm-ia64/shadow.h new file mode 100644 index 0000000000..40a8c178f1 --- /dev/null +++ b/xen/include/asm-ia64/shadow.h @@ -0,0 +1 @@ +/* empty */ -- cgit v1.2.3