From 4c1097df5d9bca84a1922adc752794db9b615a3e Mon Sep 17 00:00:00 2001 From: Namkyu Kim Date: Wed, 2 Jun 2021 14:56:16 +0900 Subject: [PATCH] ANDROID: Add an extra wake flag for android vendor use specific wake flag for android vendor Bug: 189858948 Signed-off-by: Namkyu Kim Change-Id: Idc23c1c47f7d83b298c0b2560859f1ce2761fd85 --- kernel/sched/core.c | 2 +- kernel/sched/sched.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2c607f0c8b8d..3b8cf332c492 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5026,7 +5026,7 @@ asmlinkage __visible void __sched preempt_schedule_irq(void) int default_wake_function(wait_queue_entry_t *curr, unsigned mode, int wake_flags, void *key) { - WARN_ON_ONCE(IS_ENABLED(CONFIG_SCHED_DEBUG) && wake_flags & ~WF_SYNC); + WARN_ON_ONCE(IS_ENABLED(CONFIG_SCHED_DEBUG) && wake_flags & ~(WF_SYNC | WF_ANDROID_VENDOR)); return try_to_wake_up(curr->private, mode, wake_flags); } EXPORT_SYMBOL(default_wake_function); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 277c0cf97ddb..20efbaa4e118 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1755,6 +1755,7 @@ static inline int task_on_rq_migrating(struct task_struct *p) #define WF_FORK 0x02 /* Child wakeup after fork */ #define WF_MIGRATED 0x04 /* Internal use, task got migrated */ #define WF_ON_CPU 0x08 /* Wakee is on_cpu */ +#define WF_ANDROID_VENDOR 0x1000 /* Vendor specific for Android */ /* * To aid in avoiding the subversion of "niceness" due to uneven distribution