Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63847e66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b411c17e 7fcca7d9

drivers/idle/intel_idle.c

+5 −5
Original line number Diff line number Diff line
@@ -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 },

};



/**