Merge "msm: smem: Fix API stubs" (118e1236) · Commits · e / devices / android_kernel_sony_msm8994

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -198,23 +198,23 @@ phys_addr_t smem_virt_to_phys(void *smem_address);
		int __init msm_smem_init(void);

		#else
		void *smem_alloc(unsigned id, unsigned size_in, unsigned to_proc,
		static inline void *smem_alloc(unsigned id, unsigned size_in, unsigned to_proc,
		unsigned flags)
		{
		return NULL;
		}
		static void *smem_find(unsigned id, unsigned size_in, unsigned to_proc,
		unsigned flags)
		static inline void *smem_find(unsigned id, unsigned size_in,
		unsigned to_proc, unsigned flags)
		{
		return NULL;
		}
		static void smem_get_entry(unsigned id, unsigned size, unsigned to_proc,
		unsigned flags)
		static inline void smem_get_entry(unsigned id, unsigned size,
		unsigned to_proc, unsigned flags)
		{
		return NULL;
		}
		void smem_get_entry_no_rlock(unsigned id, unsigned size_out, unsigned to_proc,
		unsigned flags)
		static inline void smem_get_entry_no_rlock(unsigned id, unsigned size_out,
		unsigned to_proc, unsigned flags)
		{
		return NULL;
		}
		@@ -222,7 +222,7 @@ static inline phys_addr_t smem_virt_to_phys(void *smem_address)
		{
		return (phys_addr_t) NULL;
		}
		static int __init msm_smem_init(void)
		static inline int __init msm_smem_init(void)
		{
		return 0;
		}