aboutsummaryrefslogtreecommitdiffstats
path: root/xen
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2012-03-07 09:12:23 +0000
committerKeir Fraser <keir@xen.org>2012-03-07 09:12:23 +0000
commit8a058bcef741145b49df3b6321ad1f05f047af15 (patch)
tree3abfc3b2cf46a30784c2df88d935dbb892611eae /xen
parent1728459decd393bbf99ea4625973f9c6b0b300bf (diff)
downloadxen-8a058bcef741145b49df3b6321ad1f05f047af15.tar.gz
xen-8a058bcef741145b49df3b6321ad1f05f047af15.tar.bz2
xen-8a058bcef741145b49df3b6321ad1f05f047af15.zip
Revert 24973:50a70b652b43 "x86: Use deep C states for off-lined CPUs"
applied already Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen')
-rw-r--r--xen/arch/x86/acpi/cpu_idle.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index 75593d146a..a675867f24 100644
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -566,7 +566,6 @@ static void acpi_dead_idle(void)
{
struct acpi_processor_power *power;
struct acpi_processor_cx *cx;
- struct cpuinfo_x86 *c = &current_cpu_data;
if ( (power = processor_powers[smp_processor_id()]) == NULL )
goto default_halt;
@@ -602,23 +601,6 @@ static void acpi_dead_idle(void)
mb();
__mwait(cx->address, 0);
}
- }
- else if ( c->x86_vendor == X86_VENDOR_AMD &&
- cx->entry_method == ACPI_CSTATE_EM_SYSIO )
- {
- /* Intel prefers not to use SYSIO */
-
- /* Avoid references to shared data after the cache flush */
- u32 address = cx->address;
- u32 pmtmr_ioport_local = pmtmr_ioport;
-
- wbinvd();
-
- while ( 1 )
- {
- inb(address);
- inl(pmtmr_ioport_local);
- }
}
else if ( current_cpu_data.x86_vendor == X86_VENDOR_AMD &&
cx->entry_method == ACPI_CSTATE_EM_SYSIO )