diff --git a/[refs] b/[refs] index 4ef576f6eafb..81697a760528 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c949d4eb40ce021b1abc3b63af23aa535662cb17 +refs/heads/master: 3908fd2ed920af818aa596672da68ba26173ff27 diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c index bf25015dce16..918e52df090e 100644 --- a/trunk/kernel/softirq.c +++ b/trunk/kernel/softirq.c @@ -574,8 +574,6 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb, switch (action) { case CPU_UP_PREPARE: - BUG_ON(per_cpu(tasklet_vec, hotcpu).list); - BUG_ON(per_cpu(tasklet_hi_vec, hotcpu).list); p = kthread_create(ksoftirqd, hcpu, "ksoftirqd/%d", hotcpu); if (IS_ERR(p)) { printk("ksoftirqd for %i failed\n", hotcpu);