diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-09 12:05:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-09 12:05:09 -0700 |
| commit | 63847e66b28ed5e0dc28409d767e8f3891502ac4 (patch) | |
| tree | 6f38a72953224e8e88d3c98ed1c1ced76cc02a42 | |
| parent | b411c17eb96a1467d08d0538a7bf5166e5372234 (diff) | |
| parent | 7fcca7d900957b43c84da171b750afcf1682808a (diff) | |
| download | linux-3.10-63847e66b28ed5e0dc28409d767e8f3891502ac4.tar.gz linux-3.10-63847e66b28ed5e0dc28409d767e8f3891502ac4.tar.bz2 linux-3.10-63847e66b28ed5e0dc28409d767e8f3891502ac4.zip | |
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
intel_idle: enable Atom C6
| -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 0906fc5b69b..c37ef64d146 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] = { { /* MWAIT C5 */ }, { /* MWAIT C6 */ .name = "ATM-C6", - .desc = "MWAIT 0x40", - .driver_data = (void *) 0x40, + .desc = "MWAIT 0x52", + .driver_data = (void *) 0x52, .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED, - .exit_latency = 200, + .exit_latency = 140, .power_usage = 150, - .target_residency = 800, - .enter = NULL }, /* disabled */ + .target_residency = 560, + .enter = &intel_idle }, }; /** |