A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 16:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android11-5.4' into 'android11-5.4-lts'

Browse source 
Sync up with android11-5.4 for the following commits:

47c864ead1 ANDROID: db845c: Use FRAGMENT_CONFIG
c037b5c852 ANDROID: abi_gki_aarch64_db845c: Update symbols for boot regression
66da798d24 ANDROID: sched: move vendor hook to check scheduling nice value

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia9e453207a50ef71ba420fe5a13ca5ee1c6c3cdc
This commit is contained in:
Greg Kroah-Hartman 2021-03-09 18:36:22 +01:00
commit fd1fdd85b7
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/abi_gki_aarch64_db845c
View file

@ -750,12 +750,14 @@
match_token
noop_llseek
notify_change
override_creds
pagecache_get_page
path_get
path_put
__put_cred
__put_page
register_filesystem
revert_creds
set_anon_super
sget
simple_getattr

3
build.config.db845c
View file

@ -3,7 +3,8 @@
BUILD_INITRAMFS=1
DEFCONFIG=db845c_gki_defconfig
PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/db845c_gki.fragment"
FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/db845c_gki.fragment
PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
FILES="

4
include/trace/hooks/sched.h
View file

@ -58,8 +58,8 @@ DECLARE_RESTRICTED_HOOK(android_rvh_rtmutex_prepare_setprio,
TP_ARGS(p, pi_task), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_set_user_nice,
TP_PROTO(struct task_struct *p, long *nice),
TP_ARGS(p, nice), 1);
TP_PROTO(struct task_struct *p, long *nice, bool *allowed),
TP_ARGS(p, nice, allowed), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_setscheduler,
TP_PROTO(struct task_struct *p),

6
kernel/sched/core.c
View file

@ -4605,12 +4605,13 @@ static inline int rt_effective_prio(struct task_struct *p, int prio)
void set_user_nice(struct task_struct *p, long nice)
{
bool queued, running;
bool queued, running, allowed = false;
int old_prio, delta;
struct rq_flags rf;
struct rq *rq;
if (task_nice(p) == nice || nice < MIN_NICE || nice > MAX_NICE)
trace_android_rvh_set_user_nice(p, &nice, &allowed);
if ((task_nice(p) == nice || nice < MIN_NICE || nice > MAX_NICE) && !allowed)
return;
/*
* We have to be careful, if called from sys_setpriority(),
@ -4618,7 +4619,6 @@ void set_user_nice(struct task_struct *p, long nice)
*/
rq = task_rq_lock(p, &rf);
update_rq_clock(rq);
trace_android_rvh_set_user_nice(p, &nice);
/*
* The RT priorities are set via sched_setscheduler(), but we still