diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-03-01 14:17:08 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-03-01 14:17:08 +0000 |
| commit | 1f4246974a907c831d4692e29f8e3bcae30efdcb (patch) | |
| tree | 130b2a094ab0737d5d3877694cbfc81747f99127 /xen/include/asm-x86/io_apic.h | |
| parent | 8bb2359cd71870efc23a5980708c47484fa1da53 (diff) | |
| download | xen-1f4246974a907c831d4692e29f8e3bcae30efdcb.tar.gz xen-1f4246974a907c831d4692e29f8e3bcae30efdcb.tar.bz2 xen-1f4246974a907c831d4692e29f8e3bcae30efdcb.zip | |
x86, ioapic: Fix S3 suspend error.
Invoke ioapic_pm_state_alloc() earlier,
thus avoiding check_lock() BUG_ON() in spin_lock().
Signed-off-by: Guanqun Lu <guanqun.lu@intel.com>
Diffstat (limited to 'xen/include/asm-x86/io_apic.h')
| -rw-r--r-- | xen/include/asm-x86/io_apic.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h index f7569cebed..eaa77a8d79 100644 --- a/xen/include/asm-x86/io_apic.h +++ b/xen/include/asm-x86/io_apic.h @@ -182,13 +182,13 @@ extern int timer_uses_ioapic_pin_0; #endif /*CONFIG_ACPI_BOOT*/ extern int (*ioapic_renumber_irq)(int ioapic, int irq); -extern int ioapic_suspend(void); -extern int ioapic_resume(void); +extern void ioapic_suspend(void); +extern void ioapic_resume(void); #else /* !CONFIG_X86_IO_APIC */ #define io_apic_assign_pci_irqs 0 -static inline int ioapic_suspend(void) {return 0}; -static inline int ioapic_resume(void) {return 0}; +static inline void ioapic_suspend(void) {} +static inline void ioapic_resume(void) {} #endif extern int assign_irq_vector(int irq); |