diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/acpi/processor_idle.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index ae0654cd11ea..ee5759bef945 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -475,7 +475,7 @@ static void acpi_processor_idle(void) | |||
| 475 | 475 | ||
| 476 | #ifdef CONFIG_GENERIC_TIME | 476 | #ifdef CONFIG_GENERIC_TIME |
| 477 | /* TSC halts in C2, so notify users */ | 477 | /* TSC halts in C2, so notify users */ |
| 478 | mark_tsc_unstable(); | 478 | mark_tsc_unstable("possible TSC halt in C2"); |
| 479 | #endif | 479 | #endif |
| 480 | /* Re-enable interrupts */ | 480 | /* Re-enable interrupts */ |
| 481 | local_irq_enable(); | 481 | local_irq_enable(); |
| @@ -517,7 +517,7 @@ static void acpi_processor_idle(void) | |||
| 517 | 517 | ||
| 518 | #ifdef CONFIG_GENERIC_TIME | 518 | #ifdef CONFIG_GENERIC_TIME |
| 519 | /* TSC halts in C3, so notify users */ | 519 | /* TSC halts in C3, so notify users */ |
| 520 | mark_tsc_unstable(); | 520 | mark_tsc_unstable("TSC halts in C3"); |
| 521 | #endif | 521 | #endif |
| 522 | /* Re-enable interrupts */ | 522 | /* Re-enable interrupts */ |
| 523 | local_irq_enable(); | 523 | local_irq_enable(); |