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-06 11:54:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge android11-5.4 into android11-5.4-lts

Browse source 
This merges the android11-5.4 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* a095a2749d Merge tag 'android11-5.4.293_r00' into android11-5.4
* 19c222d1fa ANDROID: binder: fix minimum node priority comparison
* 87d2008253 ANDROID: 16K: Remove ELF padding entry from map_file ranges

Change-Id: I3d146840bbd592c6b68c0f9370910f443ecff1ae
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2025-05-26 16:15:59 +00:00
commit 8782a46e4f
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/android/binder.c
View file

@ -777,8 +777,8 @@ static void binder_transaction_priority(struct binder_thread *thread,
desired.sched_policy = SCHED_NORMAL;
}
if (node_prio.prio < t->priority.prio ||
(node_prio.prio == t->priority.prio &&
if (node_prio.prio < desired.prio ||
(node_prio.prio == desired.prio &&
node_prio.sched_policy == SCHED_FIFO)) {
/*
* In case the minimum priority on the node is

3
fs/proc/base.c
View file

@ -65,6 +65,7 @@
#include <linux/namei.h>
#include <linux/mnt_namespace.h>
#include <linux/mm.h>
#include <linux/pgsize_migration.h>
#include <linux/swap.h>
#include <linux/rcupdate.h>
#include <linux/kallsyms.h>
@ -2290,7 +2291,7 @@ proc_map_files_readdir(struct file *file, struct dir_context *ctx)
}
p->start = vma->vm_start;
p->end = vma->vm_end;
p->end = VMA_PAD_START(vma);
p->mode = vma->vm_file->f_mode;
}
up_read(&mm->mmap_sem);