Commit d69c5d37 authored by Thomas Gleixner's avatar Thomas Gleixner

softirq: Do not create hrtimer softirq thread when CONFIG_HIGH_RES_TIMERS=n

Remy Bohmer pointed out that we create the hrtimer softirq thread even
when CONFIG_HIGH_RES_TIMERS is off. That results in a softirq-NULL
name for the thread.

Skip the thread creation/wakeup/teardown when CONFIG_HIGH_RES_TIMERS=n
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 00ef66eb
...@@ -1161,6 +1161,8 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb, ...@@ -1161,6 +1161,8 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb,
per_cpu(ksoftirqd, hotcpu)[i].tsk = NULL; per_cpu(ksoftirqd, hotcpu)[i].tsk = NULL;
} }
for (i = 0; i < NR_SOFTIRQS; i++) { for (i = 0; i < NR_SOFTIRQS; i++) {
if (!softirq_names[i])
continue;
p = kthread_create(ksoftirqd, p = kthread_create(ksoftirqd,
&per_cpu(ksoftirqd, hotcpu)[i], &per_cpu(ksoftirqd, hotcpu)[i],
"sirq-%s/%d", softirq_names[i], "sirq-%s/%d", softirq_names[i],
...@@ -1177,8 +1179,11 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb, ...@@ -1177,8 +1179,11 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb,
break; break;
case CPU_ONLINE: case CPU_ONLINE:
case CPU_ONLINE_FROZEN: case CPU_ONLINE_FROZEN:
for (i = 0; i < NR_SOFTIRQS; i++) for (i = 0; i < NR_SOFTIRQS; i++) {
wake_up_process(per_cpu(ksoftirqd, hotcpu)[i].tsk); p = per_cpu(ksoftirqd, hotcpu)[i].tsk;
if (p)
wake_up_process(p);
}
break; break;
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
case CPU_UP_CANCELED: case CPU_UP_CANCELED:
...@@ -1192,9 +1197,11 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb, ...@@ -1192,9 +1197,11 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb,
for (i = 0; i < NR_SOFTIRQS; i++) { for (i = 0; i < NR_SOFTIRQS; i++) {
param.sched_priority = MAX_RT_PRIO-1; param.sched_priority = MAX_RT_PRIO-1;
p = per_cpu(ksoftirqd, hotcpu)[i].tsk; p = per_cpu(ksoftirqd, hotcpu)[i].tsk;
sched_setscheduler(p, SCHED_FIFO, &param); if (p) {
per_cpu(ksoftirqd, hotcpu)[i].tsk = NULL; sched_setscheduler(p, SCHED_FIFO, &param);
kthread_stop(p); per_cpu(ksoftirqd, hotcpu)[i].tsk = NULL;
kthread_stop(p);
}
} }
takeover_tasklets(hotcpu); takeover_tasklets(hotcpu);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment