Attachment 304706 Details for Bug 445472 – backport of xen-unstable.hg 204046d99562 and 1a010d9444ba

[patch] backport of xen-unstable.hg 204046d99562 and 1a010d9444ba

linux-2.6-xen-ia64-fix-time_resume.patch (text/plain), 2.02 KB, created by Aron Griffis on 2008-05-07 00:23:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aron Griffis

Created: 2008-05-07 00:23:11 UTC

Size: 2.02 KB

patch

obsolete

>Backport of 
>http://xenbits.xensource.com/xen-unstable.hg?rev/1a010d9444ba
>and the important bits from
>http://xenbits.xensource.com/xen-unstable.hg?rev/204046d99562
>
>diff -ur linux-2.6.18.ia64.orig/arch/ia64/kernel/time.c linux-2.6.18.ia64/arch/ia64/kernel/time.c
>--- linux-2.6.18.ia64.orig/arch/ia64/kernel/time.c	2008-05-06 19:21:43.000000000 -0400
>+++ linux-2.6.18.ia64/arch/ia64/kernel/time.c	2008-05-06 19:24:07.000000000 -0400
>@@ -267,6 +267,26 @@
> 	per_cpu(processed_stolen_time, cpu) = runstate->time[RUNSTATE_runnable]
> 					    + runstate->time[RUNSTATE_offline];
> }
>+
>+/* Called after suspend, to resume time.  */
>+void
>+time_resume(void)
>+{
>+	unsigned int cpu;
>+
>+	/* Just trigger a tick.  */
>+	ia64_cpu_local_tick();
>+
>+	/* Time interpolator remembers the last timer status.  Forget it */
>+	write_seqlock_irq(&xtime_lock);
>+	time_interpolator_reset();
>+	write_sequnlock_irq(&xtime_lock);
>+
>+	for_each_online_cpu(cpu)
>+		init_missing_ticks_accounting(cpu);
>+
>+	touch_softlockup_watchdog();
>+}
> #else
> #define init_missing_ticks_accounting(cpu) do {} while (0)
> #endif
>@@ -356,6 +376,9 @@
> 	if (is_running_on_xen())
> 		init_missing_ticks_accounting(smp_processor_id());
> 
>+	/* Avoid soft lockup message when CPU is unplugged then plugged */
>+	touch_softlockup_watchdog();
>+
> 	/* Setup the CPU local timer tick */
> 	ia64_cpu_local_tick();
> }
>diff -ur linux-2.6.18.ia64.orig/arch/ia64/xen/hypervisor.c linux-2.6.18.ia64/arch/ia64/xen/hypervisor.c
>--- linux-2.6.18.ia64.orig/arch/ia64/xen/hypervisor.c	2008-05-06 19:21:43.000000000 -0400
>+++ linux-2.6.18.ia64/arch/ia64/xen/hypervisor.c	2008-05-06 19:22:06.000000000 -0400
>@@ -852,19 +852,6 @@
> }
> 
> 
>-/* Called after suspend, to resume time.  */
>-void
>-time_resume(void)
>-{
>-	extern void ia64_cpu_local_tick(void);
>-
>-	/* Just trigger a tick.  */
>-	ia64_cpu_local_tick();
>-
>-	/* Time interpolator remembers the last timer status.  Forget it */
>-	time_interpolator_reset();
>-}
>-
> ///////////////////////////////////////////////////////////////////////////
> // expose p2m table
> #ifdef CONFIG_XEN_IA64_EXPOSE_P2M

Actions: View | Diff

Attachments on bug 445472: 304706 | 329076