diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-21 05:39:26 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-21 05:39:26 -0400 |
| commit | 328b8f1ba50b708a1b3c0acd7c41ee1b356822f6 (patch) | |
| tree | 819e5cf05bcb160faee1eb546e3471284c9bbaae /drivers/idle/intel_idle.c | |
| parent | 57fa7214330be2e292ddb1402834ff0b221ef29a (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into oprofile/core
Diffstat (limited to 'drivers/idle/intel_idle.c')
| -rw-r--r-- | drivers/idle/intel_idle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 0906fc5b69b9..c37ef64d1465 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c | |||
| @@ -157,13 +157,13 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = { | |||
| 157 | { /* MWAIT C5 */ }, | 157 | { /* MWAIT C5 */ }, |
| 158 | { /* MWAIT C6 */ | 158 | { /* MWAIT C6 */ |
| 159 | .name = "ATM-C6", | 159 | .name = "ATM-C6", |
| 160 | .desc = "MWAIT 0x40", | 160 | .desc = "MWAIT 0x52", |
| 161 | .driver_data = (void *) 0x40, | 161 | .driver_data = (void *) 0x52, |
| 162 | .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED, | 162 | .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED, |
| 163 | .exit_latency = 200, | 163 | .exit_latency = 140, |
| 164 | .power_usage = 150, | 164 | .power_usage = 150, |
| 165 | .target_residency = 800, | 165 | .target_residency = 560, |
| 166 | .enter = NULL }, /* disabled */ | 166 | .enter = &intel_idle }, |
| 167 | }; | 167 | }; |
| 168 | 168 | ||
| 169 | /** | 169 | /** |