diff options
Diffstat (limited to 'kernel/kexec.c')
-rw-r--r-- | kernel/kexec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 7b0886786701..a6a675cb9818 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -1546,13 +1546,13 @@ int kernel_kexec(void) | |||
1546 | if (error) | 1546 | if (error) |
1547 | goto Resume_console; | 1547 | goto Resume_console; |
1548 | /* At this point, dpm_suspend_start() has been called, | 1548 | /* At this point, dpm_suspend_start() has been called, |
1549 | * but *not* dpm_suspend_noirq(). We *must* call | 1549 | * but *not* dpm_suspend_end(). We *must* call |
1550 | * dpm_suspend_noirq() now. Otherwise, drivers for | 1550 | * dpm_suspend_end() now. Otherwise, drivers for |
1551 | * some devices (e.g. interrupt controllers) become | 1551 | * some devices (e.g. interrupt controllers) become |
1552 | * desynchronized with the actual state of the | 1552 | * desynchronized with the actual state of the |
1553 | * hardware at resume time, and evil weirdness ensues. | 1553 | * hardware at resume time, and evil weirdness ensues. |
1554 | */ | 1554 | */ |
1555 | error = dpm_suspend_noirq(PMSG_FREEZE); | 1555 | error = dpm_suspend_end(PMSG_FREEZE); |
1556 | if (error) | 1556 | if (error) |
1557 | goto Resume_devices; | 1557 | goto Resume_devices; |
1558 | error = disable_nonboot_cpus(); | 1558 | error = disable_nonboot_cpus(); |
@@ -1579,7 +1579,7 @@ int kernel_kexec(void) | |||
1579 | local_irq_enable(); | 1579 | local_irq_enable(); |
1580 | Enable_cpus: | 1580 | Enable_cpus: |
1581 | enable_nonboot_cpus(); | 1581 | enable_nonboot_cpus(); |
1582 | dpm_resume_noirq(PMSG_RESTORE); | 1582 | dpm_resume_start(PMSG_RESTORE); |
1583 | Resume_devices: | 1583 | Resume_devices: |
1584 | dpm_resume_end(PMSG_RESTORE); | 1584 | dpm_resume_end(PMSG_RESTORE); |
1585 | Resume_console: | 1585 | Resume_console: |