diff options
| -rw-r--r-- | drivers/acpi/processor_idle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 980e1c33e6c5..6f3b217699e9 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -364,7 +364,7 @@ int acpi_processor_resume(struct acpi_device * device) | |||
| 364 | return 0; | 364 | return 0; |
| 365 | } | 365 | } |
| 366 | 366 | ||
| 367 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC) | 367 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86) |
| 368 | static int tsc_halts_in_c(int state) | 368 | static int tsc_halts_in_c(int state) |
| 369 | { | 369 | { |
| 370 | switch (boot_cpu_data.x86_vendor) { | 370 | switch (boot_cpu_data.x86_vendor) { |
| @@ -544,7 +544,7 @@ static void acpi_processor_idle(void) | |||
| 544 | /* Get end time (ticks) */ | 544 | /* Get end time (ticks) */ |
| 545 | t2 = inl(acpi_gbl_FADT.xpm_timer_block.address); | 545 | t2 = inl(acpi_gbl_FADT.xpm_timer_block.address); |
| 546 | 546 | ||
| 547 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC) | 547 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86) |
| 548 | /* TSC halts in C2, so notify users */ | 548 | /* TSC halts in C2, so notify users */ |
| 549 | if (tsc_halts_in_c(ACPI_STATE_C2)) | 549 | if (tsc_halts_in_c(ACPI_STATE_C2)) |
| 550 | mark_tsc_unstable("possible TSC halt in C2"); | 550 | mark_tsc_unstable("possible TSC halt in C2"); |
| @@ -609,7 +609,7 @@ static void acpi_processor_idle(void) | |||
| 609 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0); | 609 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0); |
| 610 | } | 610 | } |
| 611 | 611 | ||
| 612 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC) | 612 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86) |
| 613 | /* TSC halts in C3, so notify users */ | 613 | /* TSC halts in C3, so notify users */ |
| 614 | if (tsc_halts_in_c(ACPI_STATE_C3)) | 614 | if (tsc_halts_in_c(ACPI_STATE_C3)) |
| 615 | mark_tsc_unstable("TSC halts in C3"); | 615 | mark_tsc_unstable("TSC halts in C3"); |
| @@ -1500,7 +1500,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, | |||
| 1500 | acpi_idle_do_entry(cx); | 1500 | acpi_idle_do_entry(cx); |
| 1501 | t2 = inl(acpi_gbl_FADT.xpm_timer_block.address); | 1501 | t2 = inl(acpi_gbl_FADT.xpm_timer_block.address); |
| 1502 | 1502 | ||
| 1503 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC) | 1503 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86) |
| 1504 | /* TSC could halt in idle, so notify users */ | 1504 | /* TSC could halt in idle, so notify users */ |
| 1505 | if (tsc_halts_in_c(cx->type)) | 1505 | if (tsc_halts_in_c(cx->type)) |
| 1506 | mark_tsc_unstable("TSC halts in idle");; | 1506 | mark_tsc_unstable("TSC halts in idle");; |
| @@ -1614,7 +1614,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, | |||
| 1614 | spin_unlock(&c3_lock); | 1614 | spin_unlock(&c3_lock); |
| 1615 | } | 1615 | } |
| 1616 | 1616 | ||
| 1617 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC) | 1617 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86) |
| 1618 | /* TSC could halt in idle, so notify users */ | 1618 | /* TSC could halt in idle, so notify users */ |
| 1619 | if (tsc_halts_in_c(ACPI_STATE_C3)) | 1619 | if (tsc_halts_in_c(ACPI_STATE_C3)) |
| 1620 | mark_tsc_unstable("TSC halts in idle"); | 1620 | mark_tsc_unstable("TSC halts in idle"); |
