Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c06e34c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.10 into android-5.4 



Changes in 5.4.10
	powerpc/pmem: Fix kernel crash due to wrong range value usage in flush_dcache_range
	Linux 5.4.10

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Iff413e6f788e44e30f59a3f79830750a4bc30f44
parents 813bf832 7a02c193

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 9

SUBLEVEL = 10

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/powerpc/mm/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void flush_dcache_range_chunked(unsigned long start, unsigned long stop, 
	unsigned long i;



	for (i = start; i < stop; i += chunk) {

		flush_dcache_range(i, min(stop, start + chunk));

		flush_dcache_range(i, min(stop, i + chunk));

		cond_resched();

	}

}