diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-02 09:07:40 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-02 09:07:39 -0700 |
| commit | 3939f41b22a36407fafffa2d204e08d197818719 (patch) | |
| tree | 8a13e4d0ea3b7bef6f53bea069f15ed758b13eb0 /kernel | |
| parent | 9edaf67e545ca3d82d8fe90d3d917dfd78dee7c6 (diff) | |
| parent | b15484bc067e8c01e7cc2b186227f994547cf709 (diff) | |
Merge "Merge remote-tracking branch 'remotes/quic/dev/msm-4.4-8996au' into msm-4.4"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/core.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2afd0299390e..2d2b8834dd3b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -85,6 +85,9 @@ #ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> #endif +#ifdef CONFIG_MSM_APP_SETTINGS +#include <asm/app_api.h> +#endif #include "sched.h" #include "../workqueue_internal.h" @@ -2750,6 +2753,14 @@ prepare_task_switch(struct rq *rq, struct task_struct *prev, fire_sched_out_preempt_notifiers(prev, next); prepare_lock_switch(rq, next); prepare_arch_switch(next); + +#ifdef CONFIG_MSM_APP_SETTINGS + if (use_app_setting) + switch_app_setting_bit(prev, next); + + if (use_32bit_app_setting || use_32bit_app_setting_pro) + switch_32bit_app_setting_bit(prev, next); +#endif } /** |