diff options
Diffstat (limited to 'arch/x86/kernel/apm_32.c')
-rw-r--r-- | arch/x86/kernel/apm_32.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 0b4be431c620..3bfa02235965 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -228,6 +228,7 @@ | |||
228 | #include <linux/kthread.h> | 228 | #include <linux/kthread.h> |
229 | #include <linux/jiffies.h> | 229 | #include <linux/jiffies.h> |
230 | #include <linux/acpi.h> | 230 | #include <linux/acpi.h> |
231 | #include <linux/syscore_ops.h> | ||
231 | 232 | ||
232 | #include <asm/system.h> | 233 | #include <asm/system.h> |
233 | #include <asm/uaccess.h> | 234 | #include <asm/uaccess.h> |
@@ -1237,7 +1238,7 @@ static int suspend(int vetoable) | |||
1237 | dpm_suspend_noirq(PMSG_SUSPEND); | 1238 | dpm_suspend_noirq(PMSG_SUSPEND); |
1238 | 1239 | ||
1239 | local_irq_disable(); | 1240 | local_irq_disable(); |
1240 | sysdev_suspend(PMSG_SUSPEND); | 1241 | syscore_suspend(); |
1241 | 1242 | ||
1242 | local_irq_enable(); | 1243 | local_irq_enable(); |
1243 | 1244 | ||
@@ -1255,7 +1256,7 @@ static int suspend(int vetoable) | |||
1255 | apm_error("suspend", err); | 1256 | apm_error("suspend", err); |
1256 | err = (err == APM_SUCCESS) ? 0 : -EIO; | 1257 | err = (err == APM_SUCCESS) ? 0 : -EIO; |
1257 | 1258 | ||
1258 | sysdev_resume(); | 1259 | syscore_resume(); |
1259 | local_irq_enable(); | 1260 | local_irq_enable(); |
1260 | 1261 | ||
1261 | dpm_resume_noirq(PMSG_RESUME); | 1262 | dpm_resume_noirq(PMSG_RESUME); |
@@ -1279,7 +1280,7 @@ static void standby(void) | |||
1279 | dpm_suspend_noirq(PMSG_SUSPEND); | 1280 | dpm_suspend_noirq(PMSG_SUSPEND); |
1280 | 1281 | ||
1281 | local_irq_disable(); | 1282 | local_irq_disable(); |
1282 | sysdev_suspend(PMSG_SUSPEND); | 1283 | syscore_suspend(); |
1283 | local_irq_enable(); | 1284 | local_irq_enable(); |
1284 | 1285 | ||
1285 | err = set_system_power_state(APM_STATE_STANDBY); | 1286 | err = set_system_power_state(APM_STATE_STANDBY); |
@@ -1287,7 +1288,7 @@ static void standby(void) | |||
1287 | apm_error("standby", err); | 1288 | apm_error("standby", err); |
1288 | 1289 | ||
1289 | local_irq_disable(); | 1290 | local_irq_disable(); |
1290 | sysdev_resume(); | 1291 | syscore_resume(); |
1291 | local_irq_enable(); | 1292 | local_irq_enable(); |
1292 | 1293 | ||
1293 | dpm_resume_noirq(PMSG_RESUME); | 1294 | dpm_resume_noirq(PMSG_RESUME); |