On 2014/1/9 21:31, Rafael J. Wysocki wrote:
> On Thursday, January 09, 2014 03:30:27 PM Jiang Liu wrote:
>> Close avn_cstates array with correct marker to avoid overflow
>> in function intel_idle_cpu_init().
>>
>> Signed-off-by: Jiang Liu <jiang....@linux.intel.com>
>> Cc: <sta...@vger.kernel.org> # 3.13
>
> Why did you mark it for 3.13-stable? 3.13 hasn't been released yet, so this
> can be pushed for 3.13 still.
>
> Is the problem present in 3.13-rc? If so, has it been introduced by any
> recent commits or was it there before? In which case, do we need this patch
> in stable as well?
>
> Rafael
Hi Rafael,
This issue is introduced in 3.13-rc2, and I feel it's too late
to catch up with 3.13 window, so mark it for 3.13 speculatively.
After more thoughts, I feel this patch should be divided into
two patches.
One is to temporarily remove the __initdata marker. The other
is to correctly mark end of avn_cstates array. The second bug should
be introduced when merging "22e580d intel_idle: Fixed C6 state on
Avoton/Rangeley processors" with "eba682a intel_idle: shrink states tables".
Should I split it into two?
Thanks!
Gerry
>
>
>> ---
>> 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 }
>> };
>>
>> /**
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
