bitkeeper revision 1.906 (40a5e91cnvIS_3gLwfnD2G3HV3odHA)

manual merge

diff --cc xen/arch/i386/traps.c
Simple merge

diff --cc xen/common/dom0_ops.c
index f768edd5ffc87a0f9f3ac7742c2607bf7457f063,595658101883291edacfa19d16e7b66ba1069477..32fa532c9a536b58fff3e02f373da5b3d8d8f175
--- 1/xen/common/dom0_ops.c
--- 2/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@@ -21,22 -21,8 +21,13 @@@
  #include <xen/shadow.h>
  #include <hypervisor-ifs/sched_ctl.h>
  
 +
 +#define TRC_DOM0OP_START_BASE   0x00020000
 +#define TRC_DOM0OP_FINISH_BASE  0x00030000
 +
 +
  extern unsigned int alloc_new_dom_mem(struct task_struct *, unsigned int);
  
- /* Basically used to protect the domain-id space. */
- static spinlock_t create_dom_lock = SPIN_LOCK_UNLOCKED;
- 
- static domid_t get_domnr(void)
- {
-     static domid_t domnr = 0;
-     return ++domnr;
- }
- 
  static int msr_cpu_mask;
  static unsigned long msr_addr;
  static unsigned long msr_lo;

diff --cc xen/common/domain.c
Simple merge

diff --cc xen/common/memory.c
Simple merge

diff --cc xen/include/asm-i386/processor.h
Simple merge