aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-06-09 09:51:14 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-06-09 09:51:14 +0100
commit3e28b1c5bb5dab099a18143a40b45ebf59a34d45 (patch)
treedff0592af0688ce9bdffcb1141ef4da6541ca59f
parentfd153d12f2ad8b6fad5edf05b488531c95de760b (diff)
downloadxen-3e28b1c5bb5dab099a18143a40b45ebf59a34d45.tar.gz
xen-3e28b1c5bb5dab099a18143a40b45ebf59a34d45.tar.bz2
xen-3e28b1c5bb5dab099a18143a40b45ebf59a34d45.zip
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 <huacai.chen@intel.com> Signed-off-by: Li Zhang <li.zhang@intel.com>
-rw-r--r--xen/arch/x86/time.c2
1 files changed, 1 insertions, 1 deletions
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 )
{