# HG changeset patch # User yamahata@xxxxxxxxxxxxx # Date 1178100919 -32400 # Node ID 72d723ac6e047a90cdb98cb14d38acabb11bd5a2 # Parent 63263d715d4309e7bccdd43d0f9c5c49be8c52ac prevent softlock up message when domain is restored. PATCHNAME: prevent_softlockup_message_when_restore Signed-off-by: Isaku Yamahata diff -r 63263d715d43 -r 72d723ac6e04 linux-2.6-xen-sparse/arch/ia64/kernel/time.c --- a/linux-2.6-xen-sparse/arch/ia64/kernel/time.c Thu May 03 14:38:26 2007 -0600 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/time.c Wed May 02 19:15:19 2007 +0900 @@ -322,6 +322,8 @@ time_resume(void) for_each_online_cpu(cpu) init_missing_ticks_accounting(cpu); + + touch_softlockup_watchdog(); } #else #define init_missing_ticks_accounting(cpu) do {} while (0) @@ -412,6 +414,9 @@ ia64_init_itm (void) if (is_running_on_xen()) init_missing_ticks_accounting(smp_processor_id()); + /* avoid softlock up message when cpu is unplug and plugged again. */ + touch_softlockup_watchdog(); + /* Setup the CPU local timer tick */ ia64_cpu_local_tick(); }