ia64/xen-unstable

changeset 4022:f8026d38aa87

bitkeeper revision 1.1236.1.67 (422e2dc5SlwFPJ7Z3VO8mdslOL6dxg)

Merge kirby.fc.hp.com:/home/djm/src/xen/xeno-unstable-ia64.bk
into kirby.fc.hp.com:/home/djm/src/xen/clonedomain0.bk
author djm@kirby.fc.hp.com
date Tue Mar 08 22:57:09 2005 +0000 (2005-03-08)
parents 00d90ee922c5 dce709e1e050
children a13b9052d91d
files xen/arch/ia64/patch/linux-2.6.7/time.c xen/arch/ia64/process.c xen/arch/ia64/regionreg.c xen/arch/ia64/vcpu.c xen/arch/ia64/xenmisc.c xen/arch/ia64/xensetup.c xen/include/asm-ia64/config.h xen/include/asm-ia64/vcpu.h xen/include/public/arch-ia64.h
line diff
     1.1 --- a/xen/arch/ia64/patch/linux-2.6.7/time.c	Mon Mar 07 21:39:18 2005 +0000
     1.2 +++ b/xen/arch/ia64/patch/linux-2.6.7/time.c	Tue Mar 08 22:57:09 2005 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4 ---- /home/djm/src/xen/xeno-ia64.bk/xen/linux-2.6.7/arch/ia64/kernel/time.c	2004-06-15 23:19:01.000000000 -0600
     1.5 -+++ /home/djm/src/xen/xeno-ia64.bk/xen/arch/ia64/time.c	2004-11-23 17:25:18.000000000 -0700
     1.6 +--- ../../linux-2.6.7/arch/ia64/kernel/time.c	2004-06-15 23:19:01.000000000 -0600
     1.7 ++++ arch/ia64/time.c	2005-03-08 08:05:00.000000000 -0700
     1.8  @@ -10,16 +10,22 @@
     1.9    */
    1.10   #include <linux/config.h>
    1.11 @@ -33,7 +33,7 @@
    1.12   
    1.13   extern unsigned long wall_jiffies;
    1.14   
    1.15 -@@ -45,6 +54,59 @@
    1.16 +@@ -45,6 +54,58 @@
    1.17   
    1.18   #endif
    1.19   
    1.20 @@ -45,8 +45,7 @@
    1.21  +
    1.22  +static inline u64 get_time_delta(void)
    1.23  +{
    1.24 -+	printf("get_time_delta: called, not implemented\n");
    1.25 -+	return 0;
    1.26 ++	return ia64_get_itc();
    1.27  +}
    1.28  +
    1.29  +s_time_t get_s_time(void)
    1.30 @@ -74,7 +73,7 @@
    1.31  +void update_dom_time(struct domain *d)
    1.32  +{
    1.33  +// FIXME: implement this?
    1.34 -+	printf("update_dom_time: called, not implemented, skipping\n");
    1.35 ++//	printf("update_dom_time: called, not implemented, skipping\n");
    1.36  +}
    1.37  +
    1.38  +/* Set clock to <secs,usecs> after 00:00:00 UTC, 1 January, 1970. */
    1.39 @@ -93,7 +92,7 @@
    1.40   static void
    1.41   itc_reset (void)
    1.42   {
    1.43 -@@ -80,12 +142,15 @@
    1.44 +@@ -80,12 +141,15 @@
    1.45   	return (elapsed_cycles*local_cpu_data->nsec_per_cyc) >> IA64_NSEC_PER_CYC_SHIFT;
    1.46   }
    1.47   
    1.48 @@ -109,7 +108,7 @@
    1.49   int
    1.50   do_settimeofday (struct timespec *tv)
    1.51   {
    1.52 -@@ -95,7 +160,9 @@
    1.53 +@@ -95,7 +159,9 @@
    1.54   	if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
    1.55   		return -EINVAL;
    1.56   
    1.57 @@ -119,7 +118,7 @@
    1.58   	{
    1.59   		/*
    1.60   		 * This is revolting. We need to set "xtime" correctly. However, the value
    1.61 -@@ -117,12 +184,15 @@
    1.62 +@@ -117,12 +183,15 @@
    1.63   		time_esterror = NTP_PHASE_LIMIT;
    1.64   		time_interpolator_reset();
    1.65   	}
    1.66 @@ -135,7 +134,7 @@
    1.67   
    1.68   void
    1.69   do_gettimeofday (struct timeval *tv)
    1.70 -@@ -185,6 +255,7 @@
    1.71 +@@ -185,6 +254,7 @@
    1.72   }
    1.73   
    1.74   EXPORT_SYMBOL(do_gettimeofday);
    1.75 @@ -143,7 +142,7 @@
    1.76   
    1.77   /*
    1.78    * The profiling function is SMP safe. (nothing can mess
    1.79 -@@ -195,6 +266,9 @@
    1.80 +@@ -195,6 +265,9 @@
    1.81   static inline void
    1.82   ia64_do_profile (struct pt_regs * regs)
    1.83   {
    1.84 @@ -153,7 +152,7 @@
    1.85   	unsigned long ip, slot;
    1.86   	extern cpumask_t prof_cpu_mask;
    1.87   
    1.88 -@@ -231,24 +305,88 @@
    1.89 +@@ -231,24 +304,89 @@
    1.90   		ip = prof_len-1;
    1.91   	atomic_inc((atomic_t *)&prof_buffer[ip]);
    1.92   }
    1.93 @@ -219,6 +218,7 @@
    1.94  +			domain_wake(current);
    1.95  +		}
    1.96  +	}
    1.97 ++	raise_actimer_softirq();
    1.98  +#endif
    1.99   
   1.100  +#ifndef XEN
     2.1 --- a/xen/arch/ia64/process.c	Mon Mar 07 21:39:18 2005 +0000
     2.2 +++ b/xen/arch/ia64/process.c	Tue Mar 08 22:57:09 2005 +0000
     2.3 @@ -239,8 +239,9 @@ void xen_handle_domain_access(unsigned l
     2.4  	unsigned long psr = regs->cr_ipsr, mask, flags;
     2.5  	unsigned long iip = regs->cr_iip;
     2.6  	// FIXME should validate address here
     2.7 -	unsigned long pteval, mpaddr;
     2.8 +	unsigned long pteval, mpaddr, ps;
     2.9  	unsigned long lookup_domain_mpa(struct domain *,unsigned long);
    2.10 +	unsigned long match_dtlb(struct exec_domain *,unsigned long, unsigned long *, unsigned long *);
    2.11  	IA64FAULT fault;
    2.12  #ifndef USER_ACCESS
    2.13  	extern void __get_domain_bundle(void);
    2.14 @@ -264,7 +265,7 @@ void xen_handle_domain_access(unsigned l
    2.15  		pteval = lookup_domain_mpa(d,address);
    2.16  		//FIXME: check return value?
    2.17  		// would be nice to have a counter here
    2.18 -		vcpu_itc_no_srlz(ed,2,address,pteval,PAGE_SHIFT);
    2.19 +		vcpu_itc_no_srlz(ed,2,address,pteval,-1UL,PAGE_SHIFT);
    2.20  		return;
    2.21  	}
    2.22  #ifndef USER_ACCESS
    2.23 @@ -276,6 +277,12 @@ void xen_handle_domain_access(unsigned l
    2.24  #endif
    2.25  if (address < 0x4000) printf("WARNING: page_fault @%p, iip=%p\n",address,iip);
    2.26  		
    2.27 +	// if we are fortunate enough to have it in the 1-entry TLB...
    2.28 +	if (pteval = match_dtlb(ed,address,&ps,NULL)) {
    2.29 +		vcpu_itc_no_srlz(ed,6,address,pteval,-1UL,ps);
    2.30 +		return;
    2.31 +	}
    2.32 +	// look in the TRs
    2.33  	fault = vcpu_tpa(ed,address,&mpaddr);
    2.34  	if (fault != IA64_NO_FAULT) {
    2.35  #ifndef USER_ACCESS
    2.36 @@ -314,7 +321,7 @@ if (address < 0x4000) printf("WARNING: p
    2.37  	// would be nice to have a counter here
    2.38  	//printf("Handling privop data TLB miss\n");
    2.39  	// FIXME, must be inlined or potential for nested fault here!
    2.40 -	vcpu_itc_no_srlz(ed,2,address,pteval,PAGE_SHIFT);
    2.41 +	vcpu_itc_no_srlz(ed,2,address,pteval,-1UL,PAGE_SHIFT);
    2.42  }
    2.43  
    2.44  void ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs, unsigned long itir)
    2.45 @@ -357,13 +364,13 @@ void ia64_do_page_fault (unsigned long a
    2.46  		}
    2.47  		pteval = lookup_domain_mpa(d,address);
    2.48  		// FIXME, must be inlined or potential for nested fault here!
    2.49 -		vcpu_itc_no_srlz(current,is_data?2:1,address,pteval,PAGE_SHIFT);
    2.50 +		vcpu_itc_no_srlz(current,is_data?2:1,address,pteval,-1UL,PAGE_SHIFT);
    2.51  		return;
    2.52  	}
    2.53  	if (trp = match_tr(current,address)) {
    2.54  		// FIXME address had better be pre-validated on insert
    2.55  		pteval = translate_domain_pte(trp->page_flags,address,trp->itir);
    2.56 -		vcpu_itc_no_srlz(current,is_data?2:1,address,pteval,(trp->itir>>2)&0x3f);
    2.57 +		vcpu_itc_no_srlz(current,is_data?2:1,address,pteval,-1UL,(trp->itir>>2)&0x3f);
    2.58  		return;
    2.59  	}
    2.60  	vector = is_data ? IA64_DATA_TLB_VECTOR : IA64_INST_TLB_VECTOR;
     3.1 --- a/xen/arch/ia64/regionreg.c	Mon Mar 07 21:39:18 2005 +0000
     3.2 +++ b/xen/arch/ia64/regionreg.c	Tue Mar 08 22:57:09 2005 +0000
     3.3 @@ -146,6 +146,8 @@ int allocate_rid_range(struct domain *d,
     3.4  	d->rid_bits = ridbits;
     3.5  	d->starting_rid = i << IA64_MIN_IMPL_RID_BITS;
     3.6  	d->ending_rid = (i+n_rid_blocks) << IA64_MIN_IMPL_RID_BITS;
     3.7 +printf("###allocating rid_range, domain %p: starting_rid=%lx, ending_rid=%lx\n",
     3.8 +d,d->starting_rid, d->ending_rid);
     3.9  	
    3.10  	return 1;
    3.11  }
    3.12 @@ -361,8 +363,7 @@ virtualize_rid(struct exec_domain *ed, u
    3.13  //
    3.14  unsigned long load_region_regs(struct exec_domain *ed)
    3.15  {
    3.16 -	unsigned long rr0, rr1,rr2, rr3, rr4, rr5, rr6;
    3.17 -	unsigned long oldrr7, newrr7;
    3.18 +	unsigned long rr0, rr1,rr2, rr3, rr4, rr5, rr6, rr7;
    3.19  	// TODO: These probably should be validated
    3.20  
    3.21  	if (ed->vcpu_info->arch.metaphysical_mode) {
    3.22 @@ -372,9 +373,16 @@ unsigned long load_region_regs(struct ex
    3.23  		rrv.rid = ed->domain->metaphysical_rid;
    3.24  		rrv.ps = PAGE_SHIFT;
    3.25  		rrv.ve = 1;
    3.26 -		rr0 = rr1 = rr2 = rr3 = rr4 = rr5 = newrr7 = rrv.rrval;
    3.27 +		rr0 = rr1 = rr2 = rr3 = rr4 = rr5 = rrv.rrval;
    3.28  		rrv.ve = 0;
    3.29  		rr6 = rrv.rrval;
    3.30 +		set_rr_no_srlz(0x0000000000000000L, rr0);
    3.31 +		set_rr_no_srlz(0x2000000000000000L, rr1);
    3.32 +		set_rr_no_srlz(0x4000000000000000L, rr2);
    3.33 +		set_rr_no_srlz(0x6000000000000000L, rr3);
    3.34 +		set_rr_no_srlz(0x8000000000000000L, rr4);
    3.35 +		set_rr_no_srlz(0xa000000000000000L, rr5);
    3.36 +		set_rr_no_srlz(0xc000000000000000L, rr6);
    3.37  	}
    3.38  	else {
    3.39  		rr0 = physicalize_rid(ed, ed->vcpu_info->arch.rrs[0]);
    3.40 @@ -384,21 +392,16 @@ unsigned long load_region_regs(struct ex
    3.41  		rr4 = physicalize_rid(ed, ed->vcpu_info->arch.rrs[4]);
    3.42  		rr5 = physicalize_rid(ed, ed->vcpu_info->arch.rrs[5]);
    3.43  		rr6 = physicalize_rid(ed, ed->vcpu_info->arch.rrs[6]);
    3.44 -		newrr7 = physicalize_rid(ed, ed->vcpu_info->arch.rrs[7]);
    3.45 +		set_one_rr(0x0000000000000000L, rr0);
    3.46 +		set_one_rr(0x2000000000000000L, rr1);
    3.47 +		set_one_rr(0x4000000000000000L, rr2);
    3.48 +		set_one_rr(0x6000000000000000L, rr3);
    3.49 +		set_one_rr(0x8000000000000000L, rr4);
    3.50 +		set_one_rr(0xa000000000000000L, rr5);
    3.51 +		set_one_rr(0xc000000000000000L, rr6);
    3.52 +		ia64_srlz_d();
    3.53  	}
    3.54 -
    3.55 -	set_rr_no_srlz(0x0000000000000000L, rr0);
    3.56 -	set_rr_no_srlz(0x2000000000000000L, rr1);
    3.57 -	set_rr_no_srlz(0x4000000000000000L, rr2);
    3.58 -	set_rr_no_srlz(0x6000000000000000L, rr3);
    3.59 -	set_rr_no_srlz(0x8000000000000000L, rr4);
    3.60 -	set_rr_no_srlz(0xa000000000000000L, rr5);
    3.61 -	set_rr_no_srlz(0xc000000000000000L, rr6);
    3.62 +	rr7 = physicalize_rid(ed, ed->vcpu_info->arch.rrs[7]);
    3.63 +	set_one_rr(0xe000000000000000L, rr7);
    3.64  	ia64_srlz_d();
    3.65 -	oldrr7 = get_rr(0xe000000000000000L);
    3.66 -	if (oldrr7 != newrr7) {
    3.67 -		newrr7 = (newrr7 & ~0xff) | (PAGE_SHIFT << 2) | 1;
    3.68 -		return vmMangleRID(newrr7);
    3.69 -	}
    3.70 -	else return 0;
    3.71  }
     4.1 --- a/xen/arch/ia64/vcpu.c	Mon Mar 07 21:39:18 2005 +0000
     4.2 +++ b/xen/arch/ia64/vcpu.c	Tue Mar 08 22:57:09 2005 +0000
     4.3 @@ -1097,12 +1097,18 @@ IA64FAULT vcpu_ttag(VCPU *vcpu, UINT64 v
     4.4  IA64FAULT vcpu_tpa(VCPU *vcpu, UINT64 vadr, UINT64 *padr)
     4.5  {
     4.6  	extern TR_ENTRY *match_tr(VCPU *,UINT64);
     4.7 -	extern TR_ENTRY *match_dtlb(VCPU *,UINT64);
     4.8 +	unsigned long match_dtlb(VCPU *, unsigned long, unsigned long *, unsigned long *);
     4.9  	TR_ENTRY *trp;
    4.10 -	UINT64 mask;
    4.11 +	UINT64 mask, pteval, mp_pte, ps;
    4.12  
    4.13  extern unsigned long privop_trace;
    4.14 -	if ((trp=match_tr(current,vadr)) || (trp=match_dtlb(current,vadr))) {
    4.15 +	if (pteval = match_dtlb(vcpu, vadr, &ps, &mp_pte) && (mp_pte != -1UL)) {
    4.16 +		mask = (1L << ps) - 1;
    4.17 +		*padr = ((mp_pte & _PAGE_PPN_MASK) & ~mask) | (vadr & mask);
    4.18 +		verbose("vcpu_tpa: addr=%p @%p, successful, padr=%p\n",vadr,PSCB(vcpu,iip),*padr);
    4.19 +		return (IA64_NO_FAULT);
    4.20 +	}
    4.21 +	if (trp=match_tr(current,vadr)) {
    4.22  		mask = (1L << trp->ps) - 1;
    4.23  		*padr = ((trp->ppn << 12) & ~mask) | (vadr & mask);
    4.24  		verbose("vcpu_tpa: addr=%p @%p, successful, padr=%p\n",vadr,PSCB(vcpu,iip),*padr);
    4.25 @@ -1418,7 +1424,7 @@ void foobar(void) { /*vcpu_verbose = 1;*
    4.26  
    4.27  extern struct domain *dom0;
    4.28  
    4.29 -void vcpu_itc_no_srlz(VCPU *vcpu, UINT64 IorD, UINT64 vaddr, UINT64 pte, UINT64 logps)
    4.30 +void vcpu_itc_no_srlz(VCPU *vcpu, UINT64 IorD, UINT64 vaddr, UINT64 pte, UINT64 mp_pte, UINT64 logps)
    4.31  {
    4.32  	unsigned long psr;
    4.33  	unsigned long ps = (vcpu->domain==dom0) ? logps : PAGE_SHIFT;
    4.34 @@ -1429,13 +1435,29 @@ void vcpu_itc_no_srlz(VCPU *vcpu, UINT64
    4.35  	ia64_itc(IorD,vaddr,pte,ps); // FIXME: look for bigger mappings
    4.36  	ia64_set_psr(psr);
    4.37  	// ia64_srlz_i(); // no srls req'd, will rfi later
    4.38 -	if (IorD & 0x1) vcpu_set_tr_entry(&PSCB(vcpu,itlb),pte,logps<<2,vaddr);
    4.39 -	if (IorD & 0x2) vcpu_set_tr_entry(&PSCB(vcpu,dtlb),pte,logps<<2,vaddr);
    4.40 +	if (IorD & 0x4) return;  // don't place in 1-entry TLB
    4.41 +	if (IorD & 0x1) {
    4.42 +		vcpu_set_tr_entry(&PSCB(vcpu,itlb),pte,ps<<2,vaddr);
    4.43 +		PSCB(vcpu,itlb_pte) = mp_pte;
    4.44 +	}
    4.45 +	if (IorD & 0x2) {
    4.46 +		vcpu_set_tr_entry(&PSCB(vcpu,dtlb),pte,ps<<2,vaddr);
    4.47 +		PSCB(vcpu,dtlb_pte) = mp_pte;
    4.48 +	}
    4.49  }
    4.50  
    4.51 -TR_ENTRY *match_dtlb(VCPU *vcpu, unsigned long ifa)
    4.52 +// NOTE: returns a physical pte, NOT a "metaphysical" pte, so do not check
    4.53 +// the physical address contained for correctness
    4.54 +unsigned long match_dtlb(VCPU *vcpu, unsigned long ifa, unsigned long *ps, unsigned long *mp_pte)
    4.55  {
    4.56 -	return vcpu_match_tr_entry(vcpu,&vcpu->vcpu_info->arch.dtlb,ifa,1);
    4.57 +	TR_ENTRY *trp;
    4.58 +
    4.59 +	if (trp = vcpu_match_tr_entry(vcpu,&vcpu->vcpu_info->arch.dtlb,ifa,1)) {
    4.60 +		if (ps) *ps = trp->ps;
    4.61 +		if (mp_pte) *mp_pte = vcpu->vcpu_info->arch.dtlb_pte;
    4.62 +		return (trp->page_flags);
    4.63 +	}
    4.64 +	return 0UL;
    4.65  }
    4.66  
    4.67  IA64FAULT vcpu_itc_d(VCPU *vcpu, UINT64 pte, UINT64 itir, UINT64 ifa)
    4.68 @@ -1451,7 +1473,7 @@ IA64FAULT vcpu_itc_d(VCPU *vcpu, UINT64 
    4.69  	//itir = (itir & ~0xfc) | (PAGE_SHIFT<<2); // ignore domain's pagesize
    4.70  	pteval = translate_domain_pte(pte,ifa,itir);
    4.71  	if (!pteval) return IA64_ILLOP_FAULT;
    4.72 -	vcpu_itc_no_srlz(vcpu,2,ifa,pteval,logps);
    4.73 +	vcpu_itc_no_srlz(vcpu,2,ifa,pteval,pte,logps);
    4.74  	return IA64_NO_FAULT;
    4.75  }
    4.76  
    4.77 @@ -1470,7 +1492,7 @@ IA64FAULT vcpu_itc_i(VCPU *vcpu, UINT64 
    4.78  	pteval = translate_domain_pte(pte,ifa,itir);
    4.79  	// FIXME: what to do if bad physical address? (machine check?)
    4.80  	if (!pteval) return IA64_ILLOP_FAULT;
    4.81 -	vcpu_itc_no_srlz(vcpu, 1,ifa,pteval,logps);
    4.82 +	vcpu_itc_no_srlz(vcpu, 1,ifa,pteval,pte,logps);
    4.83  	return IA64_NO_FAULT;
    4.84  }
    4.85  
    4.86 @@ -1480,13 +1502,25 @@ IA64FAULT vcpu_ptc_l(VCPU *vcpu, UINT64 
    4.87  	return IA64_ILLOP_FAULT;
    4.88  }
    4.89  
    4.90 +// At privlvl=0, fc performs no access rights or protection key checks, while
    4.91 +// at privlvl!=0, fc performs access rights checks as if it were a 1-byte
    4.92 +// read but no protection key check.  Thus in order to avoid an unexpected
    4.93 +// access rights fault, we have to translate the virtual address to a
    4.94 +// physical address (possibly via a metaphysical address) and do the fc
    4.95 +// on the physical address, which is guaranteed to flush the same cache line
    4.96  IA64FAULT vcpu_fc(VCPU *vcpu, UINT64 vadr)
    4.97  {
    4.98 -	UINT64 mpaddr;
    4.99 +	UINT64 mpaddr, ps;
   4.100  	IA64FAULT fault;
   4.101 +	unsigned long match_dtlb(VCPU *, unsigned long, unsigned long *, unsigned long *);
   4.102  	unsigned long lookup_domain_mpa(struct domain *,unsigned long);
   4.103  	unsigned long pteval, dom_imva;
   4.104  
   4.105 +	if (pteval = match_dtlb(vcpu, vadr, NULL, NULL)) {
   4.106 +		dom_imva = __va(pteval & _PFN_MASK);
   4.107 +		ia64_fc(dom_imva);
   4.108 +		return IA64_NO_FAULT;
   4.109 +	}
   4.110  	fault = vcpu_tpa(vcpu, vadr, &mpaddr);
   4.111  	if (fault == IA64_NO_FAULT) {
   4.112  		struct domain *dom0;
     5.1 --- a/xen/arch/ia64/xenmisc.c	Mon Mar 07 21:39:18 2005 +0000
     5.2 +++ b/xen/arch/ia64/xenmisc.c	Tue Mar 08 22:57:09 2005 +0000
     5.3 @@ -15,6 +15,7 @@
     5.4  #include <asm/processor.h>
     5.5  #include <xen/serial.h>
     5.6  #include <asm/io.h>
     5.7 +#include <xen/softirq.h>
     5.8  
     5.9  efi_memory_desc_t ia64_efi_io_md;
    5.10  EXPORT_SYMBOL(ia64_efi_io_md);
    5.11 @@ -67,12 +68,22 @@ struct pt_regs *get_execution_context(vo
    5.12  
    5.13  void cleanup_writable_pagetable(struct domain *d, int what) { return; }
    5.14  
    5.15 +void raise_actimer_softirq(void)
    5.16 +{
    5.17 +	raise_softirq(AC_TIMER_SOFTIRQ);
    5.18 +}
    5.19 +
    5.20  ///////////////////////////////
    5.21  // from arch/x86/apic.c
    5.22  ///////////////////////////////
    5.23  
    5.24  int reprogram_ac_timer(s_time_t timeout)
    5.25  {
    5.26 +	struct exec_domain *ed = current;
    5.27 +
    5.28 +	local_cpu_data->itm_next = timeout;
    5.29 +	if (is_idle_task(ed->domain)) vcpu_safe_set_itm(timeout);
    5.30 +	else vcpu_set_next_timer(current);
    5.31  	return 1;
    5.32  }
    5.33  
     6.1 --- a/xen/arch/ia64/xensetup.c	Mon Mar 07 21:39:18 2005 +0000
     6.2 +++ b/xen/arch/ia64/xensetup.c	Tue Mar 08 22:57:09 2005 +0000
     6.3 @@ -140,6 +140,7 @@ void cmain(multiboot_info_t *mbi)
     6.4  
     6.5      /* Must do this early -- e.g., spinlocks rely on get_current(). */
     6.6      set_current(&idle0_exec_domain);
     6.7 +    idle0_exec_domain.domain = &idle0_domain;
     6.8  
     6.9      early_setup_arch();
    6.10  
    6.11 @@ -286,7 +287,7 @@ printk("About to call time_init()\n");
    6.12  printk("About to call ac_timer_init()\n");
    6.13      ac_timer_init();
    6.14  // init_xen_time(); ???
    6.15 -// schedulers_start(); ???
    6.16 +    schedulers_start();
    6.17  // do_initcalls(); ???
    6.18  printk("About to call sort_main_extable()\n");
    6.19      sort_main_extable();
     7.1 --- a/xen/include/asm-ia64/config.h	Mon Mar 07 21:39:18 2005 +0000
     7.2 +++ b/xen/include/asm-ia64/config.h	Tue Mar 08 22:57:09 2005 +0000
     7.3 @@ -1,5 +1,7 @@
     7.4  // control flags for turning on/off features under test
     7.5  #undef CLONE_DOMAIN0
     7.6 +//#define CLONE_DOMAIN0 1
     7.7 +//#undef CLONE_DOMAIN0
     7.8  #define USER_ACCESS
     7.9  
    7.10  // manufactured from component pieces
     8.1 --- a/xen/include/asm-ia64/vcpu.h	Mon Mar 07 21:39:18 2005 +0000
     8.2 +++ b/xen/include/asm-ia64/vcpu.h	Tue Mar 08 22:57:09 2005 +0000
     8.3 @@ -131,7 +131,7 @@ extern void vcpu_poke_timer(VCPU *vcpu);
     8.4  extern void vcpu_set_next_timer(VCPU *vcpu);
     8.5  extern BOOLEAN vcpu_timer_expired(VCPU *vcpu);
     8.6  extern UINT64 vcpu_deliverable_interrupts(VCPU *vcpu);
     8.7 -extern void vcpu_itc_no_srlz(VCPU *vcpu, UINT64, UINT64, UINT64, UINT64);
     8.8 +extern void vcpu_itc_no_srlz(VCPU *vcpu, UINT64, UINT64, UINT64, UINT64, UINT64);
     8.9  
    8.10  
    8.11  #endif
     9.1 --- a/xen/include/public/arch-ia64.h	Mon Mar 07 21:39:18 2005 +0000
     9.2 +++ b/xen/include/public/arch-ia64.h	Tue Mar 08 22:57:09 2005 +0000
     9.3 @@ -70,6 +70,8 @@ typedef struct {
     9.4  	TR_ENTRY dtrs[NDTRS];
     9.5  	TR_ENTRY itlb;
     9.6  	TR_ENTRY dtlb;
     9.7 +	unsigned long itlb_pte;
     9.8 +	unsigned long dtlb_pte;
     9.9  	unsigned long irr[4];
    9.10  	unsigned long insvc[4];
    9.11  	unsigned long iva;