Merge "msm: update stub function" (750b0e3f) · Commits · e / devices / android_kernel_xiaomi_markw

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

+1 −8

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2014, 2016, 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
		@@ -74,8 +74,6 @@ int ion_cp_secure_buffer(struct ion_buffer buffer, int version, void data,

		int ion_cp_unsecure_buffer(struct ion_buffer *buffer, int force_unsecure);

		bool msm_secure_v2_is_supported(void);

		#else
		static inline int ion_cp_change_chunks_state(unsigned long chunks,
		unsigned int nchunks, unsigned int chunk_size,
		@@ -110,11 +108,6 @@ static inline int ion_cp_unsecure_buffer(struct ion_buffer *buffer,
		return -ENODEV;
		}

		static inline bool msm_secure_v2_is_supported(void)
		{
		return false;
		}

		#endif

		#endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ static inline bool msm_secure_v2_is_supported(void)
		{
		return false;
		}
		const char *msm_secure_vmid_to_string(int secure_vmid)
		static inline const char *msm_secure_vmid_to_string(int secure_vmid)
		{
		return "N/A";
		}