Skip to content

Commit

Permalink
Revert "softirq: Let ksoftirqd do its job"
Browse files Browse the repository at this point in the history
This reverts commit 4cd13c2.
  • Loading branch information
popcornmix authored and Phil Elwell committed Jan 18, 2018
1 parent dde6b15 commit a077934
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions kernel/softirq.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,6 @@ static void wakeup_softirqd(void)
wake_up_process(tsk);
}

/*
* If ksoftirqd is scheduled, we do not want to process pending softirqs
* right now. Let ksoftirqd handle this at its own rate, to get fairness.
*/
static bool ksoftirqd_running(void)
{
struct task_struct *tsk = __this_cpu_read(ksoftirqd);

return tsk && (tsk->state == TASK_RUNNING);
}

/*
* preempt_count and SOFTIRQ_OFFSET usage:
* - preempt_count is changed by SOFTIRQ_OFFSET on entering or leaving
Expand Down Expand Up @@ -325,7 +314,7 @@ asmlinkage __visible void do_softirq(void)

pending = local_softirq_pending();

if (pending && !ksoftirqd_running())
if (pending)
do_softirq_own_stack();

local_irq_restore(flags);
Expand All @@ -352,9 +341,6 @@ void irq_enter(void)

static inline void invoke_softirq(void)
{
if (ksoftirqd_running())
return;

if (!force_irqthreads) {
#ifdef CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK
/*
Expand Down

0 comments on commit a077934

Please sign in to comment.