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

Commit 932a3b3d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: msm: Fix ION_FLAGS_CP_MASK value"

parents d733f8fe fa0f26fa

drivers/staging/android/ion/msm/msm_ion.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, 2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -22,7 +22,7 @@ enum ion_permission_type { 
	IPT_TYPE_MDP_WRITEBACK = 2,

};



#define ION_FLAGS_CP_MASK	0x7FFF0000

#define ION_FLAGS_CP_MASK	0x6FFE0000



/*

 * This flag allows clients when mapping into the IOMMU to specify to