Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933136AbZJFUIp (ORCPT ); Tue, 6 Oct 2009 16:08:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933119AbZJFUIo (ORCPT ); Tue, 6 Oct 2009 16:08:44 -0400 Received: from www.tglx.de ([62.245.132.106]:34019 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933117AbZJFUIn (ORCPT ); Tue, 6 Oct 2009 16:08:43 -0400 Date: Tue, 6 Oct 2009 22:07:53 +0200 (CEST) From: Thomas Gleixner To: Remy Bohmer cc: LKML , rt-users Subject: Re: [ANNOUNCE] 2.6.31.2-rt13 In-Reply-To: Message-ID: References: <3efb10970910061123k2b6826bci11f0f42509173b26@mail.gmail.com> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2007 Lines: 62 On Tue, 6 Oct 2009, Thomas Gleixner wrote: > On Tue, 6 Oct 2009, Remy Bohmer wrote: > > But I was wondering if you missed this one: > > http://patchwork.kernel.org/patch/50044/ > > Yup, slipped through. Queued for the next release. Correction. I dropped the patch as it is just a sloppy work around. Why creating the thread in the first place ? Real fix below. Thanks, tglx --- diff --git a/kernel/softirq.c b/kernel/softirq.c index aae8d45..3526976 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -1161,6 +1161,8 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb, per_cpu(ksoftirqd, hotcpu)[i].tsk = NULL; } for (i = 0; i < NR_SOFTIRQS; i++) { + if (!softirq_names[i]) + continue; p = kthread_create(ksoftirqd, &per_cpu(ksoftirqd, hotcpu)[i], "sirq-%s/%d", softirq_names[i], @@ -1177,8 +1179,11 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb, break; case CPU_ONLINE: case CPU_ONLINE_FROZEN: - for (i = 0; i < NR_SOFTIRQS; i++) - wake_up_process(per_cpu(ksoftirqd, hotcpu)[i].tsk); + for (i = 0; i < NR_SOFTIRQS; i++) { + p = per_cpu(ksoftirqd, hotcpu)[i].tsk; + if (p) + wake_up_process(p); + } break; #ifdef CONFIG_HOTPLUG_CPU case CPU_UP_CANCELED: @@ -1192,9 +1197,11 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb, for (i = 0; i < NR_SOFTIRQS; i++) { param.sched_priority = MAX_RT_PRIO-1; p = per_cpu(ksoftirqd, hotcpu)[i].tsk; - sched_setscheduler(p, SCHED_FIFO, ¶m); - per_cpu(ksoftirqd, hotcpu)[i].tsk = NULL; - kthread_stop(p); + if (p) { + sched_setscheduler(p, SCHED_FIFO, ¶m); + per_cpu(ksoftirqd, hotcpu)[i].tsk = NULL; + kthread_stop(p); + } } takeover_tasklets(hotcpu); break; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/