korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-03 09:04:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pm-cpuidle'

Browse Source 
* pm-cpuidle:
  intel_idle: close avn_cstates array with correct marker
  Revert "intel_idle: mark states tables with __initdata tag"
This commit is contained in:
Rafael J. Wysocki 2014-01-10 03:08:58 +01:00
commit 13de22c59f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/idle/intel_idle.c
View File

@ -123,7 +123,7 @@ static struct cpuidle_state *cpuidle_state_table;
* which is also the index into the MWAIT hint array. * which is also the index into the MWAIT hint array.
* Thus C0 is a dummy. * Thus C0 is a dummy.
*/ */
static struct cpuidle_state nehalem_cstates[] __initdata = { static struct cpuidle_state nehalem_cstates[] = {
{ {
.name = "C1-NHM", .name = "C1-NHM",
.desc = "MWAIT 0x00", .desc = "MWAIT 0x00",
@ -156,7 +156,7 @@ static struct cpuidle_state nehalem_cstates[] __initdata = {
.enter = NULL } .enter = NULL }
}; };
static struct cpuidle_state snb_cstates[] __initdata = { static struct cpuidle_state snb_cstates[] = {
{ {
.name = "C1-SNB", .name = "C1-SNB",
.desc = "MWAIT 0x00", .desc = "MWAIT 0x00",
@ -196,7 +196,7 @@ static struct cpuidle_state snb_cstates[] __initdata = {
.enter = NULL } .enter = NULL }
}; };
static struct cpuidle_state ivb_cstates[] __initdata = { static struct cpuidle_state ivb_cstates[] = {
{ {
.name = "C1-IVB", .name = "C1-IVB",
.desc = "MWAIT 0x00", .desc = "MWAIT 0x00",
@ -236,7 +236,7 @@ static struct cpuidle_state ivb_cstates[] __initdata = {
.enter = NULL } .enter = NULL }
}; };
static struct cpuidle_state hsw_cstates[] __initdata = { static struct cpuidle_state hsw_cstates[] = {
{ {
.name = "C1-HSW", .name = "C1-HSW",
.desc = "MWAIT 0x00", .desc = "MWAIT 0x00",
@ -297,7 +297,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
.enter = NULL } .enter = NULL }
}; };
static struct cpuidle_state atom_cstates[] __initdata = { static struct cpuidle_state atom_cstates[] = {
{ {
.name = "C1E-ATM", .name = "C1E-ATM",
.desc = "MWAIT 0x00", .desc = "MWAIT 0x00",
@ -329,7 +329,7 @@ static struct cpuidle_state atom_cstates[] __initdata = {
{ {
.enter = NULL } .enter = NULL }
}; };
static struct cpuidle_state avn_cstates[] __initdata = { static struct cpuidle_state avn_cstates[] = {
{ {
.name = "C1-AVN", .name = "C1-AVN",
.desc = "MWAIT 0x00", .desc = "MWAIT 0x00",
@ -344,6 +344,8 @@ static struct cpuidle_state avn_cstates[] __initdata = {
.exit_latency = 15, .exit_latency = 15,
.target_residency = 45, .target_residency = 45,
.enter = &intel_idle }, .enter = &intel_idle },
{
.enter = NULL }
}; };
/** /**