diff options
author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
tree | e5a05c7297f997e191c73091934e42e3195c0e40 /drivers/acpi/processor_idle.c | |
parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 07bc74d8356e..f4428e82b352 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -155,7 +155,7 @@ static void lapic_timer_check_state(int state, struct acpi_processor *pr, | |||
155 | if (cpu_has(&cpu_data(pr->id), X86_FEATURE_ARAT)) | 155 | if (cpu_has(&cpu_data(pr->id), X86_FEATURE_ARAT)) |
156 | return; | 156 | return; |
157 | 157 | ||
158 | if (boot_cpu_has(X86_FEATURE_AMDC1E)) | 158 | if (c1e_detected) |
159 | type = ACPI_STATE_C1; | 159 | type = ACPI_STATE_C1; |
160 | 160 | ||
161 | /* | 161 | /* |
@@ -255,7 +255,7 @@ int acpi_processor_resume(struct acpi_device * device) | |||
255 | return 0; | 255 | return 0; |
256 | } | 256 | } |
257 | 257 | ||
258 | #if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86) | 258 | #if defined(CONFIG_X86) |
259 | static void tsc_check_state(int state) | 259 | static void tsc_check_state(int state) |
260 | { | 260 | { |
261 | switch (boot_cpu_data.x86_vendor) { | 261 | switch (boot_cpu_data.x86_vendor) { |