Re: [PATCH 09/11] kernel/cpu.c: remove new instance of __cpuinit that crept back in

From: Paul Gortmaker
Date: Tue Apr 28 2015 - 10:25:15 EST


On 15-04-28 09:12 AM, Paul E. McKenney wrote:
> On Mon, Apr 27, 2015 at 06:47:58PM -0400, Paul Gortmaker wrote:
>> We removed __cpuinit support (leaving no-op stubs) quite some time ago.
>> However a new instance was added in commit 00df35f991914db6b8bde8cf0980
>> ("cpu: Defer smpboot kthread unparking until CPU known to scheduler")
>>
>> Since we want to clobber the stubs soon, get this removed now.
>>
>> Cc: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
>
> Good catch, queued for 4.2. Please let me know if you need it sooner.

No rush ; no need to queue it either, since I have to keep the
patch in this series in order to be able to remove the stubs in
the 11/11, since I don't want to guess what merge order will
happen in ~6 weeks.

Thanks,
Paul.
--

>
> Thanx, Paul
>
>> ---
>> kernel/cpu.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/kernel/cpu.c b/kernel/cpu.c
>> index 94bbe4695232..b4e940d89087 100644
>> --- a/kernel/cpu.c
>> +++ b/kernel/cpu.c
>> @@ -479,7 +479,7 @@ static struct notifier_block smpboot_thread_notifier = {
>> .priority = CPU_PRI_SMPBOOT,
>> };
>>
>> -void __cpuinit smpboot_thread_init(void)
>> +void smpboot_thread_init(void)
>> {
>> register_cpu_notifier(&smpboot_thread_notifier);
>> }
>> --
>> 2.2.1
>>
>
--
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/