Merge "msm: smem: Remove smem_alloc_to_proc()" (257d2683) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/include/mach/msm_smem.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -162,8 +162,6 @@ void *smem_find(unsigned id, unsigned size);

		void *smem_alloc2_to_proc(unsigned id, unsigned size_in, unsigned to_proc,
		unsigned flags);
		void *smem_alloc_to_proc(unsigned id, unsigned size, unsigned to_proc,
		unsigned flags);
		void *smem_find_to_proc(unsigned id, unsigned size_in, unsigned to_proc,
		unsigned flags);
		void smem_get_entry_to_proc(unsigned id, unsigned size, unsigned to_proc,
		@@ -218,11 +216,6 @@ void *smem_alloc2_to_proc(unsigned id, unsigned size_in, unsigned to_proc,
		{
		return NULL;
		}
		static void *smem_alloc_to_proc(unsigned id, unsigned size, unsigned to_proc,
		unsigned flags)
		{
		return NULL;
		}
		static void *smem_find_to_proc(unsigned id, unsigned size_in, unsigned to_proc,
		unsigned flags)
		{

+0 −16

Original line number	Diff line number	Diff line
		@@ -264,22 +264,6 @@ phys_addr_t smem_virt_to_phys(void *smem_address)
		}
		EXPORT_SYMBOL(smem_virt_to_phys);

		/**
		* smem_alloc_to_proc - Find existing item with security support
		*
		* @id: ID of SMEM item
		* @size: Size of the SMEM item
		* @to_proc: SMEM host that shares the item with apps
		* @flags: Item attribute flags
		* @returns: Pointer to SMEM item or NULL if it doesn't exist
		*/
		void *smem_alloc_to_proc(unsigned id, unsigned size, unsigned to_proc,
		unsigned flags)
		{
		return smem_find_to_proc(id, size, to_proc, flags);
		}
		EXPORT_SYMBOL(smem_alloc_to_proc);

		/**
		* __smem_get_entry - Get pointer and size of existing SMEM item
		*