Commit 7843fb44 authored by Xu Qiang's avatar Xu Qiang Committed by Zhang Zekun
Browse files

mm/sharepool: Delete SPG_FLAG_NON_DVPP. 

hulk inclusion
category: other
bugzilla: https://gitee.com/openeuler/kernel/issues/I6GI0X



----------------------------------------------

SPG_FLAG_NON_DVPP is no longer used in downstream systems.

Signed-off-by: default avatarXu Qiang <xuqiang36@huawei.com>
parent d4ac07a0

include/linux/share_pool.h

+0 −2
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ 
#define SPG_ID_LOCAL_MIN	200001

#define SPG_ID_LOCAL_MAX	299999



#define SPG_FLAG_NON_DVPP	(1 << 0)



#define MAX_DEVID 8	/* the max num of Da-vinci devices */



extern struct static_key_false share_pool_enabled_key;

mm/share_pool.c

+3 −4
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static int sp_mapping_group_setup(struct mm_struct *mm, struct sp_group *spg) 
	local_dvpp_mapping = mm->sp_group_master->local->mapping[SP_MAPPING_DVPP];

	spg_dvpp_mapping = spg->mapping[SP_MAPPING_DVPP];



	if (!list_empty(&spg->procs) && !(spg->flag & SPG_FLAG_NON_DVPP)) {

	if (!list_empty(&spg->procs)) {

		/*

		 * Don't return an error when the mappings' address range conflict.

		 * As long as the mapping is unused, we can drop the empty mapping.
@@ -476,7 +476,6 @@ static int sp_mapping_group_setup(struct mm_struct *mm, struct sp_group *spg) 
			return -EINVAL;

		}

	} else {

		if (!(spg->flag & SPG_FLAG_NON_DVPP))

		/* the mapping of local group is always set */

		sp_mapping_attach(spg, local_dvpp_mapping);

		if (!spg->mapping[SP_MAPPING_NORMAL])