Commit 35b43769 authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds

[PATCH] proper APIC suspension

From:  Pavel Machek <pavel@ucw.cz>
parent 81dcad97
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#include "io_ports.h" #include "io_ports.h"
static void apic_pm_activate(void);
void __init apic_intr_init(void) void __init apic_intr_init(void)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
...@@ -453,6 +455,7 @@ void __init setup_local_APIC (void) ...@@ -453,6 +455,7 @@ void __init setup_local_APIC (void)
if (nmi_watchdog == NMI_LOCAL_APIC) if (nmi_watchdog == NMI_LOCAL_APIC)
setup_apic_nmi_watchdog(); setup_apic_nmi_watchdog();
apic_pm_activate();
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
...@@ -589,7 +592,7 @@ device_initcall(init_lapic_devicefs); ...@@ -589,7 +592,7 @@ device_initcall(init_lapic_devicefs);
#else /* CONFIG_PM */ #else /* CONFIG_PM */
static inline void apic_pm_activate(void) { } static void apic_pm_activate(void) { }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment