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

Commit b4701c11 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-5.4.10 (9c06e34c) into msm-5.4 



* refs/heads/tmp-9c06e34c:
  Linux 5.4.10
  powerpc/pmem: Fix kernel crash due to wrong range value usage in flush_dcache_range

Change-Id: I7698b15341dca8cd65090f25b34e2bcd1cfaee81
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents a7283078 9c06e34c

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();

	}

}