aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@sportsman.spdomain <djm@sportsman.spdomain>2005-06-21 22:38:06 +0000
committerdjm@sportsman.spdomain <djm@sportsman.spdomain>2005-06-21 22:38:06 +0000
commit4d1748d5fdd8e81bf0efd03318b286e74095ab46 (patch)
treea84158cd806921617df614b64d4ff5b132bf8103
parent43b6dbbfe367df0f9b21e2aa0e81a97ca2b585da (diff)
downloadxen-4d1748d5fdd8e81bf0efd03318b286e74095ab46.tar.gz
xen-4d1748d5fdd8e81bf0efd03318b286e74095ab46.tar.bz2
xen-4d1748d5fdd8e81bf0efd03318b286e74095ab46.zip
bitkeeper revision 1.1713.4.1 (42b896ce_iXHcZjWxYV17vzV3fQhTA)
Adapt to recent patches in common
-rw-r--r--.rootkeys1
-rw-r--r--xen/include/asm-ia64/config.h3
-rw-r--r--xen/include/asm-ia64/shadow.h1
3 files changed, 5 insertions, 0 deletions
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 */