diff --git a/config/kernel/linux-cubox-next.config b/config/kernel/linux-cubox-next.config index ce3b557bd3..b599a96dbd 100644 --- a/config/kernel/linux-cubox-next.config +++ b/config/kernel/linux-cubox-next.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.56 Kernel Configuration +# Linux/arm 4.14.65 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y diff --git a/patch/kernel/cubox-next/linux-999-revert-softirq-let-ksoftirqd-do-its-job.patch b/patch/kernel/cubox-next/linux-999-revert-softirq-let-ksoftirqd-do-its-job.patch deleted file mode 100644 index bb87a670b3..0000000000 --- a/patch/kernel/cubox-next/linux-999-revert-softirq-let-ksoftirqd-do-its-job.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 3364d0056328b93fb10ab929ae99933af9e304ad Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Thu, 4 Jan 2018 19:56:05 +0000 -Subject: [PATCH] Revert "softirq: Let ksoftirqd do its job" - -See: https://forum.libreelec.tv/thread/4235-dvb-issue-since-le-switched-to-kernel-4-9-x/?postID=75965#post75965 ---- - kernel/softirq.c | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/kernel/softirq.c b/kernel/softirq.c -index 4e09821..58bb6f6 100644 ---- a/kernel/softirq.c -+++ b/kernel/softirq.c -@@ -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 -@@ -324,7 +313,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); -@@ -351,9 +340,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 - /* --- -2.14.1 -