diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-07-20 14:26:47 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-07-20 14:26:47 -0400 |
| commit | c36c282b88963d0957368a443168588e62301fda (patch) | |
| tree | 6343887ae42a65635a61b4ad99fd7f3e8dd24758 /drivers/acpi | |
| parent | f4fbfb0dda5577075a049eec7fb7ad38abca1912 (diff) | |
| parent | 1f564ad6d4182859612cbae452122e5eb2d62a76 (diff) | |
Pull ia64-clocksource into release branch
Diffstat (limited to 'drivers/acpi')
| -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 80ffc7829916..bb5d23be4260 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -475,7 +475,7 @@ static void acpi_processor_idle(void) | |||
| 475 | /* Get end time (ticks) */ | 475 | /* Get end time (ticks) */ |
| 476 | t2 = inl(acpi_gbl_FADT.xpm_timer_block.address); | 476 | t2 = inl(acpi_gbl_FADT.xpm_timer_block.address); |
| 477 | 477 | ||
| 478 | #ifdef CONFIG_GENERIC_TIME | 478 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC) |
| 479 | /* TSC halts in C2, so notify users */ | 479 | /* TSC halts in C2, so notify users */ |
| 480 | mark_tsc_unstable("possible TSC halt in C2"); | 480 | mark_tsc_unstable("possible TSC halt in C2"); |
| 481 | #endif | 481 | #endif |
| @@ -517,7 +517,7 @@ static void acpi_processor_idle(void) | |||
| 517 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0); | 517 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0); |
| 518 | } | 518 | } |
| 519 | 519 | ||
| 520 | #ifdef CONFIG_GENERIC_TIME | 520 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC) |
| 521 | /* TSC halts in C3, so notify users */ | 521 | /* TSC halts in C3, so notify users */ |
| 522 | mark_tsc_unstable("TSC halts in C3"); | 522 | mark_tsc_unstable("TSC halts in C3"); |
| 523 | #endif | 523 | #endif |