diff options
author | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2005-06-21 23:32:45 +0000 |
---|---|---|
committer | djm@kirby.fc.hp.com <djm@kirby.fc.hp.com> | 2005-06-21 23:32:45 +0000 |
commit | cbdb5e3d6caf8b404ffd0757724e5ad7db32e10a (patch) | |
tree | 39311e9aaa46d4b6694b1f5bf73c4b45fc23ec0c | |
parent | e420a590d9ac6f10accec6931bb50270724f4b91 (diff) | |
parent | 4d1748d5fdd8e81bf0efd03318b286e74095ab46 (diff) | |
download | xen-cbdb5e3d6caf8b404ffd0757724e5ad7db32e10a.tar.gz xen-cbdb5e3d6caf8b404ffd0757724e5ad7db32e10a.tar.bz2 xen-cbdb5e3d6caf8b404ffd0757724e5ad7db32e10a.zip |
bitkeeper revision 1.1713.2.20 (42b8a39dyJz2b10psbnobavBUcjTTw)
Merge djm@sportsman.fc.hp.com:/home/djm/xeno-unstable-ia64.bk
into kirby.fc.hp.com:/home/djm/src/xen/xeno-unstable-ia64.bk
-rw-r--r-- | .rootkeys | 1 | ||||
-rw-r--r-- | xen/include/asm-ia64/config.h | 3 | ||||
-rw-r--r-- | xen/include/asm-ia64/shadow.h | 1 |
3 files changed, 5 insertions, 0 deletions
@@ -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 */ |