diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /drivers/acpi/processor_idle.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 05a17812d521..ff64d333e95f 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -838,7 +838,7 @@ int acpi_processor_cst_has_changed (struct acpi_processor *pr) | |||
| 838 | 838 | ||
| 839 | /* Fall back to the default idle loop */ | 839 | /* Fall back to the default idle loop */ |
| 840 | pm_idle = pm_idle_save; | 840 | pm_idle = pm_idle_save; |
| 841 | synchronize_kernel(); | 841 | synchronize_sched(); /* Relies on interrupts forcing exit from idle. */ |
| 842 | 842 | ||
| 843 | pr->flags.power = 0; | 843 | pr->flags.power = 0; |
| 844 | result = acpi_processor_get_power_info(pr); | 844 | result = acpi_processor_get_power_info(pr); |