xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5.8-rc4 into android-mainline

Browse Source 
Linux 5.8-rc4

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iccdf79fdb94208b33796eca02bb813482e646ab1
This commit is contained in:
Greg Kroah-Hartman
2020-07-06 09:05:59 +02:00
parent 6883a1e06b dcb7fd82c7
commit ca9814bc63
209 changed files with 1620 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mm/cma.c
View File

@@ -341,13 +341,13 @@ int __init cma_declare_contiguous_nid(phys_addr_t base,
*/
if (base < highmem_start && limit > highmem_start) {
addr = memblock_alloc_range_nid(size, alignment,
highmem_start, limit, nid, false);
highmem_start, limit, nid, true);
limit = highmem_start;
}
if (!addr) {
addr = memblock_alloc_range_nid(size, alignment, base,
limit, nid, false);
limit, nid, true);
if (!addr) {
ret = -ENOMEM;
goto err;