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

Commit 70427fc9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: msm: Fix ION_FLAGS_CP_MASK value"

parents 1e40b9e5 c77d0d53

drivers/staging/android/uapi/msm_ion.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 */

#ifndef _UAPI_LINUX_MSM_ION_H

#define _UAPI_LINUX_MSM_ION_H
@@ -73,7 +73,7 @@ enum ion_heap_ids { 
#define ION_FLAG_CP_CDSP		ION_BIT(29)

#define ION_FLAG_CP_SPSS_HLOS_SHARED	ION_BIT(30)



#define ION_FLAGS_CP_MASK	0x7FFF0000

#define ION_FLAGS_CP_MASK	0x6FFE0000



/**

 * Flag to allow non continguous allocation of memory from secure

mm/memory.c

+11 −0
Original line number Diff line number Diff line
@@ -3131,6 +3131,17 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) 
				lru_cache_add_anon(page);

				swap_readpage(page, true);

			}

		} else if (vmf->flags & FAULT_FLAG_SPECULATIVE) {

			/*

			 * Don't try readahead during a speculative page fault

			 * as the VMA's boundaries may change in our back.

			 * If the page is not in the swap cache and synchronous

			 * read is disabled, fall back to the regular page fault

			 * mechanism.

			 */

			delayacct_clear_flag(DELAYACCT_PF_SWAPIN);

			ret = VM_FAULT_RETRY;

			goto out;

		} else {

			page = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE,

						vmf);