Wei, Gang
2010-May-18 10:29 UTC
[Xen-devel] [PATCH]x86-hpet: fix booting NULL pointer panic introduced by c/s 21398
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@intel.com> diff -r e4028345ad48 xen/arch/x86/hpet.c --- a/xen/arch/x86/hpet.c Mon May 17 18:52:01 2010 +0100 +++ b/xen/arch/x86/hpet.c Wed May 19 02:16:41 2010 +0800 @@ -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-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel