Re: [PATCH v2 1/5] x86: Move per cpu cpu_llc_shared_map to a field instruct cpuinfo_x86

From: Kevin Winchester
Date: Wed Feb 22 2012 - 07:24:23 EST


On 22 February 2012 05:27, Ingo Molnar <mingo@xxxxxxx> wrote:
>
> * H. Peter Anvin <hpa@xxxxxxxxx> wrote:
>
>> On 02/21/2012 05:45 PM, Kevin Winchester wrote:
>> > Commit 141168c36cde ("x86: Simplify code by removing a !SMP #ifdefs from
>> > 'struct cpuinfo_x86'") caused the compilation error:
>> >
>> > mce_amd.c:(.cpuinit.text+0x4723): undefined reference to 'cpu_llc_shared_map'
>> >
>> > by removing an #ifdef CONFIG_SMP around a block containing a
>> > reference to cpu_llc_shared_map.  Rather than replace the
>> > #ifdef, move cpu_llc_shared_map to be a new cpumask_t field
>> > llc_shared_map in struct cpuinfo_x86 and adjust all
>> > references to cpu_llc_shared_map.
>> >
>>
>> I'm not comfortable with a patch this large after we are
>> already at -rc4.  Please send a minimal patch to fix the
>> failure for v3.3, and then a patch on top of that which we can
>> queue up with the rest of the patchset to for v3.4.
>
> I forgot about the v3.3 aspect of the series - yes, you are
> right, doing it like that would be preferred.
>
> It can all be in the same series, we'll sort apart the v3.3 and
> v3.4 bits.
>

That seems quite reasonable, I was not really thinking about v3.3 or
v3.4 at all when working on this. Can I suggest, then, that you apply
Borislav's original patch:

https://lkml.org/lkml/2012/2/3/331

for now, and then I will rebase on top of that and remove the #ifdefs
as part of my first patch?

--
Kevin Winchester
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/