projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm raid1: add handle_errors feature flag
[powerpc.git]
/
drivers
/
acpi
/
processor_idle.c
diff --git
a/drivers/acpi/processor_idle.c
b/drivers/acpi/processor_idle.c
index
6077300
..
ee5759b
100644
(file)
--- a/
drivers/acpi/processor_idle.c
+++ b/
drivers/acpi/processor_idle.c
@@
-51,14
+51,6
@@
#include <asm/apic.h>
#endif
#include <asm/apic.h>
#endif
-/*
- * Include the apic definitions for x86 to have the APIC timer related defines
- * available also for UP (on SMP it gets magically included via linux/smp.h).
- */
-#ifdef CONFIG_X86
-#include <asm/apic.h>
-#endif
-
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@
-268,6
+260,7
@@
static void acpi_timer_check_state(int state, struct acpi_processor *pr,
struct acpi_processor_cx *cx)
{
struct acpi_processor_power *pwr = &pr->power;
struct acpi_processor_cx *cx)
{
struct acpi_processor_power *pwr = &pr->power;
+ u8 type = local_apic_timer_c2_ok ? ACPI_STATE_C3 : ACPI_STATE_C2;
/*
* Check, if one of the previous states already marked the lapic
/*
* Check, if one of the previous states already marked the lapic
@@
-276,7
+269,7
@@
static void acpi_timer_check_state(int state, struct acpi_processor *pr,
if (pwr->timer_broadcast_on_state < state)
return;
if (pwr->timer_broadcast_on_state < state)
return;
- if (cx->type >=
ACPI_STATE_C2
)
+ if (cx->type >=
type
)
pr->power.timer_broadcast_on_state = state;
}
pr->power.timer_broadcast_on_state = state;
}
@@
-482,7
+475,7
@@
static void acpi_processor_idle(void)
#ifdef CONFIG_GENERIC_TIME
/* TSC halts in C2, so notify users */
#ifdef CONFIG_GENERIC_TIME
/* TSC halts in C2, so notify users */
- mark_tsc_unstable();
+ mark_tsc_unstable(
"possible TSC halt in C2"
);
#endif
/* Re-enable interrupts */
local_irq_enable();
#endif
/* Re-enable interrupts */
local_irq_enable();
@@
-524,7
+517,7
@@
static void acpi_processor_idle(void)
#ifdef CONFIG_GENERIC_TIME
/* TSC halts in C3, so notify users */
#ifdef CONFIG_GENERIC_TIME
/* TSC halts in C3, so notify users */
- mark_tsc_unstable();
+ mark_tsc_unstable(
"TSC halts in C3"
);
#endif
/* Re-enable interrupts */
local_irq_enable();
#endif
/* Re-enable interrupts */
local_irq_enable();