From 3e28b1c5bb5dab099a18143a40b45ebf59a34d45 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 9 Jun 2008 09:51:14 +0100 Subject: x86: Fix S3 resume after creating an HVM guest. If we don't use PIT, we should disable it at boot time and at S3 resuming. In Xen this is done by disable_pit_irq(), but this function is used by __initcall(). After bootstrap it will be discarded and may be overwritten. This usually results in S3 resuming failure. Signed-off-by: Huacai Chen Signed-off-by: Li Zhang --- xen/arch/x86/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 8a195c6fff..2a3c85b05e 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -999,7 +999,7 @@ void __init early_time_init(void) setup_irq(0, &irq0); } -static int __init disable_pit_irq(void) +static int disable_pit_irq(void) { if ( !using_pit && cpu_has_apic ) { -- cgit v1.2.3