Skip to content

Commit

Permalink
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/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
  • Loading branch information
torvalds committed Oct 9, 2010
2 parents b411c17 + 7fcca7d commit 63847e6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/idle/intel_idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
};

/**
Expand Down

0 comments on commit 63847e6

Please sign in to comment.