ia64/xen-unstable

changeset 4664:34c2b5c0ac81

bitkeeper revision 1.1327.1.7 (426ebf9dElmn-4PJcDb_JoGYAMuVlA)

Oops, forgot a patch file
author djm@kirby.fc.hp.com
date Tue Apr 26 22:24:29 2005 +0000 (2005-04-26)
parents ba67e077b528
children 0dc81495c135
files xen/arch/ia64/patch/linux-2.6.11/time.c
line diff
     1.1 --- a/xen/arch/ia64/patch/linux-2.6.11/time.c	Tue Apr 26 21:08:52 2005 +0000
     1.2 +++ b/xen/arch/ia64/patch/linux-2.6.11/time.c	Tue Apr 26 22:24:29 2005 +0000
     1.3 @@ -1,10 +1,5 @@
     1.4 - time.c |  158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
     1.5 - 1 files changed, 158 insertions(+)
     1.6 -
     1.7 -Index: linux-2.6.11-xendiffs/arch/ia64/kernel/time.c
     1.8 -===================================================================
     1.9 ---- linux-2.6.11-xendiffs.orig/arch/ia64/kernel/time.c	2005-04-07 17:02:39.634985144 -0500
    1.10 -+++ linux-2.6.11-xendiffs/arch/ia64/kernel/time.c	2005-04-07 17:23:52.777723222 -0500
    1.11 +--- ../../linux-2.6.11/arch/ia64/kernel/time.c	2005-03-02 00:37:50.000000000 -0700
    1.12 ++++ arch/ia64/time.c	2005-04-26 15:43:01.000000000 -0600
    1.13  @@ -10,16 +10,22 @@
    1.14    */
    1.15   #include <linux/config.h>
    1.16 @@ -48,7 +43,7 @@ Index: linux-2.6.11-xendiffs/arch/ia64/k
    1.17   
    1.18   EXPORT_SYMBOL(jiffies_64);
    1.19   
    1.20 -@@ -45,33 +60,154 @@ EXPORT_SYMBOL(last_cli_ip);
    1.21 +@@ -45,33 +60,155 @@
    1.22   
    1.23   #endif
    1.24   
    1.25 @@ -158,6 +153,7 @@ Index: linux-2.6.11-xendiffs/arch/ia64/k
    1.26  +		// We have to ensure that domain0 is launched before we
    1.27  +		// call vcpu_timer_expired on it
    1.28  +		//domain0_ready = 1; // moved to xensetup.c
    1.29 ++		current->vcpu_info->arch.pending_interruption = 1;
    1.30  +	}
    1.31  +	if (domain0_ready && vcpu_timer_expired(dom0->exec_domain[0])) {
    1.32  +		vcpu_pend_timer(dom0->exec_domain[0]);
    1.33 @@ -203,7 +199,7 @@ Index: linux-2.6.11-xendiffs/arch/ia64/k
    1.34   
    1.35   		new_itm += local_cpu_data->itm_delta;
    1.36   
    1.37 -@@ -82,10 +218,16 @@ timer_interrupt (int irq, void *dev_id, 
    1.38 +@@ -82,10 +219,16 @@
    1.39   			 * another CPU. We need to avoid to SMP race by acquiring the
    1.40   			 * xtime_lock.
    1.41   			 */
    1.42 @@ -220,7 +216,7 @@ Index: linux-2.6.11-xendiffs/arch/ia64/k
    1.43   		} else
    1.44   			local_cpu_data->itm_next = new_itm;
    1.45   
    1.46 -@@ -105,7 +247,12 @@ timer_interrupt (int irq, void *dev_id, 
    1.47 +@@ -105,7 +248,12 @@
    1.48   		 */
    1.49   		while (!time_after(new_itm, ia64_get_itc() + local_cpu_data->itm_delta/2))
    1.50   			new_itm += local_cpu_data->itm_delta;
    1.51 @@ -233,7 +229,7 @@ Index: linux-2.6.11-xendiffs/arch/ia64/k
    1.52   		/* double check, in case we got hit by a (slow) PMI: */
    1.53   	} while (time_after_eq(ia64_get_itc(), new_itm));
    1.54   	return IRQ_HANDLED;
    1.55 -@@ -120,6 +267,7 @@ ia64_cpu_local_tick (void)
    1.56 +@@ -120,6 +268,7 @@
    1.57   	int cpu = smp_processor_id();
    1.58   	unsigned long shift = 0, delta;
    1.59   
    1.60 @@ -241,7 +237,7 @@ Index: linux-2.6.11-xendiffs/arch/ia64/k
    1.61   	/* arrange for the cycle counter to generate a timer interrupt: */
    1.62   	ia64_set_itv(IA64_TIMER_VECTOR);
    1.63   
    1.64 -@@ -133,6 +281,7 @@ ia64_cpu_local_tick (void)
    1.65 +@@ -133,6 +282,7 @@
    1.66   		shift = (2*(cpu - hi) + 1) * delta/hi/2;
    1.67   	}
    1.68   	local_cpu_data->itm_next = ia64_get_itc() + delta + shift;
    1.69 @@ -249,7 +245,7 @@ Index: linux-2.6.11-xendiffs/arch/ia64/k
    1.70   	ia64_set_itm(local_cpu_data->itm_next);
    1.71   }
    1.72   
    1.73 -@@ -160,6 +309,7 @@ ia64_init_itm (void)
    1.74 +@@ -160,6 +310,7 @@
    1.75   	 * frequency and then a PAL call to determine the frequency ratio between the ITC
    1.76   	 * and the base frequency.
    1.77   	 */
    1.78 @@ -257,7 +253,7 @@ Index: linux-2.6.11-xendiffs/arch/ia64/k
    1.79   	status = ia64_sal_freq_base(SAL_FREQ_BASE_PLATFORM,
    1.80   				    &platform_base_freq, &platform_base_drift);
    1.81   	if (status != 0) {
    1.82 -@@ -212,6 +362,7 @@ ia64_init_itm (void)
    1.83 +@@ -212,6 +363,7 @@
    1.84   					+ itc_freq/2)/itc_freq;
    1.85   
    1.86   	if (!(sal_platform_features & IA64_SAL_PLATFORM_FEATURE_ITC_DRIFT)) {
    1.87 @@ -265,7 +261,7 @@ Index: linux-2.6.11-xendiffs/arch/ia64/k
    1.88   		itc_interpolator.frequency = local_cpu_data->itc_freq;
    1.89   		itc_interpolator.drift = itc_drift;
    1.90   #ifdef CONFIG_SMP
    1.91 -@@ -228,6 +379,7 @@ ia64_init_itm (void)
    1.92 +@@ -228,6 +380,7 @@
    1.93   		if (!nojitter) itc_interpolator.jitter = 1;
    1.94   #endif
    1.95   		register_time_interpolator(&itc_interpolator);
    1.96 @@ -273,7 +269,7 @@ Index: linux-2.6.11-xendiffs/arch/ia64/k
    1.97   	}
    1.98   
    1.99   	/* Setup the CPU local timer tick */
   1.100 -@@ -236,7 +388,9 @@ ia64_init_itm (void)
   1.101 +@@ -236,7 +389,9 @@
   1.102   
   1.103   static struct irqaction timer_irqaction = {
   1.104   	.handler =	timer_interrupt,
   1.105 @@ -283,7 +279,7 @@ Index: linux-2.6.11-xendiffs/arch/ia64/k
   1.106   	.name =		"timer"
   1.107   };
   1.108   
   1.109 -@@ -244,12 +398,16 @@ void __init
   1.110 +@@ -244,12 +399,16 @@
   1.111   time_init (void)
   1.112   {
   1.113   	register_percpu_irq(IA64_TIMER_VECTOR, &timer_irqaction);