shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "ANDROID: Revert "Mark HI and TASKLET softirq synchronous"""

Browse Source 
This reverts commit d6592588ed, as the
merge conflicts have been resolved.

Bug: 168521633
Change-Id: Ic967977b4d409ea9103ff4ec5d4fa6709fa8146d
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
[elavila: port to mainline, resolve conflicts, add commit text]
Signed-off-by: J. Avila <elavila@google.com>
[ashayj@codeaurora.org: resolve conflicts]
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Shaleen Agrawal <shalagra@codeaurora.org>
This commit is contained in:
Satya Durga Srinivasu Prabhala
2019-01-08 15:38:32 -08:00
committed by Todd Kjos
parent f5b90ccf9c
commit bdfce9c8c5
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/softirq.c
View File

@@ -92,11 +92,9 @@ static void wakeup_softirqd(void)
/*
* 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,
* unless we're doing some of the synchronous softirqs.
+ * right now. Let ksoftirqd handle this at its own rate, to get fairness.
*/
#define SOFTIRQ_NOW_MASK ((1 << HI_SOFTIRQ) | (1 << TASKLET_SOFTIRQ))
static bool ksoftirqd_running(unsigned long pending)
static bool ksoftirqd_running(void)
{
struct task_struct *tsk = __this_cpu_read(ksoftirqd);
@@ -246,7 +244,7 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
goto out;
pending = local_softirq_pending();
if (!pending || ksoftirqd_running(pending))
if (!pending || ksoftirqd_running())
goto out;
/*
@@ -429,7 +427,7 @@ static inline bool should_wake_ksoftirqd(void)
static inline void invoke_softirq(void)
{
if (ksoftirqd_running(local_softirq_pending()))
if (ksoftirqd_running())
return;
if (!force_irqthreads() || !__this_cpu_read(ksoftirqd)) {
@@ -465,7 +463,7 @@ asmlinkage __visible void do_softirq(void)
pending = local_softirq_pending();
if (pending && !ksoftirqd_running(pending))
if (pending && !ksoftirqd_running())
do_softirq_own_stack();
local_irq_restore(flags);