Merge "Revert "softirq: Let ksoftirqd do its job"" (9fab6ce0) · Commits · e / devices / android_kernel_fairphone_FP3

kernel/softirq.c

+1 −15

Original line number	Diff line number	Diff line
		@@ -84,17 +84,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
		@@ -336,7 +325,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);
		@@ -363,9 +352,6 @@ void irq_enter(void)

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

		if (!force_irqthreads && !defer_for_rt()) {
		#ifdef CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK
		/*