[Xen-changelog] [xen-unstable] x86-hpet: fix booting NULL pointer panic introduced by c/s 21398.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1274185845 -3600
# Node ID 6337db5274796706d9e91fcbd3544786b2785c39
# Parent  1b49bfd3b0d7cc60bf2d602c6c2f3c1319480b89
x86-hpet: fix booting NULL pointer panic introduced by c/s 21398.

(XEN) Xen call trace:
(XEN)    [<ffff82c48011fb27>] check_lock+0x19/0x49
(XEN)    [<ffff82c48011ff2a>] _spin_lock_irq+0x28/0x4a
(XEN)    [<ffff82c48018fd6d>] hpet_broadcast_exit+0x92/0x1f0
(XEN)    [<ffff82c4801920b2>] acpi_processor_idle+0x62c/0x6e6
(XEN)    [<ffff82c48014e1a1>] idle_loop+0x62/0x73

Signed-off-by: Wei Gang <gang.wei@xxxxxxxxx>
---
 xen/arch/x86/hpet.c |    3 +++
 1 files changed, 3 insertions(+)

diff -r 1b49bfd3b0d7 -r 6337db527479 xen/arch/x86/hpet.c
--- a/xen/arch/x86/hpet.c       Tue May 18 13:23:02 2010 +0100
+++ b/xen/arch/x86/hpet.c       Tue May 18 13:30:45 2010 +0100
@@ -684,6 +684,9 @@ void hpet_broadcast_exit(void)
     if ( this_cpu(timer_deadline_start) == 0 )
         return;
 
+    if ( !ch )
+        ch = hpet_get_channel(cpu);
+
     /* Reprogram the deadline; trigger timer work now if it has passed. */
     enable_APIC_timer();
     if ( !reprogram_timer(this_cpu(timer_deadline_start)) )

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog