public inbox for linux-pm@vger.kernel.org
 help / color / mirror / Atom feed
From: Jiang Liu <jiang.liu@linux.intel.com>
To: " Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
	" H. Peter Anvin" <hpa@linux.intel.com>,
	Len Brown <len.brown@intel.com>, Len Brown <lenb@kernel.org>
Cc: Jiang Liu <jiang.liu@linux.intel.com>,
	linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] intel_idle: close avn_cstates array with correct marker
Date: Thu,  9 Jan 2014 15:30:27 +0800	[thread overview]
Message-ID: <1389252628-1033-2-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1389252628-1033-1-git-send-email-jiang.liu@linux.intel.com>

Close avn_cstates array with correct marker to avoid overflow
in function intel_idle_cpu_init().

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: <stable@vger.kernel.org> # 3.13
---
 drivers/idle/intel_idle.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 6f456f0..797ed29 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -329,7 +329,7 @@ static struct cpuidle_state atom_cstates[] = {
 	{
 		.enter = NULL }
 };
-static struct cpuidle_state avn_cstates[] __initdata = {
+static struct cpuidle_state avn_cstates[] = {
 	{
 		.name = "C1-AVN",
 		.desc = "MWAIT 0x00",
@@ -344,6 +344,8 @@ static struct cpuidle_state avn_cstates[] __initdata = {
 		.exit_latency = 15,
 		.target_residency = 45,
 		.enter = &intel_idle },
+	{
+		.enter = NULL }
 };
 
 /**
-- 
1.7.10.4


  reply	other threads:[~2014-01-09  7:29 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-09  7:30 [PATCH 1/2] Revert "intel_idle: mark states tables with __initdata tag" Jiang Liu
2014-01-09  7:30 ` Jiang Liu [this message]
2014-01-09 13:31   ` [PATCH 2/2] intel_idle: close avn_cstates array with correct marker Rafael J. Wysocki
2014-01-10  1:59     ` Jiang Liu
2014-01-10 13:32       ` Rafael J. Wysocki
2014-01-09 13:20 ` [PATCH 1/2] Revert "intel_idle: mark states tables with __initdata tag" Bartlomiej Zolnierkiewicz
2014-01-09 13:38   ` Rafael J. Wysocki
2014-01-10  9:23     ` Bartlomiej Zolnierkiewicz
2014-01-10  1:32   ` Jiang Liu
2014-01-09 13:29 ` Rafael J. Wysocki
2014-01-09 13:22   ` Bartlomiej Zolnierkiewicz
2014-01-10  2:01   ` Jiang Liu
2014-01-10 13:48     ` Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1389252628-1033-2-git-send-email-jiang.liu@linux.intel.com \
    --to=jiang.liu@linux.intel.com \
    --cc=hpa@linux.intel.com \
    --cc=len.brown@intel.com \
    --cc=lenb@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=rafael.j.wysocki@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox